handle negative values, fix 1

.woodpecker.yml

@@ -11,42 +11,6 @@ steps:
     when:
       - event: [push, tag]
 
-  scan:
-    image: quay.io/wollud1969/woodpecker-helper:0.5.1
-    environment:
-      TRIVY_TOKEN:
-        from_secret: trivy_token
-      TRIVY_URL:
-        from_secret: trivy_url
-      DTRACK_API_KEY:
-        from_secret: dtrack_api_key
-      DTRACK_API_URL:
-        from_secret: dtrack_api_url
-    commands:
-      - export GOPATH=/woodpecker/go   # the export is required, otherwise trivy will not consider the variable
-      - HOME=/home/`id -nu`
-      - TAG="${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
-      - |
-        trivy fs \
-              --server $TRIVY_URL \
-              --token $TRIVY_TOKEN \
-              --format cyclonedx \
-              --scanners license \
-              --output /tmp/sbom.xml \
-              .        
-      - cat /tmp/sbom.xml
-      - |
-        curl -X "POST" \
-             -H "Content-Type: multipart/form-data" \
-             -H "X-Api-Key: $DTRACK_API_KEY" \
-             -F "autoCreate=true" \
-             -F "projectName=$CI_REPO" \
-             -F "projectVersion=$TAG" \
-             -F "bom=@/tmp/sbom.xml"\
-             "$DTRACK_API_URL/api/v1/bom"        
-    when:
-      - event: [push, tag]
-
   dockerize:
     image: plugins/kaniko
     settings:
@@ -73,5 +37,5 @@ steps:
       - export KUBECONFIG=/tmp/kubeconfig
       - ./deployment/deploy.sh
     when:
-      - event: tag
+      - event: [tag]
 

deployment/config.json

@@ -4,7 +4,7 @@
     "tlsEnable": "false",
     "topic": "snmp"
   },
-  "interval": 10,
+  "interval": 60,
   "snmpEndpoints": [
     {
       "endpoint": "172.16.13.10",
@@ -16,6 +16,26 @@
           "label": "load1",
           "diff": "false"
         },
+        {
+          "oid": ".1.3.6.1.4.1.9676.123.1.4",
+          "label": "stratum",
+          "diff": "false"
+        },
+        {
+          "oid": ".1.3.6.1.4.1.9676.123.1.7",
+          "label": "rootdisp",
+          "diff": "false"
+        },
+        {
+          "oid": ".1.3.6.1.4.1.9676.123.2.3",
+          "label": "ss-reset",
+          "diff": "false"
+        },
+        {
+          "oid": ".1.3.6.1.4.1.9676.123.2.10",
+          "label": "processed-pkts",
+          "diff": "true"
+        },
         {
           "oid": ".1.3.6.1.2.1.31.1.1.1.6.2",
           "label": "lan-in",
@@ -35,11 +55,58 @@
           "oid": ".1.3.6.1.2.1.31.1.1.1.11.2",
           "label": "lan-out-pkts",
           "diff": "true"
+        }
+      ]
+    },
+    {
+      "endpoint": "172.16.13.11",
+      "label": "harrison",
+      "community": "public",
+      "oidTopics": [
+        {
+          "oid": ".1.3.6.1.4.1.2021.10.1.3.1",
+          "label": "load1",
+          "diff": "false"
         },
         {
-          "oid": ".1.3.6.1.4.1.9676.1",
-          "label": "time-req-pkts",
-          "diff": true"
+          "oid": ".1.3.6.1.4.1.9676.123.1.4",
+          "label": "stratum",
+          "diff": "false"
+        },
+        {
+          "oid": ".1.3.6.1.4.1.9676.123.1.7",
+          "label": "rootdisp",
+          "diff": "false"
+        },
+        {
+          "oid": ".1.3.6.1.4.1.9676.123.2.3",
+          "label": "ss-reset",
+          "diff": "false"
+        },
+        {
+          "oid": ".1.3.6.1.4.1.9676.123.2.10",
+          "label": "processed-pkts",
+          "diff": "true"
+        },
+        {
+          "oid": ".1.3.6.1.2.1.31.1.1.1.6.2",
+          "label": "lan-in",
+          "diff": "true"
+        },
+        {
+          "oid": ".1.3.6.1.2.1.31.1.1.1.7.2",
+          "label": "lan-in-pkts",
+          "diff": "true"
+        },
+        {
+          "oid": ".1.3.6.1.2.1.31.1.1.1.10.2",
+          "label": "lan-out",
+          "diff": "true"
+        },
+        {
+          "oid": ".1.3.6.1.2.1.31.1.1.1.11.2",
+          "label": "lan-out-pkts",
+          "diff": "true"
         }
       ]
     },
@@ -48,6 +115,11 @@
       "label": "router",
       "community": "public",
       "oidTopics": [
+        {
+          "oid": ".1.3.6.1.2.1.25.3.3.1.2.1",
+          "label": "load1",
+          "diff": "false"
+        },
         {
           "oid": ".1.3.6.1.2.1.31.1.1.1.6.5",
           "label": "wan-in",
@@ -59,23 +131,6 @@
           "diff": "true"
         }
       ]
-    },
-    {
-      "endpoint": "172.16.3.3",
-      "label": "switch-cluster",
-      "community": "public",
-      "oidTopics": [
-        {
-          "oid": ".1.3.6.1.2.1.31.1.1.1.6.1",
-          "label": "uplink-in",
-          "diff": "true"
-        },
-        {
-          "oid": ".1.3.6.1.2.1.31.1.1.1.10.1",
-          "label": "uplink-out",
-          "diff": "true"
-        }
-      ]
     }
   ]
 }

src/smq/snmp/snmp.go

@@ -56,6 +56,9 @@ func calculateDifference(key string, newValue string) (string, error) {
       Timestamp: currentTime,
       Value: newValue,
     }
+    if diffValuePerSecond < 0 {
+      return "", fmt.Errorf("negative difference value: %d", diffValuePerSecond)
+    }
     return strconv.Itoa(diffValuePerSecond), nil
   } else {
     log.Printf("create lvv for %s", key)