Merge branch 'gratouille-prod' into 'master'

[nancy][network][gratouille] add network link to gw

See merge request !957

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

@@ -276,6 +276,94 @@
         "port": 9400,
         "protocol": "prometheus"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 10000,
+      "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": 10000,
+      "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": 10000,
+      "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": 10000,
+      "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": 10000,
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R730",

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

@@ -110,8 +110,8 @@
       "rate": 10000000000,
       "sriov": true,
       "sriov_totalvfs": 63,
-      "switch": null,
-      "switch_port": null,
+      "switch": "gw",
+      "switch_port": "Ethernet7/14",
       "vendor": "Intel"
     },
     {

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

@@ -354,6 +354,10 @@
           "uid": "grele-13"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet7/14",
+          "uid": "gratouille-1"
         },
         {
           "kind": "server",

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

@@ -189,6 +189,8 @@ gw:
           uid: grele-12
         13:
           uid: grele-13
+        14:
+          uid: gratouille-1
         15:
           uid: talc-data
           kind: server