disable packetloss stack and disable flow port by default

bpf/headers/inspector.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // +build ignore
 
+#pragma once
+
 #include <bpf/bpf_endian.h>
 #include "bpf_core_read.h"
 #include "bpf_helpers.h"

bpf/packetloss.c

@@ -23,6 +23,7 @@ struct insp_pl_event_t {
 };
 
 const struct insp_pl_event_t *unused_insp_pl_event_t __attribute__((unused));
+const volatile u8 enable_packetloss_stack = 0;
 
 struct {
 	__uint(type, BPF_MAP_TYPE_STACK_TRACE);
@@ -42,8 +43,12 @@ int kfree_skb(struct kfree_skb_args *args) {
 
   set_tuple(skb, &event.tuple);
   event.location = (u64)args->location;
-  event.stack_id = bpf_get_stackid(args, &insp_pl_stack,
-                                KERN_STACKID_FLAGS);
+
+  if (enable_packetloss_stack){
+      event.stack_id = bpf_get_stackid(args, &insp_pl_stack,
+                                    KERN_STACKID_FLAGS);
+  }
+
   bpf_perf_event_output(args, &insp_pl_event,
                         BPF_F_CURRENT_CPU, &event, sizeof(event));
 

deploy/net-exporter-config.yaml

@@ -14,13 +14,19 @@ metrics:
   - name: udp
   - name: kernellatency
   - name: packetloss
+    args:
+      enableStack: false
   - name: flow
+    args:
+      enablePortInLabel: false
   - name: tcpretrans
 event:
   probes: 
   - name: biolatency
   - name: kernellatency
   - name: packetloss
+    args:
+      enableStack: false
   - name: tcpreset
   - name: tcpretrans
   sinks: 

pkg/exporter/probe/flow/flow.go

@@ -7,8 +7,6 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/alibaba/kubeskoop/pkg/exporter/nettop"
-
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/alibaba/kubeskoop/pkg/exporter/probe"
@@ -43,7 +41,8 @@ func init() {
 }
 
 type flowArgs struct {
-	Dev string `mapstructure:"interface-name"`
+	Dev               string `mapstructure:"interfaceName"`
+	EnablePortInLabel bool   `mapstructure:"enablePortInLabel"`
 }
 
 func getDefaultRouteDevice() (netlink.Link, error) {
@@ -176,7 +175,9 @@ func (h *dynamicLinkFlowHelper) stop() error {
 }
 
 func metricsProbeCreator(args flowArgs) (probe.MetricsProbe, error) {
-	p := &metricsProbe{}
+	p := &metricsProbe{
+		enablePort: args.EnablePortInLabel,
+	}
 
 	if args.Dev == "" {
 		log.Infof("flow: auto detect network device with default route")
@@ -228,8 +229,9 @@ func metricsProbeCreator(args flowArgs) (probe.MetricsProbe, error) {
 }
 
 type metricsProbe struct {
-	bpfObjs bpfObjects
-	helper  linkFlowHelper
+	enablePort bool
+	bpfObjs    bpfObjects
+	helper     linkFlowHelper
 }
 
 func (p *metricsProbe) Start(_ context.Context) error {
@@ -252,6 +254,16 @@ func (p *metricsProbe) Stop(_ context.Context) error {
 	return p.bpfObjs.Close()
 }
 
+func toProbeTuple(t *bpfFlowTuple4) *probe.Tuple {
+	return &probe.Tuple{
+		Protocol: t.Proto,
+		Src:      bpfutil.GetV4AddrStr(t.Src),
+		Dst:      bpfutil.GetV4AddrStr(t.Dst),
+		Sport:    t.Sport,
+		Dport:    t.Dport,
+	}
+}
+
 func (p *metricsProbe) collectOnce(emit probe.Emit) error {
 	var values []bpfFlowMetrics
 	var key bpfFlowTuple4
@@ -268,33 +280,13 @@ func (p *metricsProbe) collectOnce(emit probe.Emit) error {
 			val.Packets += values[i].Packets
 		}
 
-		ipInfo := func(ip string) []string {
-			info := nettop.GetIPInfo(ip)
-			if info == nil {
-				return []string{"unknown", "", "", ""}
-			}
-
-			switch info.Type {
-			case nettop.IPTypeNode:
-				return []string{"node", info.NodeName, "", ""}
-			case nettop.IPTypePod:
-				return []string{"pod", "", info.PodNamespace, info.PodName}
-			default:
-				log.Warningf("unknown ip type %s for %s", ip, info.Type)
-			}
-			return []string{"unknown", "", "", ""}
+		tuple := toProbeTuple(&key)
+		if !p.enablePort {
+			tuple.Dport = 0
+			tuple.Sport = 0
 		}
 
-		labels := []string{bpfutil.GetProtoStr(key.Proto)}
-		srcIP := bpfutil.GetV4AddrStr(key.Src)
-		labels = append(labels, srcIP)
-		labels = append(labels, ipInfo(srcIP)...)
-
-		dstIP := bpfutil.GetV4AddrStr(key.Dst)
-		labels = append(labels, dstIP)
-		labels = append(labels, ipInfo(dstIP)...)
-		labels = append(labels, fmt.Sprintf("%d", bpfutil.Htons(key.Sport)))
-		labels = append(labels, fmt.Sprintf("%d", bpfutil.Htons(key.Dport)))
+		labels := probe.BuildTupleMetricsLabels(tuple)
 
 		emit("bytes", labels, float64(val.Bytes))
 		emit("packets", labels, float64(val.Packets))