Merge branch 'grouille' into 'master'

[grouille/nancy] Add interface for grouille-[1,2]

See merge request !170

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

@@ -3,7 +3,28 @@
   "exotic": false,
   "kavlan": false,
   "metrics": [
-
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    }
   ],
   "model": "Dell PowerEdge R7525",
   "queues": [

data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json

@@ -92,8 +92,8 @@
       "name": "eno33",
       "network_address": "grouille-1.nancy.grid5000.fr",
       "rate": 25000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrappe",
+      "switch_port": "ethernet1/1/17",
       "vendor": "Mellanox Technologies"
     },
     {

data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json

@@ -92,8 +92,8 @@
       "name": "eno33",
       "network_address": "grouille-2.nancy.grid5000.fr",
       "rate": 25000000000,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sgrappe",
+      "switch_port": "ethernet1/1/18",
       "vendor": "Mellanox Technologies"
     },
     {

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

@@ -116,8 +116,16 @@
           "uid": "grappe-16"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "ethernet1/1/17",
+          "uid": "grouille-1"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "ethernet1/1/18",
+          "uid": "grouille-2"
         },
         {
         },

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

@@ -60,6 +60,10 @@ sgrappe:
            uid: grappe-15
         16:
            uid: grappe-16
+        17: 
+           uid: grouille-1
+        18: 
+           uid: grouille-2
         25:
            snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
            kind: node