diff --git a/data/grid5000/sites/grenoble/servers/supervision.json b/data/grid5000/sites/grenoble/servers/supervision.json
deleted file mode 100644
index 56fde41eed3e88c2fcc4c682f726ca285b23d6a9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/servers/supervision.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "alias": [
- "nagios",
- "munin"
- ],
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.31.114"
- }
- },
- "type": "server",
- "uid": "supervision"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/servers/supervision.json b/data/grid5000/sites/lille/servers/supervision.json
deleted file mode 100644
index 80f5e5ff541bb882621ba24786ff259fe86b267e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/servers/supervision.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "alias": [
- "nagios",
- "munin"
- ],
- "kind": "virtual",
- "network_adapters": {
- "adm": {
- "ip": "172.17.47.109"
- },
- "default": {
- "ip": "172.16.47.109"
- }
- },
- "type": "server",
- "uid": "supervision"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/servers/supervision.json b/data/grid5000/sites/luxembourg/servers/supervision.json
deleted file mode 100644
index 9885a5f75de4d470656d656fa50aa2470cb81c1f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/servers/supervision.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "alias": [
- "nagios",
- "munin"
- ],
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.191.111"
- }
- },
- "type": "server",
- "uid": "supervision"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/servers/supervision.json b/data/grid5000/sites/lyon/servers/supervision.json
deleted file mode 100644
index 09ca5f2b27e35c363093b433f5f61efd6b7b86b6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/servers/supervision.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "alias": [
- "nagios",
- "munin"
- ],
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.63.105"
- }
- },
- "type": "server",
- "uid": "supervision"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/supervision.json b/data/grid5000/sites/nancy/servers/supervision.json
deleted file mode 100644
index 73edbff5d4b2f067ab6459a16641b68feb6e0040..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/servers/supervision.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "alias": [
- "nagios",
- "munin"
- ],
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.79.113"
- }
- },
- "type": "server",
- "uid": "supervision"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/supervision.json b/data/grid5000/sites/nantes/servers/supervision.json
deleted file mode 100644
index 469b836047a22c63f7921e673479ba216d05379a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nantes/servers/supervision.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "alias": [
- "munin",
- "nagios"
- ],
- "kind": "virtual",
- "network_adapters": {
- "adm": {
- "ip": "172.17.207.110"
- },
- "default": {
- "ip": "172.16.207.110"
- }
- },
- "type": "server",
- "uid": "supervision"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/supervision.json b/data/grid5000/sites/rennes/servers/supervision.json
deleted file mode 100644
index 78ef4c9b6539a85b26560df2a2da40ec3c42549b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/servers/supervision.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "alias": [
- "nagios",
- "munin"
- ],
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.111.122"
- }
- },
- "type": "server",
- "uid": "supervision"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/servers/supervision.json b/data/grid5000/sites/sophia/servers/supervision.json
deleted file mode 100644
index 9f7be9034c64ff1eb88e01eb677abd04753ba011..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/servers/supervision.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "admin": {
- "ip": "172.17.143.108"
- },
- "default": {
- "ip": "172.16.143.108"
- }
- },
- "type": "server",
- "uid": "supervision"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/servers/virtual.yaml b/input/grid5000/sites/grenoble/servers/virtual.yaml
index 5bb48ec270de5edc703a046514d4110d322950e0..15788132c60706c0a0e62346848dde047d9317e7 100644
--- a/input/grid5000/sites/grenoble/servers/virtual.yaml
+++ b/input/grid5000/sites/grenoble/servers/virtual.yaml
@@ -41,10 +41,6 @@ ganglia:
ldap:
kind: virtual
network_adapters: {default: {ip: 172.16.31.112}}
-supervision:
- kind: virtual
- alias: [nagios, munin]
- network_adapters: {default: {ip: 172.16.31.114}}
syslog:
kind: virtual
network_adapters: {default: {ip: 172.16.31.115}}
diff --git a/input/grid5000/sites/lille/servers/virtual.yaml b/input/grid5000/sites/lille/servers/virtual.yaml
index f85d9e35f20f141a1e280c2e9824c92b220e27c6..9cff20345c3ff435d4373b844de4b6baaad2175a 100644
--- a/input/grid5000/sites/lille/servers/virtual.yaml
+++ b/input/grid5000/sites/lille/servers/virtual.yaml
@@ -49,16 +49,6 @@ flille:
ip: 172.16.47.106
adm:
ip: 172.17.47.106
-supervision:
- kind: virtual
- alias:
- - nagios
- - munin
- network_adapters:
- default:
- ip: 172.16.47.109
- adm:
- ip: 172.17.47.109
mail:
kind: virtual
network_adapters:
diff --git a/input/grid5000/sites/luxembourg/servers/virtual.yaml b/input/grid5000/sites/luxembourg/servers/virtual.yaml
index b854602ca1be93dfe185bd170bff26f1f9fde28e..6b229d3791577b884e8f0abf16959add415c01fa 100644
--- a/input/grid5000/sites/luxembourg/servers/virtual.yaml
+++ b/input/grid5000/sites/luxembourg/servers/virtual.yaml
@@ -70,10 +70,6 @@ puppet6:
kind: virtual
alias: [puppet]
network_adapters: {default: {ip: 172.16.191.100}}
-supervision:
- kind: virtual
- alias: [nagios, munin]
- network_adapters: {default: {ip: 172.16.191.111}}
supervision2:
kind: virtual
network_adapters: {default: {ip: 172.16.191.126}}
diff --git a/input/grid5000/sites/lyon/servers/virtual.yaml b/input/grid5000/sites/lyon/servers/virtual.yaml
index a027b8ee51dc16bb7d68e12d59ce24362ffc3844..0c2c347959dd0a84fcd1b766252b779b4cc9a4ba 100644
--- a/input/grid5000/sites/lyon/servers/virtual.yaml
+++ b/input/grid5000/sites/lyon/servers/virtual.yaml
@@ -13,10 +13,6 @@ puppet6:
kind: virtual
alias: [puppet]
network_adapters: {default: {ip: 172.16.63.104}}
-supervision:
- kind: virtual
- alias: [nagios, munin]
- network_adapters: {default: {ip: 172.16.63.105}}
ldap:
kind: virtual
network_adapters: {default: {ip: 172.16.63.106}}
diff --git a/input/grid5000/sites/nancy/servers/virtual.yaml b/input/grid5000/sites/nancy/servers/virtual.yaml
index 164674a021f88b24ec06fe1794c00a6c37303007..2545d4423c54e592c6c98fb3d361af3193712728 100644
--- a/input/grid5000/sites/nancy/servers/virtual.yaml
+++ b/input/grid5000/sites/nancy/servers/virtual.yaml
@@ -32,10 +32,6 @@ puppet6:
www:
kind: virtual
network_adapters: {default: {ip: 172.16.79.112}}
-supervision:
- kind: virtual
- alias: [nagios, munin]
- network_adapters: {default: {ip: 172.16.79.113}}
oar:
kind: virtual
alias: [oar-server, oardb]
diff --git a/input/grid5000/sites/nantes/servers/virtual.yaml b/input/grid5000/sites/nantes/servers/virtual.yaml
index cf8a63cbee6dcc786d85de534927f29e1997b043..7c068bc5c29504bfdf0470c003bd3f4181961a55 100644
--- a/input/grid5000/sites/nantes/servers/virtual.yaml
+++ b/input/grid5000/sites/nantes/servers/virtual.yaml
@@ -122,16 +122,6 @@ puppet6:
network_adapters:
default:
ip: 172.16.207.105
-supervision:
- alias:
- - munin
- - nagios
- kind: virtual
- network_adapters:
- default:
- ip: 172.16.207.110
- adm:
- ip: 172.17.207.110
supervision2:
kind: virtual
network_adapters:
diff --git a/input/grid5000/sites/rennes/servers/virtual.yaml b/input/grid5000/sites/rennes/servers/virtual.yaml
index 500b1780f6bafb8080769ae14f2d49d12ab0e4a4..d494d179f8a4bd09e6cd3d8cd23bba63ee484b97 100644
--- a/input/grid5000/sites/rennes/servers/virtual.yaml
+++ b/input/grid5000/sites/rennes/servers/virtual.yaml
@@ -66,12 +66,6 @@ dns:
alias:
- ns
network_adapters: {default: {ip: 172.16.111.118}}
-supervision:
- kind: virtual
- alias:
- - nagios
- - munin
- network_adapters: {default: {ip: 172.16.111.122}}
conman:
kind: virtual
network_adapters: {default: {ip: 172.16.111.108}}
diff --git a/input/grid5000/sites/sophia/servers/virtual.yaml b/input/grid5000/sites/sophia/servers/virtual.yaml
index 2dfd961e94b60c361f9259488fc35e242cf7db4b..b09c1f1348d619e0b9ab5977fa8305b9d7c56a46 100644
--- a/input/grid5000/sites/sophia/servers/virtual.yaml
+++ b/input/grid5000/sites/sophia/servers/virtual.yaml
@@ -135,13 +135,6 @@ puppet6:
network_adapters:
default:
ip: 172.16.143.103
-supervision:
- kind: virtual
- network_adapters:
- default:
- ip: 172.16.143.108
- admin:
- ip: 172.17.143.108
supervision2:
kind: virtual
network_adapters: