Add short name in agent report (#1649)

* Short process name

* Update dependencies

deepfence_agent/tools/apache/scope/probe/cri/reporter.go

@@ -39,7 +39,7 @@ func NewReporter(cri client.RuntimeServiceClient, hostID string, criImageClient
 }
 
 // Name of this reporter, for metrics gathering
-func (Reporter) Name() string { return "CRI" }
+func (*Reporter) Name() string { return "CRI" }
 
 // Report generates a Report containing Container topologies
 func (r *Reporter) Report() (report.Report, error) {

deepfence_agent/tools/apache/scope/probe/docker/reporter.go

@@ -42,7 +42,7 @@ func NewReporter(registry Registry, hostID string, probeID string, probe *probe.
 }
 
 // Name of this reporter, for metrics gathering
-func (Reporter) Name() string { return "Docker" }
+func (*Reporter) Name() string { return "Docker" }
 
 // Report generates a Report containing Container and ContainerImage topologies
 func (r *Reporter) Report() (report.Report, error) {

deepfence_agent/tools/apache/scope/probe/endpoint/reporter.go

@@ -20,4 +20,4 @@ type ReporterConfig struct {
 }
 
 // Name of this reporter, for metrics gathering
-func (Reporter) Name() string { return "Endpoint" }
+func (*Reporter) Name() string { return "Endpoint" }

deepfence_agent/tools/apache/scope/probe/kubernetes/reporter.go

@@ -55,7 +55,7 @@ func (r *Reporter) Stop() {
 }
 
 // Name of this reporter, for metrics gathering
-func (Reporter) Name() string { return "K8s" }
+func (*Reporter) Name() string { return "K8s" }
 
 //func (r *Reporter) podEvent(e Event, pod Pod) {
 //	// filter out non-local pods, if we have been given a node name to report on

deepfence_agent/tools/apache/scope/probe/process/reporter.go

@@ -1,6 +1,7 @@
 package process
 
 import (
+	"path/filepath"
 	"strconv"
 	"sync"
 	"time"
@@ -70,7 +71,7 @@ func NewReporter(walker Walker, hostID string, jiffies Jiffies, noCommandLineArg
 }
 
 // Name of this reporter, for metrics gathering
-func (Reporter) Name() string { return "Process" }
+func (*Reporter) Name() string { return "Process" }
 
 func (r *Reporter) updateProcessCache() {
 
@@ -110,6 +111,10 @@ func (r *Reporter) Report() (report.Report, error) {
 	return result, nil
 }
 
+func shortProcessName(processName string) string {
+	return filepath.Base(processName)
+}
+
 func (r *Reporter) processTopology() (report.Topology, error) {
 	t := report.MakeTopology()
 	deltaTotal, maxCPU, err := r.jiffies()
@@ -124,6 +129,7 @@ func (r *Reporter) processTopology() (report.Topology, error) {
 			Timestamp:      time.Now().UTC().Format(time.RFC3339Nano),
 			NodeID:         nodeID,
 			NodeName:       p.Name,
+			ShortNodeName:  shortProcessName(p.Name),
 			NodeType:       report.Process,
 			HostName:       r.hostName,
 			Pid:            p.PID,

deepfence_agent/tools/apache/scope/report/metadata.go

@@ -22,10 +22,11 @@ func (m Metadata) WithID(id string) Metadata {
 }
 
 type Metadata struct {
-	NodeID    string `json:"node_id"`
-	NodeType  string `json:"node_type,omitempty"`
-	NodeName  string `json:"node_name,omitempty"`
-	Timestamp string `json:"timestamp"`
+	NodeID        string `json:"node_id"`
+	NodeType      string `json:"node_type,omitempty"`
+	NodeName      string `json:"node_name,omitempty"`
+	ShortNodeName string `json:"short_name,omitempty"`
+	Timestamp     string `json:"timestamp"`
 
 	// cloud metadata
 	InstanceID       string   `json:"instance_id,omitempty"`

deepfence_server/go.mod

@@ -37,6 +37,7 @@ require (
 	go.opentelemetry.io/otel v1.18.0
 	go.opentelemetry.io/otel/exporters/jaeger v1.16.0
 	go.opentelemetry.io/otel/sdk v1.18.0
+	go.opentelemetry.io/otel/trace v1.18.0
 	golang.org/x/crypto v0.12.0
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.28.0
@@ -119,7 +120,6 @@ require (
 	github.com/twmb/franz-go/pkg/kmsg v1.6.1 // indirect
 	go.opentelemetry.io/contrib v1.0.0 // indirect
 	go.opentelemetry.io/otel/metric v1.18.0 // indirect
-	go.opentelemetry.io/otel/trace v1.18.0 // indirect
 	golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
 	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.14.0 // indirect

deepfence_server/model/lookup.go

@@ -253,6 +253,7 @@ func (c Container) id() string {
 type Process struct {
 	ID             string  `json:"node_id" required:"true"`
 	Name           string  `json:"node_name" required:"true"`
+	ShortNodeName  string  `json:"short_name" required:"true"`
 	PID            int     `json:"pid" required:"true"`
 	Command        string  `json:"cmdline" required:"true"`
 	PPID           int     `json:"ppid" required:"true"`

deepfence_server/pkg/scope/report/metadata.go

@@ -22,10 +22,11 @@ func (m Metadata) WithID(id string) Metadata {
 }
 
 type Metadata struct {
-	NodeID    string `json:"node_id"`
-	NodeType  string `json:"node_type"`
-	NodeName  string `json:"node_name"`
-	Timestamp string `json:"timestamp"`
+	NodeID        string `json:"node_id"`
+	NodeType      string `json:"node_type"`
+	NodeName      string `json:"node_name"`
+	ShortNodeName string `json:"short_name,omitempty"`
+	Timestamp     string `json:"timestamp"`
 
 	// cloud metadata
 	InstanceID       string   `json:"instance_id,omitempty"`