From 4ff584ef112d6bef06b0b7270297b1d6c989cc29 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Wed, 20 May 2020 13:50:35 +0200
Subject: [PATCH] [lib] kwollect - fix issue with hash merging
---
.../sites/grenoble/clusters/dahu/dahu.json | 8 ----
.../sites/grenoble/clusters/troll/troll.json | 8 ----
.../sites/grenoble/clusters/yeti/yeti.json | 8 ----
.../sites/lille/clusters/chetemi/chetemi.json | 16 --------
.../sites/lille/clusters/chiclet/chiclet.json | 16 --------
.../lille/clusters/chifflet/chifflet.json | 16 --------
.../lille/clusters/chifflot/chifflot.json | 16 --------
.../clusters/petitprince/petitprince.json | 16 --------
.../sites/lyon/clusters/gemini/gemini.json | 8 ----
.../sites/lyon/clusters/hercule/hercule.json | 8 ----
.../sites/lyon/clusters/nova/nova.json | 8 ----
.../sites/lyon/clusters/orion/orion.json | 8 ----
.../sites/lyon/clusters/pyxis/pyxis.json | 8 ----
.../sites/lyon/clusters/taurus/taurus.json | 8 ----
.../nancy/clusters/graffiti/graffiti.json | 8 ----
.../nancy/clusters/graoully/graoully.json | 8 ----
.../nancy/clusters/graphique/graphique.json | 8 ----
.../nancy/clusters/graphite/graphite.json | 8 ----
.../sites/nancy/clusters/grcinq/grcinq.json | 8 ----
.../sites/nancy/clusters/grele/grele.json | 8 ----
.../sites/nancy/clusters/grimani/grimani.json | 8 ----
.../nancy/clusters/grimoire/grimoire.json | 32 ---------------
.../sites/nancy/clusters/grisou/grisou.json | 40 -------------------
.../sites/nancy/clusters/gros/gros.json | 16 --------
.../sites/nancy/clusters/grue/grue.json | 8 ----
.../sites/nancy/clusters/grvingt/grvingt.json | 8 ----
.../nantes/clusters/econome/econome.json | 8 ----
.../nantes/clusters/ecotype/ecotype.json | 16 --------
.../rennes/clusters/paranoia/paranoia.json | 24 -----------
.../rennes/clusters/parapide/parapide.json | 8 ----
.../rennes/clusters/parapluie/parapluie.json | 8 ----
.../rennes/clusters/parasilo/parasilo.json | 16 --------
.../rennes/clusters/paravance/paravance.json | 16 --------
.../sites/sophia/clusters/suno/suno.json | 8 ----
.../sites/sophia/clusters/uvb/uvb.json | 8 ----
lib/refrepo/input_loader.rb | 6 +--
36 files changed, 3 insertions(+), 427 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index 6347667c153..677c8cdba11 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
@@ -224,10 +224,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -239,10 +235,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/grenoble/clusters/troll/troll.json b/data/grid5000/sites/grenoble/clusters/troll/troll.json
index 1ad44393b54..528ad8940d5 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/troll.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/troll.json
@@ -321,10 +321,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -336,10 +332,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
index cb97226eb49..a22a920c728 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
@@ -272,10 +272,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -287,10 +283,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
index df4ba68e961..c68ddffd619 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
@@ -313,10 +313,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -328,10 +324,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -343,10 +335,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -358,10 +346,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
index 1e121ce832e..2a0906adc7c 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
@@ -209,10 +209,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -224,10 +220,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -239,10 +231,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -254,10 +242,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
index afaf9459830..90785f1c301 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
@@ -209,10 +209,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -224,10 +220,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -239,10 +231,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -254,10 +242,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
index c78caf7b0cf..9fa458b7fb3 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
@@ -237,10 +237,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -252,10 +248,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -267,10 +259,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -282,10 +270,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
index 694313d3fcc..eac298a054e 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
@@ -66,10 +66,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -81,10 +77,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -96,10 +88,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -111,10 +99,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lyon/clusters/gemini/gemini.json b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
index 91d04686ec7..8a83b437551 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/gemini.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
@@ -904,10 +904,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -919,10 +915,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lyon/clusters/hercule/hercule.json b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
index b5e94437e8a..a5142a1d693 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/hercule.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
@@ -230,10 +230,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -245,10 +241,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index 9aed36fe9d6..a173b1ceabd 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -233,10 +233,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -248,10 +244,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index 7e0b05072ee..2fdfe8684ed 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -218,10 +218,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -233,10 +229,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
index 3a8942b4635..07ba0a3543f 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
@@ -9,10 +9,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -24,10 +20,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index d3a0e17fe78..a7b518a5fc3 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -218,10 +218,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -233,10 +229,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index 9aac6b0273c..b10113f4928 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -224,10 +224,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -239,10 +235,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/graoully/graoully.json b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
index 6b5b8ad3c6d..c0267a80f42 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/graoully.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
@@ -294,10 +294,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -309,10 +305,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/graphique/graphique.json b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
index 2e4ae61ab4f..bb1886dcc3b 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/graphique.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
@@ -209,10 +209,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -224,10 +220,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/graphite/graphite.json b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
index 09bece50729..a5dfc215c58 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/graphite.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
@@ -209,10 +209,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -224,10 +220,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json b/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
index 6ecfac4da57..cb8ea2eaba4 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
@@ -220,10 +220,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -235,10 +231,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/grele/grele.json b/data/grid5000/sites/nancy/clusters/grele/grele.json
index 019346f3ea0..5f5254d079c 100644
--- a/data/grid5000/sites/nancy/clusters/grele/grele.json
+++ b/data/grid5000/sites/nancy/clusters/grele/grele.json
@@ -209,10 +209,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -224,10 +220,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/grimani/grimani.json b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
index 92b03b47b52..f30655f69bf 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/grimani.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
@@ -209,10 +209,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -224,10 +220,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
index 1fd6ab00e8b..5a01a858bda 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
@@ -294,10 +294,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -309,10 +305,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -324,10 +316,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -339,10 +327,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -354,10 +338,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -369,10 +349,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -384,10 +360,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -399,10 +371,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/grisou/grisou.json b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
index 3ab0c966e4e..fad2628544d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/grisou.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
@@ -294,10 +294,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -309,10 +305,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -324,10 +316,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -339,10 +327,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -354,10 +338,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -369,10 +349,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -384,10 +360,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -399,10 +371,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -414,10 +382,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -429,10 +393,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/gros/gros.json b/data/grid5000/sites/nancy/clusters/gros/gros.json
index 80853a81640..40900ae6941 100644
--- a/data/grid5000/sites/nancy/clusters/gros/gros.json
+++ b/data/grid5000/sites/nancy/clusters/gros/gros.json
@@ -229,10 +229,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -244,10 +240,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -259,10 +251,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -274,10 +262,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json
index 8d47aa21f36..54ae6fed296 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -265,10 +265,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -280,10 +276,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
index 2754361976b..3006d4ade36 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
@@ -224,10 +224,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -239,10 +235,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nantes/clusters/econome/econome.json b/data/grid5000/sites/nantes/clusters/econome/econome.json
index 286488d931b..6acfaa18ba5 100644
--- a/data/grid5000/sites/nantes/clusters/econome/econome.json
+++ b/data/grid5000/sites/nantes/clusters/econome/econome.json
@@ -220,10 +220,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -235,10 +231,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
index 537c11d6759..6d255513fd2 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
@@ -313,10 +313,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -328,10 +324,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -343,10 +335,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -358,10 +346,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json b/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json
index 670763fd0f9..c157411408c 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json
@@ -9,10 +9,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -24,10 +20,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -39,10 +31,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -54,10 +42,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -69,10 +53,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -84,10 +64,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/rennes/clusters/parapide/parapide.json b/data/grid5000/sites/rennes/clusters/parapide/parapide.json
index 7313bba528b..a86da17c8a6 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/parapide.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/parapide.json
@@ -17,10 +17,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -32,10 +28,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
index 793e472aad5..afbd6c7e29c 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
@@ -805,10 +805,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -820,10 +816,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
index d1f030ec5f7..328361030f4 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
@@ -294,10 +294,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -309,10 +305,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -324,10 +316,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -339,10 +327,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/rennes/clusters/paravance/paravance.json b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
index c9ca740f44d..19680fad274 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/paravance.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
@@ -294,10 +294,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -309,10 +305,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -324,10 +316,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -339,10 +327,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/sophia/clusters/suno/suno.json b/data/grid5000/sites/sophia/clusters/suno/suno.json
index 51cb2042815..fe1d1e1b121 100644
--- a/data/grid5000/sites/sophia/clusters/suno/suno.json
+++ b/data/grid5000/sites/sophia/clusters/suno/suno.json
@@ -122,10 +122,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -137,10 +133,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/data/grid5000/sites/sophia/clusters/uvb/uvb.json b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
index deb1475b399..3c576540da6 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/uvb.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
@@ -149,10 +149,6 @@
},
"name": "network_ifacein_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
@@ -164,10 +160,6 @@
},
"name": "network_ifaceout_bytes_total",
"period": 1000,
- "source": {
- "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
- "protocol": "snmp"
- },
"source": {
"protocol": "network_equipment"
}
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 844ee3fe3b4..891f13d4bbc 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -249,9 +249,9 @@ def add_network_metrics(h)
site.fetch('networks', {}).fetch(switch, {}).fetch('metrics', []).select{|m| m['name'] =~ /network_.*_bytes_total/}.each do |metric|
# add this metric to cluster's list of available metrics, associated to node interface
- cluster['metrics'].push(metric.merge(
- {"labels": {"interface": iface_uid}, "source": {"protocol": "network_equipment"}}
- ))
+ new_metric = metric.merge({"labels": {"interface": iface_uid}})
+ new_metric["source"] = {"protocol": "network_equipment"}
+ cluster['metrics'].push(new_metric)
end
end
end
--
GitLab