Fix: add tag to checkpoint CPU metric (#879)

Author: Mesverrum

profiles/kentik_snmp/checkpoint/checkpoint-firewall.yml

@@ -10,11 +10,9 @@ sysobjectid: 1.3.6.1.4.1.2620.1.*
 
 metrics:
   - MIB: CHECKPOINT-MIB
-    metric_tags:
-      - column:
-          OID: 1.3.6.1.4.1.2620.1.6.7.5.1.1
-          name: multiProcIndex
-        tag: cpu_core
+    table:
+      OID: 1.3.6.1.4.1.2620.1.6.7.5
+      name: multiProcTable
     symbols:
       - OID: 1.3.6.1.4.1.2620.1.6.7.5.1.2
         name: multiProcUserTime
@@ -26,9 +24,12 @@ metrics:
       - OID: 1.3.6.1.4.1.2620.1.6.7.5.1.5
         name: multiProcUsage
         poll_time_sec: 60
-    table:
-      OID: 1.3.6.1.4.1.2620.1.6.7.5
-      name: multiProcTable
+        tag: CPU
+    metric_tags:
+      - column:
+          OID: 1.3.6.1.4.1.2620.1.6.7.5.1.1
+          name: multiProcIndex
+        tag: cpu_core
   - MIB: CHECKPOINT-MIB
     symbol:
       OID: 1.3.6.1.4.1.2620.1.6.7.2.7.0
@@ -60,15 +61,9 @@ metrics:
       OID: 1.3.6.1.4.1.2620.1.6.7.4.2.0
       name: memActiveVirtual64
   - MIB: CHECKPOINT-MIB
-    metric_tags:
-      - column:
-          OID: 1.3.6.1.4.1.2620.1.6.7.6.1.1
-          name: multiDiskIndex
-        tag: disk_index
-      - column:
-          OID: 1.3.6.1.4.1.2620.1.6.7.6.1.2
-          name: multiDiskName
-        tag: disk_name
+    table:
+      OID: 1.3.6.1.4.1.2620.1.6.7.6
+      name: multiDiskTable
     symbols:
       - OID: 1.3.6.1.4.1.2620.1.6.7.6.1.3
         name: multiDiskSize
@@ -82,19 +77,19 @@ metrics:
         name: multiDiskFreeTotalPercent
       - OID: 1.3.6.1.4.1.2620.1.6.7.6.1.8
         name: multiDiskFreeAvailablePercent
-    table:
-      OID: 1.3.6.1.4.1.2620.1.6.7.6
-      name: multiDiskTable
-  - MIB: CHECKPOINT-MIB
     metric_tags:
       - column:
-          OID: 1.3.6.1.4.1.2620.1.6.7.8.2.1.1
-          name: fanSpeedSensorIndex
-        tag: sensor_index
+          OID: 1.3.6.1.4.1.2620.1.6.7.6.1.1
+          name: multiDiskIndex
+        tag: disk_index
       - column:
-          OID: 1.3.6.1.4.1.2620.1.6.7.8.2.1.2
-          name: fanSpeedSensorName
-        tag: sensor_name
+          OID: 1.3.6.1.4.1.2620.1.6.7.6.1.2
+          name: multiDiskName
+        tag: disk_name
+  - MIB: CHECKPOINT-MIB
+    table:
+      OID: 1.3.6.1.4.1.2620.1.6.7.8.2
+      name: fanSpeedSensorTable
     symbols:
       - OID: 1.3.6.1.4.1.2620.1.6.7.8.2.1.3
         name: fanSpeedSensorValue
@@ -104,19 +99,19 @@ metrics:
           TRUE: 1
           FALSE: 0
           READING ERROR: 2
-    table:
-      OID: 1.3.6.1.4.1.2620.1.6.7.8.2
-      name: fanSpeedSensorTable
-  - MIB: CHECKPOINT-MIB
     metric_tags:
       - column:
-          OID: 1.3.6.1.4.1.2620.1.6.7.8.1.1.1
-          name: tempertureSensorIndex
+          OID: 1.3.6.1.4.1.2620.1.6.7.8.2.1.1
+          name: fanSpeedSensorIndex
         tag: sensor_index
       - column:
-          OID: 1.3.6.1.4.1.2620.1.6.7.8.1.1.2
-          name: tempertureSensorName
+          OID: 1.3.6.1.4.1.2620.1.6.7.8.2.1.2
+          name: fanSpeedSensorName
         tag: sensor_name
+  - MIB: CHECKPOINT-MIB
+    table:
+      OID: 1.3.6.1.4.1.2620.1.6.7.8.1
+      name: tempertureSensorTable
     symbols:
       - OID: 1.3.6.1.4.1.2620.1.6.7.8.1.1.3
         name: tempertureSensorValue
@@ -126,9 +121,15 @@ metrics:
           TRUE: 1
           FALSE: 0
           READING ERROR: 2
-    table:
-      OID: 1.3.6.1.4.1.2620.1.6.7.8.1
-      name: tempertureSensorTable
+    metric_tags:
+      - column:
+          OID: 1.3.6.1.4.1.2620.1.6.7.8.1.1.1
+          name: tempertureSensorIndex
+        tag: sensor_index
+      - column:
+          OID: 1.3.6.1.4.1.2620.1.6.7.8.1.1.2
+          name: tempertureSensorName
+        tag: sensor_name
   - MIB: CHECKPOINT-MIB
     symbol:
       OID: 1.3.6.1.4.1.2620.1.1.4.0
@@ -159,4 +160,4 @@ metrics:
       # this OID returns a 'DisplayString', we need to convert it to a metric
       - name: powerSupplySensorStatus
         OID: 1.3.6.1.4.1.2620.1.6.7.9.1.1.2
-        conversion: to_one
+        conversion: to_one