From 47da0dec26ee5c41700495498b1ecf334cd6a394 Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Mon, 20 Apr 2020 21:38:36 +0200
Subject: [PATCH] Add metric for network equipement in sophia

---
 .../sites/sophia/network_equipments/gw.json   | 20 ++++++++++++++
 .../sophia/network_equipments/swx1nef.json    | 20 ++++++++++++++
 .../sophia/network_equipments/swy1nef.json    | 20 ++++++++++++++
 .../sites/sophia/networks/gw-sophia.yaml      | 26 +++++++++++++++++++
 .../sites/sophia/networks/swx1nef.yaml        | 13 ++++++++++
 .../sites/sophia/networks/swy1nef.yaml        | 13 ++++++++++
 6 files changed, 112 insertions(+)

diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index dbfd8b48c1e..cd0929a1965 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -465,6 +465,26 @@
       "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     }
   ],
+  "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.%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.%SNMP_IFACE%",
+        "protocol": "snmp"
+      }
+    }
+  ],
   "model": "Foundry",
   "role": "production",
   "site": "sophia",
diff --git a/data/grid5000/sites/sophia/network_equipments/swx1nef.json b/data/grid5000/sites/sophia/network_equipments/swx1nef.json
index 3f052b5fb30..927e4e0cad1 100644
--- a/data/grid5000/sites/sophia/network_equipments/swx1nef.json
+++ b/data/grid5000/sites/sophia/network_equipments/swx1nef.json
@@ -62,6 +62,26 @@
       "snmp_pattern": "Port: %PORT% Gigabit"
     }
   ],
+  "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.%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.%SNMP_IFACE%",
+        "protocol": "snmp"
+      }
+    }
+  ],
   "model": "Juniper EX2500-24F-FB",
   "role": "production",
   "site": "sophia",
diff --git a/data/grid5000/sites/sophia/network_equipments/swy1nef.json b/data/grid5000/sites/sophia/network_equipments/swy1nef.json
index 6cdf076f6ea..19bee44dc9c 100644
--- a/data/grid5000/sites/sophia/network_equipments/swy1nef.json
+++ b/data/grid5000/sites/sophia/network_equipments/swy1nef.json
@@ -399,6 +399,26 @@
       "snmp_pattern": "Port: %PORT% Gigabit"
     }
   ],
+  "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.%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.%SNMP_IFACE%",
+        "protocol": "snmp"
+      }
+    }
+  ],
   "model": "Dell PowerConnect 6248",
   "role": "production",
   "site": "sophia",
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index fdd3b1e197a..b0735a5ac04 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -6,6 +6,19 @@ gw:
   kind: router
   site: sophia
   snmp_community: g5kadmin
+  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.%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.%SNMP_IFACE%
   alias:
     - gw-sophia
   ip: 172.16.143.254
@@ -198,3 +211,16 @@ gw:
         24:
           uid: srv-stock-eth1
           kind: server
+  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.%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.%SNMP_IFACE%
diff --git a/input/grid5000/sites/sophia/networks/swx1nef.yaml b/input/grid5000/sites/sophia/networks/swx1nef.yaml
index 98c0cfa2e04..c95c838187d 100644
--- a/input/grid5000/sites/sophia/networks/swx1nef.yaml
+++ b/input/grid5000/sites/sophia/networks/swx1nef.yaml
@@ -6,6 +6,19 @@ swx1nef:
   kind: switch
   site: sophia
   snmp_community: g5kadmin
+  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.%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.%SNMP_IFACE%
   backplane_bps: 240000000000
   linecards:
     0:
diff --git a/input/grid5000/sites/sophia/networks/swy1nef.yaml b/input/grid5000/sites/sophia/networks/swy1nef.yaml
index d0b37cd7624..864dd0ad2a5 100644
--- a/input/grid5000/sites/sophia/networks/swy1nef.yaml
+++ b/input/grid5000/sites/sophia/networks/swy1nef.yaml
@@ -6,6 +6,19 @@ swy1nef:
   kind: switch
   site: sophia
   snmp_community: g5kadmin
+  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.%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.%SNMP_IFACE%
   ip: 172.16.143.249
   backplane_bps: 184000000000
   linecards:
-- 
GitLab