Merge branch 'grvingt-pdu' into 'master'

[nancy] update kwollect config after first relocation to the DCML...

See merge request !739

data/grid5000/sites/nancy/clusters/grostiti/grostiti.json

@@ -316,6 +316,94 @@
         "port": 9100,
         "protocol": "prometheus"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_discard_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of discarded packets for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_discard_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_error_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output counter of packet errors for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_error_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R930",

data/grid5000/sites/nancy/network_equipments/gw-next.json

@@ -127,10 +127,12 @@
         },
         {
         },
+        {
+        },
         {
           "kind": "switch",
           "rate": 40000000000,
-          "snmp_name": "1/1/52",
+          "snmp_name": "1/1/53",
           "uid": "sgrvingt"
         }
       ],
@@ -139,6 +141,80 @@
     }
   ],
   "managed_by_us": true,
+  "metrics": [
+    {
+      "description": "Input byte counter for the network device port",
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "name": "network_ifacein_packets_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "name": "network_ifaceout_packets_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Input counter of discarded packets for the network device port",
+      "name": "network_ifacein_packets_discard_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Output counter of discarded packets for the network device port",
+      "name": "network_ifaceout_packets_discard_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Input counter of packet errors for the network device port",
+      "name": "network_ifacein_packets_error_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Output counter of packet errors for the network device port",
+      "name": "network_ifaceout_packets_error_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "protocol": "snmp"
+      }
+    }
+  ],
   "model": "Aruba 8325-48Y8C JL635A",
   "serial": "TW32KM007R",
   "site": "nancy",

data/grid5000/sites/nancy/network_equipments/sgrvingt.json

@@ -299,7 +299,7 @@
         {
           "kind": "switch",
           "rate": 40000000000,
-          "snmp_name": "TenGigabitEthernet 1/54",
+          "snmp_name": "fortyGigE 1/54",
           "uid": "gw-next"
         }
       ],

data/grid5000/sites/nancy/pdus/grvingt-pdu1.json

-{
-  "ip": "172.17.79.220",
-  "mac": "00:C0:B7:E3:22:41",
-  "model": "AP8886",
-  "type": "pdu",
-  "uid": "grvingt-pdu1",
-  "vendor": "APC"
-}
\ No newline at end of file

data/grid5000/sites/nancy/pdus/grvingt-pdu2.json

-{
-  "ip": "172.17.79.221",
-  "mac": "00:C0:B7:E2:B6:68",
-  "model": "AP8886",
-  "type": "pdu",
-  "uid": "grvingt-pdu2",
-  "vendor": "APC"
-}
\ No newline at end of file

input/grid5000/sites/nancy/networks/gw-next.yaml

@@ -10,6 +10,55 @@ gw-next:
     - name: gw-next-adm # interface de management
       ip: 172.17.79.252
   snmp_community: public
+  metrics:
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_packets_total
+      description: Input packet counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_packets_total
+      description: Output packet counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_packets_discard_total
+      description: Input counter of discarded packets for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_packets_discard_total
+      description: Output counter of discarded packets for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_packets_error_total
+      description: Input counter of packet errors for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_packets_error_total
+      description: Output counter of packet errors for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   backplane_bps: 1440000000000
   linecards:
     1:
@@ -24,7 +73,7 @@ gw-next:
           uid: sgros1
           kind: switch
           rate: 40_000_000_000
-        52:
+        53:
           uid: sgrvingt
           kind: switch
           rate: 40_000_000_000

input/grid5000/sites/nancy/networks/sgrvingt.yaml

@@ -113,6 +113,7 @@ sgrvingt:
         47: grvingt-45
         54:
           uid: gw-next
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
           rate: 40_000_000_000
           kind: switch
     49:

input/grid5000/sites/nancy/pdus.yaml

 ---
 pdus:
-  grvingt-pdu[1-2]:
-    vendor: APC
-    model: AP8886
-
   graoully-pdu[1-2]:
     vendor: APC
     model: AP8653
@@ -78,14 +74,6 @@ pdus:
     ip: 172.17.79.219
     mac: 00:C0:B7:F2:27:DE
 
-  grvingt-pdu1:
-    ip: 172.17.79.220
-    mac: 00:C0:B7:E3:22:41
-
-  grvingt-pdu2:
-    ip: 172.17.79.221
-    mac: 00:C0:B7:E2:B6:68
-
   graffiti-pdu1:
     ip: 172.17.79.226
     mac: 28:29:86:0B:3B:06