change cluster switch

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

@@ -2,9 +2,9 @@
   "mqtt": {
     "broker": "mqtt://emqx01-anonymous-cluster-internal.broker.svc.cluster.local:1883",
     "tlsEnable": "false",
-    "topicPre": "snmp"
+    "topic": "snmp"
   },
-  "interval": 60,
+  "interval": 10,
   "snmpEndpoints": [
     {
       "endpoint": "172.16.3.1",
@@ -12,20 +12,31 @@
       "community": "public",
       "oidTopics": [
         {
-          "oid": ".1.3.6.1.2.1.31.1.1.1.6.4",
+          "oid": ".1.3.6.1.2.1.31.1.1.1.6.5",
-          "label": "wan-in"
+          "label": "wan-in",
+          "diff": "true"
         },
         {
-          "oid": ".1.3.6.1.2.1.31.1.1.1.10.4",
+          "oid": ".1.3.6.1.2.1.31.1.1.1.10.5",
-          "label": "wan-out"
+          "label": "wan-out",
+          "diff": "true"
+        }
+      ]
     },
     {
-          "oid": ".1.3.6.1.2.1.31.1.1.1.6.2",
+      "endpoint": "172.16.3.3",
-          "label": "lan-in"
+      "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.2",
+          "oid": ".1.3.6.1.2.1.31.1.1.1.10.1",
-          "label": "lan-out"
+          "label": "uplink-out",
+          "diff": "true"
         }
       ]
     }

deployment/deploy-yml.tmpl

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

deployment/pushconfig.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+
+kubectl create configmap snmp-mqtt-conf   --from-literal=SNMP_MQTT_CONF="`cat config.json`"   --dry-run=client   -o yaml   --save-config |   kubectl apply -f - -n homea

src/smq/snmp/snmp.go

@@ -18,7 +18,6 @@ type variable_t struct {
   Label string `json:"label"`
   Variable string `json:"variable"`
   Value string `json:"value"`
-  DiffValue string `json:"diffValue"`
 }
 
 type message_t struct {
@@ -114,15 +113,15 @@ func Start() {
                 convertedValue = fmt.Sprintf("%d", gosnmp.ToBigInt(variable.Value))
               }
 
-              diffValue := "0"
               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 +130,6 @@ func Start() {
                 Label: oidTopic.Label,
                 Variable: oidTopic.OID,
                 Value: convertedValue,
-                DiffValue: diffValue,
               }
               message.Variables[oidTopic.Label] = v