From e4142b9c183e1963c5e7fc68125179304bd065e8 Mon Sep 17 00:00:00 2001
From: PHILIPPOT Sebastien <sebastien.philippot@irisa.fr>
Date: Thu, 14 May 2020 15:30:36 +0200
Subject: [PATCH] [all_sites] remove VM supervision with alias for nagios and
munin
---
.../sites/grenoble/servers/supervision.json | 14 --------------
.../sites/lille/servers/supervision.json | 17 -----------------
.../sites/luxembourg/servers/supervision.json | 14 --------------
.../sites/lyon/servers/supervision.json | 14 --------------
.../sites/nancy/servers/supervision.json | 14 --------------
.../sites/nantes/servers/supervision.json | 17 -----------------
.../sites/rennes/servers/supervision.json | 14 --------------
.../sites/sophia/servers/supervision.json | 13 -------------
.../sites/grenoble/servers/virtual.yaml | 4 ----
input/grid5000/sites/lille/servers/virtual.yaml | 10 ----------
.../sites/luxembourg/servers/virtual.yaml | 4 ----
input/grid5000/sites/lyon/servers/virtual.yaml | 4 ----
input/grid5000/sites/nancy/servers/virtual.yaml | 4 ----
.../grid5000/sites/nantes/servers/virtual.yaml | 10 ----------
.../grid5000/sites/rennes/servers/virtual.yaml | 6 ------
.../grid5000/sites/sophia/servers/virtual.yaml | 7 -------
16 files changed, 166 deletions(-)
delete mode 100644 data/grid5000/sites/grenoble/servers/supervision.json
delete mode 100644 data/grid5000/sites/lille/servers/supervision.json
delete mode 100644 data/grid5000/sites/luxembourg/servers/supervision.json
delete mode 100644 data/grid5000/sites/lyon/servers/supervision.json
delete mode 100644 data/grid5000/sites/nancy/servers/supervision.json
delete mode 100644 data/grid5000/sites/nantes/servers/supervision.json
delete mode 100644 data/grid5000/sites/rennes/servers/supervision.json
delete mode 100644 data/grid5000/sites/sophia/servers/supervision.json
diff --git a/data/grid5000/sites/grenoble/servers/supervision.json b/data/grid5000/sites/grenoble/servers/supervision.json
deleted file mode 100644
index 56fde41eed3..00000000000
--- 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 80f5e5ff541..00000000000
--- 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 9885a5f75de..00000000000
--- 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 09ca5f2b27e..00000000000
--- 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 73edbff5d4b..00000000000
--- 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 469b836047a..00000000000
--- 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 78ef4c9b653..00000000000
--- 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 9f7be9034c6..00000000000
--- 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 5bb48ec270d..15788132c60 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 f85d9e35f20..9cff20345c3 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 b854602ca1b..6b229d37915 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 a027b8ee51d..0c2c347959d 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 164674a021f..2545d4423c5 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 cf8a63cbee6..7c068bc5c29 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 500b1780f6b..d494d179f8a 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 2dfd961e94b..b09c1f1348d 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:
--
GitLab