Merge pull request #240 from BSWANG/main

bugfix: fix default deploy configuration
alibaba · Apr 8, 2024 · 8068dbf · 8068dbf
2 parents 1e7c040 + f504382
commit 8068dbf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/deploy/resource/kubeskoop-exporter-dashboard.json b/deploy/resource/kubeskoop-exporter-dashboard.json
@@ -249,8 +249,8 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "rate(kubeskoop_packetloss_abnormal{k8s_node=~\"$node\"}[2m])",
-          "legendFormat": "{{k8s_pod}}/{{k8s_node}}",
+          "expr": "sum(rate(kubeskoop_packetloss_total{k8s_node=~\"$node\"}[2m])) by (k8s_node)",
+          "legendFormat": "{{k8s_node}}",
           "range": true,
           "refId": "A"
         }

diff --git a/deploy/skoopbundle.yaml b/deploy/skoopbundle.yaml
@@ -121,21 +121,28 @@ data:
     enableController: true
     metrics:
       probes:
-      - name: info
+      - name: conntrack
+      - name: qdisc
       - name: netdev
       - name: io
-      - name: socketlatency
-      - name: packetloss
       - name: sock
       - name: tcpsummary
       - name: tcp
       - name: tcpext
       - name: udp
+      - name: socketlatency
+      - name: packetloss
       - name: flow
+        args:
+          enablePortInLabel: false
+      - name: tcpretrans
     event:
       probes:
-      - name: packetloss
       - name: tcpreset
+      - name: packetloss
+        args:
+          enableStack: false
+      - name: tcpretrans
       sinks:
       - name: stderr
       - name: loki
@@ -578,6 +585,7 @@ data:
       prometheus: http://prometheus-service
       database:
         type: sqlite3
+      loki: http://loki-service:3100
       diagnose: {}
 kind: ConfigMap
 metadata:
@@ -604,9 +612,6 @@ spec:
       - name: controller
         image: kubeskoop/controller:v1.0.0
         command: ["/bin/controller"]
-        env:
-          - name: LOKI_ENDPOINT
-            value: http://loki-service:3100
         volumeMounts:
           - name:  lib
             mountPath: /var/lib/kubeskoop