From 3f565e0dace1f7d79fe97bfa8c08a0289863ea5a Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 21 Dec 2023 23:18:43 +0100 Subject: [PATCH] Reorganisation et toilettage... --- s-gestsup.yml => old/s-gestsup.yml | 0 user-yb.yml => old/user-yb.yml | 0 roles/elk-filebeat-cli/README.md | 8 ++++++++ roles/elk-filebeat-cli/defaults/main.yml | 1 + .../{filebeat-cli => elk-filebeat-cli}/files/filebeat.yml | 0 .../{filebeat-cli => elk-filebeat-cli}/handlers/main.yml | 0 roles/{filebeat-cli => elk-filebeat-cli}/tasks/main.yml | 0 roles/{metricbeat-cli => elk-metricbeat-cli}/README.md | 5 +++-- roles/elk-metricbeat-cli/defaults/main.yml | 1 + .../files/metricbeat.yml | 0 .../handlers/main.yml | 0 .../{metricbeat-cli => elk-metricbeat-cli}/tasks/main.yml | 0 roles/filebeat-cli/README.md | 7 ------- roles/filebeat-cli/defaults/main.yml | 1 - roles/metricbeat-cli/defaults/main.yml | 1 - roles/{ => old}/db-user/files/resolv.conf | 0 roles/{ => old}/db-user/tasks/main.yml | 0 roles/{ => old}/gestsup/README.md | 0 roles/{ => old}/gestsup/files/apache2.conf | 0 roles/{ => old}/gestsup/files/php.ini | 0 roles/{ => old}/gestsup/files/security.conf | 0 roles/{ => old}/gestsup/handlers/main.yml | 0 roles/{ => old}/gestsup/tasks/main.yml | 0 roles/{ => old}/postfix-gestsup/README.md | 0 roles/{ => old}/postfix-gestsup/files/sasl_passwd | 0 roles/{ => old}/postfix-gestsup/handlers/main.yml | 0 roles/{ => old}/postfix-gestsup/tasks/main.yml | 0 roles/{ => old}/postfix-gestsup/templates/main.cf.j2 | 0 roles/{ => old}/postfix-nd/files/main.cf | 0 roles/{ => old}/postfix-nd/files/sasl_passwd | 0 .../postfix-nd/files/thawte_Premium_Server_CA.pem | 0 roles/{ => old}/postfix-nd/handlers/main.yml | 0 roles/{ => old}/postfix-nd/tasks/main.yml | 0 33 files changed, 13 insertions(+), 11 deletions(-) rename s-gestsup.yml => old/s-gestsup.yml (100%) rename user-yb.yml => old/user-yb.yml (100%) create mode 100644 roles/elk-filebeat-cli/README.md create mode 100644 roles/elk-filebeat-cli/defaults/main.yml rename roles/{filebeat-cli => elk-filebeat-cli}/files/filebeat.yml (100%) rename roles/{filebeat-cli => elk-filebeat-cli}/handlers/main.yml (100%) rename roles/{filebeat-cli => elk-filebeat-cli}/tasks/main.yml (100%) rename roles/{metricbeat-cli => elk-metricbeat-cli}/README.md (73%) create mode 100644 roles/elk-metricbeat-cli/defaults/main.yml rename roles/{metricbeat-cli => elk-metricbeat-cli}/files/metricbeat.yml (100%) rename roles/{metricbeat-cli => elk-metricbeat-cli}/handlers/main.yml (100%) rename roles/{metricbeat-cli => elk-metricbeat-cli}/tasks/main.yml (100%) delete mode 100644 roles/filebeat-cli/README.md delete mode 100644 roles/filebeat-cli/defaults/main.yml delete mode 100644 roles/metricbeat-cli/defaults/main.yml rename roles/{ => old}/db-user/files/resolv.conf (100%) rename roles/{ => old}/db-user/tasks/main.yml (100%) rename roles/{ => old}/gestsup/README.md (100%) rename roles/{ => old}/gestsup/files/apache2.conf (100%) rename roles/{ => old}/gestsup/files/php.ini (100%) rename roles/{ => old}/gestsup/files/security.conf (100%) rename roles/{ => old}/gestsup/handlers/main.yml (100%) rename roles/{ => old}/gestsup/tasks/main.yml (100%) rename roles/{ => old}/postfix-gestsup/README.md (100%) rename roles/{ => old}/postfix-gestsup/files/sasl_passwd (100%) rename roles/{ => old}/postfix-gestsup/handlers/main.yml (100%) rename roles/{ => old}/postfix-gestsup/tasks/main.yml (100%) rename roles/{ => old}/postfix-gestsup/templates/main.cf.j2 (100%) rename roles/{ => old}/postfix-nd/files/main.cf (100%) rename roles/{ => old}/postfix-nd/files/sasl_passwd (100%) rename roles/{ => old}/postfix-nd/files/thawte_Premium_Server_CA.pem (100%) rename roles/{ => old}/postfix-nd/handlers/main.yml (100%) rename roles/{ => old}/postfix-nd/tasks/main.yml (100%) diff --git a/s-gestsup.yml b/old/s-gestsup.yml similarity index 100% rename from s-gestsup.yml rename to old/s-gestsup.yml diff --git a/user-yb.yml b/old/user-yb.yml similarity index 100% rename from user-yb.yml rename to old/user-yb.yml diff --git a/roles/elk-filebeat-cli/README.md b/roles/elk-filebeat-cli/README.md new file mode 100644 index 0000000..a1daaaa --- /dev/null +++ b/roles/elk-filebeat-cli/README.md @@ -0,0 +1,8 @@ +# Rôle elk-filebeat-cli +## Présentation + +**Filebeat** permet d'envoyer les logs système à un serveur **ELK**. +Ce rôle : + * insatlle le paquet **filebeat** + * configure **filebeat** (fichier /etc/filebeat/filebeat.yml) + * active le module **system** (Logs système) diff --git a/roles/elk-filebeat-cli/defaults/main.yml b/roles/elk-filebeat-cli/defaults/main.yml new file mode 100644 index 0000000..ea87edf --- /dev/null +++ b/roles/elk-filebeat-cli/defaults/main.yml @@ -0,0 +1 @@ +BEATVER: "8.11.5" diff --git a/roles/filebeat-cli/files/filebeat.yml b/roles/elk-filebeat-cli/files/filebeat.yml similarity index 100% rename from roles/filebeat-cli/files/filebeat.yml rename to roles/elk-filebeat-cli/files/filebeat.yml diff --git a/roles/filebeat-cli/handlers/main.yml b/roles/elk-filebeat-cli/handlers/main.yml similarity index 100% rename from roles/filebeat-cli/handlers/main.yml rename to roles/elk-filebeat-cli/handlers/main.yml diff --git a/roles/filebeat-cli/tasks/main.yml b/roles/elk-filebeat-cli/tasks/main.yml similarity index 100% rename from roles/filebeat-cli/tasks/main.yml rename to roles/elk-filebeat-cli/tasks/main.yml diff --git a/roles/metricbeat-cli/README.md b/roles/elk-metricbeat-cli/README.md similarity index 73% rename from roles/metricbeat-cli/README.md rename to roles/elk-metricbeat-cli/README.md index 224f3d6..c43231a 100644 --- a/roles/metricbeat-cli/README.md +++ b/roles/elk-metricbeat-cli/README.md @@ -1,6 +1,7 @@ -## Utilisation du rôle metricbeat-cli +# Rôle elk-metricbeat-cli +## Utilisation -Ce rôle permet d'installer l'agent metricbeat pour le serveur ELK. +Ce rôle permet d'installer l'agent **metricbeat** pour le serveur ELK. Metricbeat sert à faire des statistiques de performances sur les différents serveurs. Ce rôle fonctionne en faisant : Une installation de metricbeat, diff --git a/roles/elk-metricbeat-cli/defaults/main.yml b/roles/elk-metricbeat-cli/defaults/main.yml new file mode 100644 index 0000000..ea87edf --- /dev/null +++ b/roles/elk-metricbeat-cli/defaults/main.yml @@ -0,0 +1 @@ +BEATVER: "8.11.5" diff --git a/roles/metricbeat-cli/files/metricbeat.yml b/roles/elk-metricbeat-cli/files/metricbeat.yml similarity index 100% rename from roles/metricbeat-cli/files/metricbeat.yml rename to roles/elk-metricbeat-cli/files/metricbeat.yml diff --git a/roles/metricbeat-cli/handlers/main.yml b/roles/elk-metricbeat-cli/handlers/main.yml similarity index 100% rename from roles/metricbeat-cli/handlers/main.yml rename to roles/elk-metricbeat-cli/handlers/main.yml diff --git a/roles/metricbeat-cli/tasks/main.yml b/roles/elk-metricbeat-cli/tasks/main.yml similarity index 100% rename from roles/metricbeat-cli/tasks/main.yml rename to roles/elk-metricbeat-cli/tasks/main.yml diff --git a/roles/filebeat-cli/README.md b/roles/filebeat-cli/README.md deleted file mode 100644 index 2e7f0cc..0000000 --- a/roles/filebeat-cli/README.md +++ /dev/null @@ -1,7 +0,0 @@ -## Explication du rôle filebeat-cli - -Filebeat permet de centraliser et simplifier la gestion de logs pour ELK. -Ce rôle fonctionne en faisant : -Une installation de filebeat -Une configuration de filebeat -Une activation du module system(Logs système) diff --git a/roles/filebeat-cli/defaults/main.yml b/roles/filebeat-cli/defaults/main.yml deleted file mode 100644 index 6d40b5c..0000000 --- a/roles/filebeat-cli/defaults/main.yml +++ /dev/null @@ -1 +0,0 @@ -BEATVER: "8.5.3" diff --git a/roles/metricbeat-cli/defaults/main.yml b/roles/metricbeat-cli/defaults/main.yml deleted file mode 100644 index 6d40b5c..0000000 --- a/roles/metricbeat-cli/defaults/main.yml +++ /dev/null @@ -1 +0,0 @@ -BEATVER: "8.5.3" diff --git a/roles/db-user/files/resolv.conf b/roles/old/db-user/files/resolv.conf similarity index 100% rename from roles/db-user/files/resolv.conf rename to roles/old/db-user/files/resolv.conf diff --git a/roles/db-user/tasks/main.yml b/roles/old/db-user/tasks/main.yml similarity index 100% rename from roles/db-user/tasks/main.yml rename to roles/old/db-user/tasks/main.yml diff --git a/roles/gestsup/README.md b/roles/old/gestsup/README.md similarity index 100% rename from roles/gestsup/README.md rename to roles/old/gestsup/README.md diff --git a/roles/gestsup/files/apache2.conf b/roles/old/gestsup/files/apache2.conf similarity index 100% rename from roles/gestsup/files/apache2.conf rename to roles/old/gestsup/files/apache2.conf diff --git a/roles/gestsup/files/php.ini b/roles/old/gestsup/files/php.ini similarity index 100% rename from roles/gestsup/files/php.ini rename to roles/old/gestsup/files/php.ini diff --git a/roles/gestsup/files/security.conf b/roles/old/gestsup/files/security.conf similarity index 100% rename from roles/gestsup/files/security.conf rename to roles/old/gestsup/files/security.conf diff --git a/roles/gestsup/handlers/main.yml b/roles/old/gestsup/handlers/main.yml similarity index 100% rename from roles/gestsup/handlers/main.yml rename to roles/old/gestsup/handlers/main.yml diff --git a/roles/gestsup/tasks/main.yml b/roles/old/gestsup/tasks/main.yml similarity index 100% rename from roles/gestsup/tasks/main.yml rename to roles/old/gestsup/tasks/main.yml diff --git a/roles/postfix-gestsup/README.md b/roles/old/postfix-gestsup/README.md similarity index 100% rename from roles/postfix-gestsup/README.md rename to roles/old/postfix-gestsup/README.md diff --git a/roles/postfix-gestsup/files/sasl_passwd b/roles/old/postfix-gestsup/files/sasl_passwd similarity index 100% rename from roles/postfix-gestsup/files/sasl_passwd rename to roles/old/postfix-gestsup/files/sasl_passwd diff --git a/roles/postfix-gestsup/handlers/main.yml b/roles/old/postfix-gestsup/handlers/main.yml similarity index 100% rename from roles/postfix-gestsup/handlers/main.yml rename to roles/old/postfix-gestsup/handlers/main.yml diff --git a/roles/postfix-gestsup/tasks/main.yml b/roles/old/postfix-gestsup/tasks/main.yml similarity index 100% rename from roles/postfix-gestsup/tasks/main.yml rename to roles/old/postfix-gestsup/tasks/main.yml diff --git a/roles/postfix-gestsup/templates/main.cf.j2 b/roles/old/postfix-gestsup/templates/main.cf.j2 similarity index 100% rename from roles/postfix-gestsup/templates/main.cf.j2 rename to roles/old/postfix-gestsup/templates/main.cf.j2 diff --git a/roles/postfix-nd/files/main.cf b/roles/old/postfix-nd/files/main.cf similarity index 100% rename from roles/postfix-nd/files/main.cf rename to roles/old/postfix-nd/files/main.cf diff --git a/roles/postfix-nd/files/sasl_passwd b/roles/old/postfix-nd/files/sasl_passwd similarity index 100% rename from roles/postfix-nd/files/sasl_passwd rename to roles/old/postfix-nd/files/sasl_passwd diff --git a/roles/postfix-nd/files/thawte_Premium_Server_CA.pem b/roles/old/postfix-nd/files/thawte_Premium_Server_CA.pem similarity index 100% rename from roles/postfix-nd/files/thawte_Premium_Server_CA.pem rename to roles/old/postfix-nd/files/thawte_Premium_Server_CA.pem diff --git a/roles/postfix-nd/handlers/main.yml b/roles/old/postfix-nd/handlers/main.yml similarity index 100% rename from roles/postfix-nd/handlers/main.yml rename to roles/old/postfix-nd/handlers/main.yml diff --git a/roles/postfix-nd/tasks/main.yml b/roles/old/postfix-nd/tasks/main.yml similarity index 100% rename from roles/postfix-nd/tasks/main.yml rename to roles/old/postfix-nd/tasks/main.yml