Merge branch 'master' of gitea.hottis.de:wn/snmp-mqtt

.woodpecker.yml

@@ -1,8 +1,20 @@
 steps:
   build:
+    image: golang:1.22.5-alpine3.20
+    commands:
+      - GOPATH=/woodpecker/go
+      - ls -l
+      - cd src/smq
+      - go mod tidy
+      - go build -a -installsuffix nocgo -o smq snmp-mqtt.go
+      - cp smq ../..
+    when:
+      - event: [push, tag]
+
+  dockerize:
     image: plugins/kaniko
     settings:
-      repo: gitea.hottis.de/wn/snmp-mqtt
+      repo: ${FORGE_NAME}/${CI_REPO}
       registry: 
         from_secret: container_registry
       tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
@@ -15,14 +27,15 @@ steps:
       - event: [push, tag]
 
   deploy:
-    image: portainer/kubectl-shell:latest
-    secrets:
-      - source: kube_config
-        target: KUBE_CONFIG_CONTENT
+    image: quay.io/wollud1969/woodpecker-helper:0.5.1
+    environment:
+      KUBE_CONFIG_CONTENT:
+        from_secret: kube_config
     commands:
       - export IMAGE_TAG=$CI_COMMIT_TAG
       - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
       - export KUBECONFIG=/tmp/kubeconfig
       - ./deployment/deploy.sh
     when:
-      - event: tag
+      - event: [tag]
+

Dockerfile

@@ -1,16 +1,8 @@
-FROM golang:1.21-alpine as builder
-
-RUN mkdir -p /go/src
-COPY ./src /go/src
-WORKDIR /go/src/smq
-RUN go build -a -installsuffix nocgo -o smq snmp-mqtt.go
-
-
 FROM scratch
 
 ENV SNMP_MQTT_CONF ""
 
-COPY --from=builder /go/src/smq ./
+COPY smq ./
 ENTRYPOINT ["./smq"]
 
 

LICENSE

@@ -19,3 +19,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+

deployment/config.json

@@ -4,20 +4,129 @@
     "tlsEnable": "false",
     "topic": "snmp"
   },
-  "interval": 10,
+  "interval": 60,
   "snmpEndpoints": [
+    {
+      "endpoint": "172.16.13.10",
+      "label": "david",
+      "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.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"
+        }
+      ]
+    },
+    {
+      "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.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"
+        }
+      ]
+    },
     {
       "endpoint": "172.16.3.1",
       "label": "router",
       "community": "public",
       "oidTopics": [
         {
-          "oid": ".1.3.6.1.2.1.2.2.1.10.5",
+          "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",
           "diff": "true"
         },
         {
-          "oid": ".1.3.6.1.2.1.2.2.1.16.5",
+          "oid": ".1.3.6.1.2.1.31.1.1.1.10.5",
           "label": "wan-out",
           "diff": "true"
         }

deployment/deploy-yml.tmpl

@@ -6,7 +6,7 @@ metadata:
   labels:
     app: snmp-nmqtt
   annotations:
-    secret.reloader.stakater.com/reload: "snmp-mqtt-conf"
+    secret.reloader.stakater.com/reload: snmp-mqtt-conf
 spec:
   replicas: 1
   selector:

src/smq/go.mod

@@ -1,6 +1,6 @@
 module smq
 
-go 1.21.3
+go 1.22.5
 
 require (
 	github.com/eclipse/paho.mqtt.golang v1.4.3
@@ -10,6 +10,6 @@ require (
 
 require (
 	github.com/gorilla/websocket v1.5.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 )

src/smq/snmp/snmp.go

@@ -18,7 +18,8 @@ type variable_t struct {
   Label string `json:"label"`
   Variable string `json:"variable"`
   Value string `json:"value"`
-  DiffValue string `json:"diffValue"`
+  Unit string `json:"unit"`
+  Status string `json:"status"`
 }
 
 type message_t struct {
@@ -114,15 +115,15 @@ func Start() {
                 convertedValue = fmt.Sprintf("%d", gosnmp.ToBigInt(variable.Value))
               }
 
-              diffValue := "-"
               if oidTopic.Diff == "true" {
                 log.Println("Calculate difference to last value")
                 key := endpoint.Endpoint + ":" + oidTopic.OID
                 diff, err := calculateDifference(key, convertedValue)
                 if err != nil {
                   log.Printf("Error when building difference: %v", err)
+                  convertedValue = "-1"
                 } else {
-                  diffValue = diff 
+                  convertedValue = diff 
                 }
               }
 
@@ -131,7 +132,8 @@ func Start() {
                 Label: oidTopic.Label,
                 Variable: oidTopic.OID,
                 Value: convertedValue,
-                DiffValue: diffValue,
+                Unit: "",
+                Status: "",
               }
               message.Variables[oidTopic.Label] = v
 

tools/mysnmpwalk.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+COMMUNITY=""
+HOST=""
+BASE_OID=""
+
+while getopts "c:h:b:" option; do
+  case $option in
+    c) COMMUNITY=$OPTARG
+      ;;
+    h) HOST=$OPTARG
+      ;;
+    b) BASE_OID=$OPTARG
+      ;;
+    ?)
+      echo "Usage $0 -c COMMUNITY -h HOST -b BASE_OID"
+      exit 1
+      ;;
+  esac
+done
+
+if [ "$COMMUNITY" = "" ]; then
+  echo "Set a community using -c"
+  exit 1
+fi
+
+if [ "$HOST" = "" ]; then
+  echo "Set a host using -h"
+  exit 1
+fi
+
+if [ "$BASE_OID" = "" ]; then
+  echo "Set a base oid using -b"
+  exit 1
+fi
+
+
+snmpwalk -v 2c -c $COMMUNITY -On $HOST $BASE_OID | while read -r line; do 
+  oid=`echo $line | awk '{print $1}'`
+  textoid=`snmptranslate $oid`
+  value=`echo $line | cut -d ' ' -f 3-`
+  echo "$oid ($textoid): $value" 
+done
+
+