diff --git a/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json b/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
index 0367b4098accd34072043a590c658e4ed4d71661..00cc42cefb648bf98aa25e3ec1a461e6643e9644 100644
--- a/data/grid5000/sites/nancy/clusters/grostiti/grostiti.json
+++ b/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",
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-next.json b/data/grid5000/sites/nancy/network_equipments/gw-next.json
index edc1eb95f9a9940d6f6fd216e2d7fffce799a77f..fa829fa3ac5c564454c627d897a2a42e124c50ad 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-next.json
+++ b/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",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index 2e925ec7cfad98132afd9c17f5ed3f91292a992c..cce26b2e726debf17b86b7b1b580cef5645d874a 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/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"
}
],
diff --git a/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json b/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json
deleted file mode 100644
index 88a512524ff17e06c22daebfda802937368a486b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "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
diff --git a/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json b/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json
deleted file mode 100644
index 819516fdc8440ed13ba505d3fe2ee4dc0a8d1e12..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "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
diff --git a/input/grid5000/sites/nancy/networks/gw-next.yaml b/input/grid5000/sites/nancy/networks/gw-next.yaml
index e5c2fce23dad8d0a86f333818c359bc9975662f2..c264b2f350490a34e4ec08234f690d73f36ffdb5 100644
--- a/input/grid5000/sites/nancy/networks/gw-next.yaml
+++ b/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
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index a7a8f14cadf71afb4ee2af89ae368388c859927a..38dc674c05c29bb10d3c65d4df9811623b75efdf 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/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:
diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml
index 0b54ed56953deffc0fe3966aae100d60898072c6..74dff979f9b157fda03328e7d77e637c70b2d54f 100644
--- a/input/grid5000/sites/nancy/pdus.yaml
+++ b/input/grid5000/sites/nancy/pdus.yaml
@@ -1,9 +1,5 @@
---
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