From ae5f021b8dcee65428fd43b790d6a1b888eada7d Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 9 Jul 2025 03:22:01 +0200 Subject: [PATCH] Shorted monitor-bot- to mon-bot- --- docs/analysis/Features.md | 2 +- docs/guides/administrator/Readme.md | 2 +- roles/README.md | 2 +- roles/core-journalctl/README.md | 2 +- roles/core-journalctl/meta/main.yml | 2 +- roles/docker/meta/main.yml | 4 ++-- roles/generic-msmtp/meta/main.yml | 2 +- .../{monitor-bot-btrfs => mon-bot-btrfs}/README.md | 4 ++-- .../files/mon-bot-btrfs.sh} | 0 roles/mon-bot-btrfs/handlers/main.yml | 5 +++++ .../meta/main.yml | 0 .../tasks/main.yml | 14 +++++++------- .../templates/mon-bot-btrfs.service.j2} | 2 +- roles/mon-bot-btrfs/vars/main.yml | 1 + roles/{monitor-bot-csp => mon-bot-csp}/README.md | 0 .../files/mon-bot-csp.py} | 0 roles/mon-bot-csp/handlers/main.yml | 5 +++++ .../{monitor-bot-csp => mon-bot-csp}/meta/main.yml | 0 .../tasks/main.yml | 12 ++++++------ .../templates/mon-bot-csp.service.j2} | 0 roles/mon-bot-csp/vars/main.yml | 2 ++ .../README.md | 2 +- .../files/mon-bot-disc-space.sh} | 0 roles/mon-bot-disc-space/handlers/main.yml | 5 +++++ .../meta/main.yml | 0 .../tasks/main.yml | 14 +++++++------- .../templates/mon-bot-disc-space.service.j2 | 7 +++++++ roles/mon-bot-disc-space/vars/main.yml | 1 + .../README.md | 6 +++--- .../files/mon-bot-docker-container.sh} | 0 roles/mon-bot-docker-container/handlers/main.yml | 5 +++++ .../meta/main.yml | 0 .../tasks/main.yml | 14 +++++++------- .../templates/mon-bot-docker-container.service.j2} | 2 +- .../vars/main.yml | 2 +- .../README.md | 6 +++--- .../files/mon-bot-docker-volumes.sh} | 0 roles/mon-bot-docker-volumes/handlers/main.yml | 5 +++++ .../meta/main.yml | 0 .../tasks/main.yml | 14 +++++++------- .../templates/mon-bot-docker-volumes.service.j2 | 7 +++++++ .../vars/main.yml | 2 +- .../README.md | 2 +- .../files/mon-bot-journalctl.sh} | 0 roles/mon-bot-journalctl/handlers/main.yml | 5 +++++ .../meta/main.yml | 0 .../tasks/main.yml | 14 +++++++------- .../templates/mon-bot-journalctl.service.j2} | 2 +- roles/mon-bot-journalctl/vars/main.yml | 1 + .../{monitor-bot-msmtp => mon-bot-msmtp}/README.md | 8 ++++---- roles/mon-bot-msmtp/handlers/main.yml | 5 +++++ .../meta/main.yml | 0 .../tasks/main.yml | 14 +++++++------- .../templates/mon-bot-msmtp.service.j2} | 2 +- .../templates/mon-bot-msmtp.sh.j2} | 0 roles/mon-bot-msmtp/vars/main.yml | 1 + .../README.md | 2 +- .../TODO.md | 0 roles/mon-bot-webserver/handlers/main.yml | 5 +++++ .../meta/main.yml | 0 .../tasks/main.yml | 14 +++++++------- .../templates/mon-bot-webserver.py.j2} | 0 .../templates/mon-bot-webserver.service.j2} | 2 +- roles/mon-bot-webserver/vars/main.yml | 1 + roles/monitor-bot-btrfs/handlers/main.yml | 5 ----- roles/monitor-bot-btrfs/vars/main.yml | 1 - roles/monitor-bot-csp/handlers/main.yml | 5 ----- roles/monitor-bot-csp/vars/main.yml | 2 -- roles/monitor-bot-disc-space/handlers/main.yml | 5 ----- .../templates/monitor-bot-disc-space.service.j2 | 7 ------- roles/monitor-bot-disc-space/vars/main.yml | 1 - .../monitor-bot-docker-container/handlers/main.yml | 5 ----- roles/monitor-bot-docker-volumes/handlers/main.yml | 5 ----- .../monitor-bot-docker-volumes.service.j2 | 7 ------- roles/monitor-bot-journalctl/handlers/main.yml | 5 ----- roles/monitor-bot-journalctl/vars/main.yml | 1 - roles/monitor-bot-msmtp/handlers/main.yml | 5 ----- roles/monitor-bot-msmtp/vars/main.yml | 1 - roles/monitor-bot-webserver/handlers/main.yml | 5 ----- roles/monitor-bot-webserver/vars/main.yml | 1 - roles/webserver-core/meta/main.yml | 4 ++-- tasks/plays/02_server.yml | 4 ++-- 82 files changed, 150 insertions(+), 150 deletions(-) rename roles/{monitor-bot-btrfs => mon-bot-btrfs}/README.md (92%) rename roles/{monitor-bot-btrfs/files/monitor-bot-btrfs.sh => mon-bot-btrfs/files/mon-bot-btrfs.sh} (100%) create mode 100644 roles/mon-bot-btrfs/handlers/main.yml rename roles/{monitor-bot-btrfs => mon-bot-btrfs}/meta/main.yml (100%) rename roles/{monitor-bot-btrfs => mon-bot-btrfs}/tasks/main.yml (56%) rename roles/{monitor-bot-btrfs/templates/monitor-bot-btrfs.service.j2 => mon-bot-btrfs/templates/mon-bot-btrfs.service.j2} (59%) create mode 100644 roles/mon-bot-btrfs/vars/main.yml rename roles/{monitor-bot-csp => mon-bot-csp}/README.md (100%) rename roles/{monitor-bot-csp/files/monitor-bot-csp.py => mon-bot-csp/files/mon-bot-csp.py} (100%) create mode 100644 roles/mon-bot-csp/handlers/main.yml rename roles/{monitor-bot-csp => mon-bot-csp}/meta/main.yml (100%) rename roles/{monitor-bot-csp => mon-bot-csp}/tasks/main.yml (80%) rename roles/{monitor-bot-csp/templates/monitor-bot-csp.service.j2 => mon-bot-csp/templates/mon-bot-csp.service.j2} (100%) create mode 100644 roles/mon-bot-csp/vars/main.yml rename roles/{monitor-bot-disc-space => mon-bot-disc-space}/README.md (92%) rename roles/{monitor-bot-disc-space/files/monitor-bot-disc-space.sh => mon-bot-disc-space/files/mon-bot-disc-space.sh} (100%) create mode 100644 roles/mon-bot-disc-space/handlers/main.yml rename roles/{monitor-bot-disc-space => mon-bot-disc-space}/meta/main.yml (100%) rename roles/{monitor-bot-disc-space => mon-bot-disc-space}/tasks/main.yml (54%) create mode 100644 roles/mon-bot-disc-space/templates/mon-bot-disc-space.service.j2 create mode 100644 roles/mon-bot-disc-space/vars/main.yml rename roles/{monitor-bot-docker-container => mon-bot-docker-container}/README.md (77%) rename roles/{monitor-bot-docker-container/files/monitor-bot-docker-container.sh => mon-bot-docker-container/files/mon-bot-docker-container.sh} (100%) create mode 100644 roles/mon-bot-docker-container/handlers/main.yml rename roles/{monitor-bot-docker-container => mon-bot-docker-container}/meta/main.yml (100%) rename roles/{monitor-bot-docker-container => mon-bot-docker-container}/tasks/main.yml (68%) rename roles/{monitor-bot-docker-container/templates/monitor-bot-docker-container.service.j2 => mon-bot-docker-container/templates/mon-bot-docker-container.service.j2} (55%) rename roles/{monitor-bot-docker-container => mon-bot-docker-container}/vars/main.yml (68%) rename roles/{monitor-bot-docker-volumes => mon-bot-docker-volumes}/README.md (77%) rename roles/{monitor-bot-docker-volumes/files/monitor-bot-docker-volumes.sh => mon-bot-docker-volumes/files/mon-bot-docker-volumes.sh} (100%) create mode 100644 roles/mon-bot-docker-volumes/handlers/main.yml rename roles/{monitor-bot-docker-volumes => mon-bot-docker-volumes}/meta/main.yml (100%) rename roles/{monitor-bot-docker-volumes => mon-bot-docker-volumes}/tasks/main.yml (68%) create mode 100644 roles/mon-bot-docker-volumes/templates/mon-bot-docker-volumes.service.j2 rename roles/{monitor-bot-docker-volumes => mon-bot-docker-volumes}/vars/main.yml (71%) rename roles/{monitor-bot-journalctl => mon-bot-journalctl}/README.md (93%) rename roles/{monitor-bot-journalctl/files/monitor-bot-journalctl.sh => mon-bot-journalctl/files/mon-bot-journalctl.sh} (100%) create mode 100644 roles/mon-bot-journalctl/handlers/main.yml rename roles/{monitor-bot-journalctl => mon-bot-journalctl}/meta/main.yml (100%) rename roles/{monitor-bot-journalctl => mon-bot-journalctl}/tasks/main.yml (69%) rename roles/{monitor-bot-journalctl/templates/monitor-bot-journalctl.service.j2 => mon-bot-journalctl/templates/mon-bot-journalctl.service.j2} (60%) create mode 100644 roles/mon-bot-journalctl/vars/main.yml rename roles/{monitor-bot-msmtp => mon-bot-msmtp}/README.md (55%) create mode 100644 roles/mon-bot-msmtp/handlers/main.yml rename roles/{monitor-bot-msmtp => mon-bot-msmtp}/meta/main.yml (100%) rename roles/{monitor-bot-msmtp => mon-bot-msmtp}/tasks/main.yml (57%) rename roles/{monitor-bot-msmtp/templates/monitor-bot-msmtp.service.j2 => mon-bot-msmtp/templates/mon-bot-msmtp.service.j2} (62%) rename roles/{monitor-bot-msmtp/templates/monitor-bot-msmtp.sh.j2 => mon-bot-msmtp/templates/mon-bot-msmtp.sh.j2} (100%) create mode 100644 roles/mon-bot-msmtp/vars/main.yml rename roles/{monitor-bot-webserver => mon-bot-webserver}/README.md (97%) rename roles/{monitor-bot-webserver => mon-bot-webserver}/TODO.md (100%) create mode 100644 roles/mon-bot-webserver/handlers/main.yml rename roles/{monitor-bot-webserver => mon-bot-webserver}/meta/main.yml (100%) rename roles/{monitor-bot-webserver => mon-bot-webserver}/tasks/main.yml (72%) rename roles/{monitor-bot-webserver/templates/monitor-bot-webserver.py.j2 => mon-bot-webserver/templates/mon-bot-webserver.py.j2} (100%) rename roles/{monitor-bot-webserver/templates/monitor-bot-webserver.service.j2 => mon-bot-webserver/templates/mon-bot-webserver.service.j2} (60%) create mode 100644 roles/mon-bot-webserver/vars/main.yml delete mode 100644 roles/monitor-bot-btrfs/handlers/main.yml delete mode 100644 roles/monitor-bot-btrfs/vars/main.yml delete mode 100644 roles/monitor-bot-csp/handlers/main.yml delete mode 100644 roles/monitor-bot-csp/vars/main.yml delete mode 100644 roles/monitor-bot-disc-space/handlers/main.yml delete mode 100644 roles/monitor-bot-disc-space/templates/monitor-bot-disc-space.service.j2 delete mode 100644 roles/monitor-bot-disc-space/vars/main.yml delete mode 100644 roles/monitor-bot-docker-container/handlers/main.yml delete mode 100644 roles/monitor-bot-docker-volumes/handlers/main.yml delete mode 100644 roles/monitor-bot-docker-volumes/templates/monitor-bot-docker-volumes.service.j2 delete mode 100644 roles/monitor-bot-journalctl/handlers/main.yml delete mode 100644 roles/monitor-bot-journalctl/vars/main.yml delete mode 100644 roles/monitor-bot-msmtp/handlers/main.yml delete mode 100644 roles/monitor-bot-msmtp/vars/main.yml delete mode 100644 roles/monitor-bot-webserver/handlers/main.yml delete mode 100644 roles/monitor-bot-webserver/vars/main.yml diff --git a/docs/analysis/Features.md b/docs/analysis/Features.md index 049fb64a..848fcf23 100644 --- a/docs/analysis/Features.md +++ b/docs/analysis/Features.md @@ -12,7 +12,7 @@ CyMaIS covers everything from essential system setups to advanced configurations Every business is unique, and so is CyMaIS! With a modular architecture, it adapts to specific requirements, whether for startups, growing businesses, NGOs, or large enterprises. ## Proactive Monitoring & Maintenance 🔍 -With automated updates, system health checks, and security audits, CyMaIS ensures your infrastructure is always up-to-date and running smoothly. Roles such as `monitor-bot-docker-container`, `monitor-bot-btrfs`, and `monitor-bot-webserver` help monitor system integrity. +With automated updates, system health checks, and security audits, CyMaIS ensures your infrastructure is always up-to-date and running smoothly. Roles such as `mon-bot-docker-container`, `mon-bot-btrfs`, and `mon-bot-webserver` help monitor system integrity. ## Uncompromised Security 🔒 Security is a top priority! CyMaIS includes robust security features like full-disk encryption recommendations, 2FA enforcement, encrypted server deployments (`web-app-keycloak`, `service-openldap`), and secure backup solutions (`backup-remote-to-local`, `backup-data-to-usb`). diff --git a/docs/guides/administrator/Readme.md b/docs/guides/administrator/Readme.md index 19631460..44437e10 100644 --- a/docs/guides/administrator/Readme.md +++ b/docs/guides/administrator/Readme.md @@ -16,7 +16,7 @@ Follow these guides to install and configure CyMaIS: ## Managing & Updating CyMaIS 🔄 - Regularly update services using `update-docker`, `update-pacman`, or `update-apt`. -- Monitor system health with `monitor-bot-btrfs`, `monitor-bot-webserver`, and `monitor-bot-docker-container`. +- Monitor system health with `mon-bot-btrfs`, `mon-bot-webserver`, and `mon-bot-docker-container`. - Automate system maintenance with `maintenance-lock`, `cleanup-backups-service`, and `maintenance-docker-restart`. For more details, refer to the specific guides above. \ No newline at end of file diff --git a/roles/README.md b/roles/README.md index 54a8c3de..0a6e9b7a 100644 --- a/roles/README.md +++ b/roles/README.md @@ -59,7 +59,7 @@ For a complete list of role categories and detailed definitions, see: ## Monitoring & Alerting -- **monitor-bot-*** +- **mon-bot-*** “Bot”-style health checks with alerts via Telegram, email, etc. - **monitor-core-*** diff --git a/roles/core-journalctl/README.md b/roles/core-journalctl/README.md index 67bb4ae5..b8e4d762 100644 --- a/roles/core-journalctl/README.md +++ b/roles/core-journalctl/README.md @@ -22,7 +22,7 @@ This Ansible role manages the configuration of `systemd-journald` on target host - Customizable retention and runtime limits - Seamless restarts on config update -- Integration with `monitor-bot-journalctl` for downstream monitoring +- Integration with `mon-bot-journalctl` for downstream monitoring ## Usage diff --git a/roles/core-journalctl/meta/main.yml b/roles/core-journalctl/meta/main.yml index 913fe612..17402750 100644 --- a/roles/core-journalctl/meta/main.yml +++ b/roles/core-journalctl/meta/main.yml @@ -17,4 +17,4 @@ galaxy_info: documentation: "https://github.com/kevinveenbirkenbach/cymais/roles/core-journalctl" run_after: [] dependencies: - - monitor-bot-journalctl + - mon-bot-journalctl diff --git a/roles/docker/meta/main.yml b/roles/docker/meta/main.yml index 9afa1f48..7f86b3cd 100644 --- a/roles/docker/meta/main.yml +++ b/roles/docker/meta/main.yml @@ -29,7 +29,7 @@ galaxy_info: dependencies: - backup-docker-to-local - user-administrator - - monitor-bot-docker-container - - monitor-bot-docker-volumes + - mon-bot-docker-container + - mon-bot-docker-volumes - maintenance-docker-heal - maintenance-docker-restart diff --git a/roles/generic-msmtp/meta/main.yml b/roles/generic-msmtp/meta/main.yml index 4f09072d..245bbc0a 100644 --- a/roles/generic-msmtp/meta/main.yml +++ b/roles/generic-msmtp/meta/main.yml @@ -22,4 +22,4 @@ galaxy_info: issue_tracker_url: "https://s.veen.world/cymaisissues" documentation: "https://s.veen.world/cymais" dependencies: - - monitor-bot-msmtp + - mon-bot-msmtp diff --git a/roles/monitor-bot-btrfs/README.md b/roles/mon-bot-btrfs/README.md similarity index 92% rename from roles/monitor-bot-btrfs/README.md rename to roles/mon-bot-btrfs/README.md index 5cde1191..a6a56fba 100644 --- a/roles/monitor-bot-btrfs/README.md +++ b/roles/mon-bot-btrfs/README.md @@ -1,4 +1,4 @@ -# monitor-bot-btrfs +# mon-bot-btrfs ## Description Checks the health of all mounted Btrfs filesystems by inspecting device error counters. @@ -11,6 +11,6 @@ Checks the health of all mounted Btrfs filesystems by inspecting device error co ## Usage Just include this role in your playbook; it will: -1. Deploy a small shell script under `{{ path_administrator_scripts }}/monitor-bot-btrfs/`. +1. Deploy a small shell script under `{{ path_administrator_scripts }}/mon-bot-btrfs/`. 2. Install a `.service` and `.timer` unit. 3. Send alerts via `alert-compose` if any filesystem shows errors. diff --git a/roles/monitor-bot-btrfs/files/monitor-bot-btrfs.sh b/roles/mon-bot-btrfs/files/mon-bot-btrfs.sh similarity index 100% rename from roles/monitor-bot-btrfs/files/monitor-bot-btrfs.sh rename to roles/mon-bot-btrfs/files/mon-bot-btrfs.sh diff --git a/roles/mon-bot-btrfs/handlers/main.yml b/roles/mon-bot-btrfs/handlers/main.yml new file mode 100644 index 00000000..b85086a1 --- /dev/null +++ b/roles/mon-bot-btrfs/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload mon-bot-btrfs.cymais.service" + systemd: + name: mon-bot-btrfs.cymais.service + enabled: yes + daemon_reload: yes \ No newline at end of file diff --git a/roles/monitor-bot-btrfs/meta/main.yml b/roles/mon-bot-btrfs/meta/main.yml similarity index 100% rename from roles/monitor-bot-btrfs/meta/main.yml rename to roles/mon-bot-btrfs/meta/main.yml diff --git a/roles/monitor-bot-btrfs/tasks/main.yml b/roles/mon-bot-btrfs/tasks/main.yml similarity index 56% rename from roles/monitor-bot-btrfs/tasks/main.yml rename to roles/mon-bot-btrfs/tasks/main.yml index 12131981..ed02b51f 100644 --- a/roles/monitor-bot-btrfs/tasks/main.yml +++ b/roles/mon-bot-btrfs/tasks/main.yml @@ -4,16 +4,16 @@ state: directory mode: 0755 -- name: create monitor-bot-btrfs.sh +- name: create mon-bot-btrfs.sh copy: - src: monitor-bot-btrfs.sh - dest: "{{docker_health_btrfs_folder}}monitor-bot-btrfs.sh" + src: mon-bot-btrfs.sh + dest: "{{docker_health_btrfs_folder}}mon-bot-btrfs.sh" -- name: create monitor-bot-btrfs.cymais.service +- name: create mon-bot-btrfs.cymais.service template: - src: monitor-bot-btrfs.service.j2 - dest: /etc/systemd/system/monitor-bot-btrfs.cymais.service - notify: reload monitor-bot-btrfs.cymais.service + src: mon-bot-btrfs.service.j2 + dest: /etc/systemd/system/mon-bot-btrfs.cymais.service + notify: reload mon-bot-btrfs.cymais.service - name: set service_name to the name of the current role set_fact: diff --git a/roles/monitor-bot-btrfs/templates/monitor-bot-btrfs.service.j2 b/roles/mon-bot-btrfs/templates/mon-bot-btrfs.service.j2 similarity index 59% rename from roles/monitor-bot-btrfs/templates/monitor-bot-btrfs.service.j2 rename to roles/mon-bot-btrfs/templates/mon-bot-btrfs.service.j2 index b510f6db..f9b228fc 100644 --- a/roles/monitor-bot-btrfs/templates/monitor-bot-btrfs.service.j2 +++ b/roles/mon-bot-btrfs/templates/mon-bot-btrfs.service.j2 @@ -4,4 +4,4 @@ OnFailure=alert-compose.cymais@%n.service [Service] Type=oneshot -ExecStart=/bin/bash {{docker_health_btrfs_folder}}monitor-bot-btrfs.sh +ExecStart=/bin/bash {{docker_health_btrfs_folder}}mon-bot-btrfs.sh diff --git a/roles/mon-bot-btrfs/vars/main.yml b/roles/mon-bot-btrfs/vars/main.yml new file mode 100644 index 00000000..d3cd6532 --- /dev/null +++ b/roles/mon-bot-btrfs/vars/main.yml @@ -0,0 +1 @@ +docker_health_btrfs_folder: "{{path_administrator_scripts}}mon-bot-btrfs/" \ No newline at end of file diff --git a/roles/monitor-bot-csp/README.md b/roles/mon-bot-csp/README.md similarity index 100% rename from roles/monitor-bot-csp/README.md rename to roles/mon-bot-csp/README.md diff --git a/roles/monitor-bot-csp/files/monitor-bot-csp.py b/roles/mon-bot-csp/files/mon-bot-csp.py similarity index 100% rename from roles/monitor-bot-csp/files/monitor-bot-csp.py rename to roles/mon-bot-csp/files/mon-bot-csp.py diff --git a/roles/mon-bot-csp/handlers/main.yml b/roles/mon-bot-csp/handlers/main.yml new file mode 100644 index 00000000..c0753cd7 --- /dev/null +++ b/roles/mon-bot-csp/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload mon-bot-csp.cymais.service" + systemd: + name: mon-bot-csp.cymais.service + enabled: yes + daemon_reload: yes diff --git a/roles/monitor-bot-csp/meta/main.yml b/roles/mon-bot-csp/meta/main.yml similarity index 100% rename from roles/monitor-bot-csp/meta/main.yml rename to roles/mon-bot-csp/meta/main.yml diff --git a/roles/monitor-bot-csp/tasks/main.yml b/roles/mon-bot-csp/tasks/main.yml similarity index 80% rename from roles/monitor-bot-csp/tasks/main.yml rename to roles/mon-bot-csp/tasks/main.yml index cb64d20d..f5e9f600 100644 --- a/roles/monitor-bot-csp/tasks/main.yml +++ b/roles/mon-bot-csp/tasks/main.yml @@ -16,18 +16,18 @@ mode: 0755 when: run_once_health_csp is not defined -- name: copy monitor-bot-csp.py +- name: copy mon-bot-csp.py copy: - src: monitor-bot-csp.py + src: mon-bot-csp.py dest: "{{ health_csp_crawler_script }}" mode: 0755 when: run_once_health_csp is not defined -- name: create monitor-bot-csp.cymais.service +- name: create mon-bot-csp.cymais.service template: - src: monitor-bot-csp.service.j2 - dest: /etc/systemd/system/monitor-bot-csp.cymais.service - notify: reload monitor-bot-csp.cymais.service + src: mon-bot-csp.service.j2 + dest: /etc/systemd/system/mon-bot-csp.cymais.service + notify: reload mon-bot-csp.cymais.service when: run_once_health_csp is not defined - name: set service_name to role_name diff --git a/roles/monitor-bot-csp/templates/monitor-bot-csp.service.j2 b/roles/mon-bot-csp/templates/mon-bot-csp.service.j2 similarity index 100% rename from roles/monitor-bot-csp/templates/monitor-bot-csp.service.j2 rename to roles/mon-bot-csp/templates/mon-bot-csp.service.j2 diff --git a/roles/mon-bot-csp/vars/main.yml b/roles/mon-bot-csp/vars/main.yml new file mode 100644 index 00000000..e0c8f7b8 --- /dev/null +++ b/roles/mon-bot-csp/vars/main.yml @@ -0,0 +1,2 @@ +health_csp_crawler_folder: "{{ path_administrator_scripts }}mon-bot-csp/" +health_csp_crawler_script: "{{ health_csp_crawler_folder }}mon-bot-csp.py" \ No newline at end of file diff --git a/roles/monitor-bot-disc-space/README.md b/roles/mon-bot-disc-space/README.md similarity index 92% rename from roles/monitor-bot-disc-space/README.md rename to roles/mon-bot-disc-space/README.md index cc356a35..ab617387 100644 --- a/roles/monitor-bot-disc-space/README.md +++ b/roles/mon-bot-disc-space/README.md @@ -1,4 +1,4 @@ -# monitor-bot-disc-space +# mon-bot-disc-space ## Description Monitors disk-space usage and alerts if any filesystem usage exceeds your defined threshold. diff --git a/roles/monitor-bot-disc-space/files/monitor-bot-disc-space.sh b/roles/mon-bot-disc-space/files/mon-bot-disc-space.sh similarity index 100% rename from roles/monitor-bot-disc-space/files/monitor-bot-disc-space.sh rename to roles/mon-bot-disc-space/files/mon-bot-disc-space.sh diff --git a/roles/mon-bot-disc-space/handlers/main.yml b/roles/mon-bot-disc-space/handlers/main.yml new file mode 100644 index 00000000..73a01add --- /dev/null +++ b/roles/mon-bot-disc-space/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload mon-bot-disc-space.cymais.service" + systemd: + name: mon-bot-disc-space.cymais.service + enabled: yes + daemon_reload: yes diff --git a/roles/monitor-bot-disc-space/meta/main.yml b/roles/mon-bot-disc-space/meta/main.yml similarity index 100% rename from roles/monitor-bot-disc-space/meta/main.yml rename to roles/mon-bot-disc-space/meta/main.yml diff --git a/roles/monitor-bot-disc-space/tasks/main.yml b/roles/mon-bot-disc-space/tasks/main.yml similarity index 54% rename from roles/monitor-bot-disc-space/tasks/main.yml rename to roles/mon-bot-disc-space/tasks/main.yml index c534e15e..ac26cc9b 100644 --- a/roles/monitor-bot-disc-space/tasks/main.yml +++ b/roles/mon-bot-disc-space/tasks/main.yml @@ -4,16 +4,16 @@ state: directory mode: 0755 -- name: create monitor-bot-disc-space.sh +- name: create mon-bot-disc-space.sh copy: - src: monitor-bot-disc-space.sh - dest: "{{health_disc_space_folder}}monitor-bot-disc-space.sh" + src: mon-bot-disc-space.sh + dest: "{{health_disc_space_folder}}mon-bot-disc-space.sh" -- name: create monitor-bot-disc-space.cymais.service +- name: create mon-bot-disc-space.cymais.service template: - src: monitor-bot-disc-space.service.j2 - dest: /etc/systemd/system/monitor-bot-disc-space.cymais.service - notify: reload monitor-bot-disc-space.cymais.service + src: mon-bot-disc-space.service.j2 + dest: /etc/systemd/system/mon-bot-disc-space.cymais.service + notify: reload mon-bot-disc-space.cymais.service - name: set service_name to the name of the current role set_fact: diff --git a/roles/mon-bot-disc-space/templates/mon-bot-disc-space.service.j2 b/roles/mon-bot-disc-space/templates/mon-bot-disc-space.service.j2 new file mode 100644 index 00000000..03510b09 --- /dev/null +++ b/roles/mon-bot-disc-space/templates/mon-bot-disc-space.service.j2 @@ -0,0 +1,7 @@ +[Unit] +Description=checking disc space +OnFailure=alert-compose.cymais@%n.service + +[Service] +Type=oneshot +ExecStart=/bin/bash {{health_disc_space_folder}}mon-bot-disc-space.sh {{size_percent_disc_space_warning}} diff --git a/roles/mon-bot-disc-space/vars/main.yml b/roles/mon-bot-disc-space/vars/main.yml new file mode 100644 index 00000000..588708df --- /dev/null +++ b/roles/mon-bot-disc-space/vars/main.yml @@ -0,0 +1 @@ +health_disc_space_folder: "{{path_administrator_scripts}}mon-bot-disc-space/" \ No newline at end of file diff --git a/roles/monitor-bot-docker-container/README.md b/roles/mon-bot-docker-container/README.md similarity index 77% rename from roles/monitor-bot-docker-container/README.md rename to roles/mon-bot-docker-container/README.md index 49a4bc4b..3f6e4043 100644 --- a/roles/monitor-bot-docker-container/README.md +++ b/roles/mon-bot-docker-container/README.md @@ -8,10 +8,10 @@ This Ansible role is designed to ensure the health of Docker containers running - `vars/main.yml`: Variable definitions for the script's directory. - `handlers/main.yml`: Handlers to reload and restart the systemd service and timer. -- `files/monitor-bot-docker-container.sh`: The script that checks the container health. +- `files/mon-bot-docker-container.sh`: The script that checks the container health. - `tasks/main.yml`: Tasks to create necessary directories, copy scripts, and create systemd service and timer. -- `templates/monitor-bot-docker-container.cymais.service.j2`: Systemd service template. -- `templates/monitor-bot-docker-container.cymais.timer.j2`: Systemd timer template. +- `templates/mon-bot-docker-container.cymais.service.j2`: Systemd service template. +- `templates/mon-bot-docker-container.cymais.timer.j2`: Systemd timer template. - `meta/main.yml`: Meta information declaring dependencies for the role. ## Usage diff --git a/roles/monitor-bot-docker-container/files/monitor-bot-docker-container.sh b/roles/mon-bot-docker-container/files/mon-bot-docker-container.sh similarity index 100% rename from roles/monitor-bot-docker-container/files/monitor-bot-docker-container.sh rename to roles/mon-bot-docker-container/files/mon-bot-docker-container.sh diff --git a/roles/mon-bot-docker-container/handlers/main.yml b/roles/mon-bot-docker-container/handlers/main.yml new file mode 100644 index 00000000..86fe08a5 --- /dev/null +++ b/roles/mon-bot-docker-container/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload mon-bot-docker-container.cymais.service" + systemd: + name: mon-bot-docker-container.cymais.service + enabled: yes + daemon_reload: yes diff --git a/roles/monitor-bot-docker-container/meta/main.yml b/roles/mon-bot-docker-container/meta/main.yml similarity index 100% rename from roles/monitor-bot-docker-container/meta/main.yml rename to roles/mon-bot-docker-container/meta/main.yml diff --git a/roles/monitor-bot-docker-container/tasks/main.yml b/roles/mon-bot-docker-container/tasks/main.yml similarity index 68% rename from roles/monitor-bot-docker-container/tasks/main.yml rename to roles/mon-bot-docker-container/tasks/main.yml index bfa2a6dc..d50de3d8 100644 --- a/roles/monitor-bot-docker-container/tasks/main.yml +++ b/roles/mon-bot-docker-container/tasks/main.yml @@ -5,17 +5,17 @@ mode: 0755 when: run_once_health_docker_container is not defined -- name: create monitor-bot-docker-container.sh +- name: create mon-bot-docker-container.sh copy: - src: monitor-bot-docker-container.sh - dest: "{{health_docker_container_folder}}monitor-bot-docker-container.sh" + src: mon-bot-docker-container.sh + dest: "{{health_docker_container_folder}}mon-bot-docker-container.sh" when: run_once_health_docker_container is not defined -- name: create monitor-bot-docker-container.cymais.service +- name: create mon-bot-docker-container.cymais.service template: - src: monitor-bot-docker-container.service.j2 - dest: /etc/systemd/system/monitor-bot-docker-container.cymais.service - notify: reload monitor-bot-docker-container.cymais.service + src: mon-bot-docker-container.service.j2 + dest: /etc/systemd/system/mon-bot-docker-container.cymais.service + notify: reload mon-bot-docker-container.cymais.service when: run_once_health_docker_container is not defined - name: set service_name to the name of the current role diff --git a/roles/monitor-bot-docker-container/templates/monitor-bot-docker-container.service.j2 b/roles/mon-bot-docker-container/templates/mon-bot-docker-container.service.j2 similarity index 55% rename from roles/monitor-bot-docker-container/templates/monitor-bot-docker-container.service.j2 rename to roles/mon-bot-docker-container/templates/mon-bot-docker-container.service.j2 index 7828cc57..afd5b45c 100644 --- a/roles/monitor-bot-docker-container/templates/monitor-bot-docker-container.service.j2 +++ b/roles/mon-bot-docker-container/templates/mon-bot-docker-container.service.j2 @@ -4,4 +4,4 @@ OnFailure=alert-compose.cymais@%n.service [Service] Type=oneshot -ExecStart=/bin/bash {{health_docker_container_folder}}monitor-bot-docker-container.sh +ExecStart=/bin/bash {{health_docker_container_folder}}mon-bot-docker-container.sh diff --git a/roles/monitor-bot-docker-container/vars/main.yml b/roles/mon-bot-docker-container/vars/main.yml similarity index 68% rename from roles/monitor-bot-docker-container/vars/main.yml rename to roles/mon-bot-docker-container/vars/main.yml index ddbcf5e3..978e5320 100644 --- a/roles/monitor-bot-docker-container/vars/main.yml +++ b/roles/mon-bot-docker-container/vars/main.yml @@ -1 +1 @@ -health_docker_container_folder: "{{path_administrator_scripts}}monitor-bot-docker-container/" \ No newline at end of file +health_docker_container_folder: "{{path_administrator_scripts}}mon-bot-docker-container/" \ No newline at end of file diff --git a/roles/monitor-bot-docker-volumes/README.md b/roles/mon-bot-docker-volumes/README.md similarity index 77% rename from roles/monitor-bot-docker-volumes/README.md rename to roles/mon-bot-docker-volumes/README.md index 0e753720..341568fc 100644 --- a/roles/monitor-bot-docker-volumes/README.md +++ b/roles/mon-bot-docker-volumes/README.md @@ -8,10 +8,10 @@ This role checks for anonymous Docker volumes that are not bound to a container - `vars/main.yml`: Variable definitions for the script's directory and whitelist. - `handlers/main.yml`: Handlers to reload and restart the systemd service and timer. -- `files/monitor-bot-docker-volumes.sh`: The script that checks for anonymous Docker volumes and excludes whitelisted volumes. +- `files/mon-bot-docker-volumes.sh`: The script that checks for anonymous Docker volumes and excludes whitelisted volumes. - `tasks/main.yml`: Tasks to create necessary directories, copy scripts, and create systemd service and timer. -- `templates/monitor-bot-docker-volumes.cymais.service.j2`: Systemd service template, including the whitelisted volumes as a parameter. -- `templates/monitor-bot-docker-volumes.cymais.timer.j2`: Systemd timer template. +- `templates/mon-bot-docker-volumes.cymais.service.j2`: Systemd service template, including the whitelisted volumes as a parameter. +- `templates/mon-bot-docker-volumes.cymais.timer.j2`: Systemd timer template. - `meta/main.yml`: Meta information declaring dependencies for the role. ## Usage diff --git a/roles/monitor-bot-docker-volumes/files/monitor-bot-docker-volumes.sh b/roles/mon-bot-docker-volumes/files/mon-bot-docker-volumes.sh similarity index 100% rename from roles/monitor-bot-docker-volumes/files/monitor-bot-docker-volumes.sh rename to roles/mon-bot-docker-volumes/files/mon-bot-docker-volumes.sh diff --git a/roles/mon-bot-docker-volumes/handlers/main.yml b/roles/mon-bot-docker-volumes/handlers/main.yml new file mode 100644 index 00000000..29eceae7 --- /dev/null +++ b/roles/mon-bot-docker-volumes/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload mon-bot-docker-volumes.cymais.service" + systemd: + name: mon-bot-docker-volumes.cymais.service + enabled: yes + daemon_reload: yes diff --git a/roles/monitor-bot-docker-volumes/meta/main.yml b/roles/mon-bot-docker-volumes/meta/main.yml similarity index 100% rename from roles/monitor-bot-docker-volumes/meta/main.yml rename to roles/mon-bot-docker-volumes/meta/main.yml diff --git a/roles/monitor-bot-docker-volumes/tasks/main.yml b/roles/mon-bot-docker-volumes/tasks/main.yml similarity index 68% rename from roles/monitor-bot-docker-volumes/tasks/main.yml rename to roles/mon-bot-docker-volumes/tasks/main.yml index 190c5563..f1daf4f5 100644 --- a/roles/monitor-bot-docker-volumes/tasks/main.yml +++ b/roles/mon-bot-docker-volumes/tasks/main.yml @@ -5,17 +5,17 @@ mode: 0755 when: run_once_health_docker_volumes is not defined -- name: create monitor-bot-docker-volumes.sh +- name: create mon-bot-docker-volumes.sh copy: - src: monitor-bot-docker-volumes.sh - dest: "{{health_docker_volumes_folder}}monitor-bot-docker-volumes.sh" + src: mon-bot-docker-volumes.sh + dest: "{{health_docker_volumes_folder}}mon-bot-docker-volumes.sh" when: run_once_health_docker_volumes is not defined -- name: create monitor-bot-docker-volumes.cymais.service +- name: create mon-bot-docker-volumes.cymais.service template: - src: monitor-bot-docker-volumes.service.j2 - dest: /etc/systemd/system/monitor-bot-docker-volumes.cymais.service - notify: reload monitor-bot-docker-volumes.cymais.service + src: mon-bot-docker-volumes.service.j2 + dest: /etc/systemd/system/mon-bot-docker-volumes.cymais.service + notify: reload mon-bot-docker-volumes.cymais.service when: run_once_health_docker_volumes is not defined - name: set service_name to the name of the current role diff --git a/roles/mon-bot-docker-volumes/templates/mon-bot-docker-volumes.service.j2 b/roles/mon-bot-docker-volumes/templates/mon-bot-docker-volumes.service.j2 new file mode 100644 index 00000000..5e1f341f --- /dev/null +++ b/roles/mon-bot-docker-volumes/templates/mon-bot-docker-volumes.service.j2 @@ -0,0 +1,7 @@ +[Unit] +Description=Checking docker health +OnFailure=alert-compose.cymais@%n.service + +[Service] +Type=oneshot +ExecStart=/bin/bash {{ health_docker_volumes_folder }}mon-bot-docker-volumes.sh "{{ whitelisted_anonymous_docker_volumes | join(' ') }}" diff --git a/roles/monitor-bot-docker-volumes/vars/main.yml b/roles/mon-bot-docker-volumes/vars/main.yml similarity index 71% rename from roles/monitor-bot-docker-volumes/vars/main.yml rename to roles/mon-bot-docker-volumes/vars/main.yml index 35c4be7c..fcbc992b 100644 --- a/roles/monitor-bot-docker-volumes/vars/main.yml +++ b/roles/mon-bot-docker-volumes/vars/main.yml @@ -1 +1 @@ -health_docker_volumes_folder: "{{path_administrator_scripts}}monitor-bot-docker-volumes/" \ No newline at end of file +health_docker_volumes_folder: "{{path_administrator_scripts}}mon-bot-docker-volumes/" \ No newline at end of file diff --git a/roles/monitor-bot-journalctl/README.md b/roles/mon-bot-journalctl/README.md similarity index 93% rename from roles/monitor-bot-journalctl/README.md rename to roles/mon-bot-journalctl/README.md index 3678ee47..c0e6bb51 100644 --- a/roles/monitor-bot-journalctl/README.md +++ b/roles/mon-bot-journalctl/README.md @@ -1,4 +1,4 @@ -# monitor-bot-journalctl +# mon-bot-journalctl ## Description Scans `journalctl` over the last day for “error” entries and alerts if any are found. diff --git a/roles/monitor-bot-journalctl/files/monitor-bot-journalctl.sh b/roles/mon-bot-journalctl/files/mon-bot-journalctl.sh similarity index 100% rename from roles/monitor-bot-journalctl/files/monitor-bot-journalctl.sh rename to roles/mon-bot-journalctl/files/mon-bot-journalctl.sh diff --git a/roles/mon-bot-journalctl/handlers/main.yml b/roles/mon-bot-journalctl/handlers/main.yml new file mode 100644 index 00000000..82890d59 --- /dev/null +++ b/roles/mon-bot-journalctl/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload mon-bot-journalctl.cymais.service" + systemd: + name: mon-bot-journalctl.cymais.service + enabled: yes + daemon_reload: yes \ No newline at end of file diff --git a/roles/monitor-bot-journalctl/meta/main.yml b/roles/mon-bot-journalctl/meta/main.yml similarity index 100% rename from roles/monitor-bot-journalctl/meta/main.yml rename to roles/mon-bot-journalctl/meta/main.yml diff --git a/roles/monitor-bot-journalctl/tasks/main.yml b/roles/mon-bot-journalctl/tasks/main.yml similarity index 69% rename from roles/monitor-bot-journalctl/tasks/main.yml rename to roles/mon-bot-journalctl/tasks/main.yml index 9924b6a9..fa315bd2 100644 --- a/roles/monitor-bot-journalctl/tasks/main.yml +++ b/roles/mon-bot-journalctl/tasks/main.yml @@ -5,17 +5,17 @@ mode: 0755 when: run_once_health_journalctl is not defined -- name: create monitor-bot-journalctl.sh +- name: create mon-bot-journalctl.sh copy: - src: monitor-bot-journalctl.sh - dest: "{{health_journalctl_folder}}monitor-bot-journalctl.sh" + src: mon-bot-journalctl.sh + dest: "{{health_journalctl_folder}}mon-bot-journalctl.sh" when: run_once_health_journalctl is not defined -- name: create monitor-bot-journalctl.cymais.service +- name: create mon-bot-journalctl.cymais.service template: - src: monitor-bot-journalctl.service.j2 - dest: /etc/systemd/system/monitor-bot-journalctl.cymais.service - notify: reload monitor-bot-journalctl.cymais.service + src: mon-bot-journalctl.service.j2 + dest: /etc/systemd/system/mon-bot-journalctl.cymais.service + notify: reload mon-bot-journalctl.cymais.service when: run_once_health_journalctl is not defined - name: set service_name to the name of the current role diff --git a/roles/monitor-bot-journalctl/templates/monitor-bot-journalctl.service.j2 b/roles/mon-bot-journalctl/templates/mon-bot-journalctl.service.j2 similarity index 60% rename from roles/monitor-bot-journalctl/templates/monitor-bot-journalctl.service.j2 rename to roles/mon-bot-journalctl/templates/mon-bot-journalctl.service.j2 index 0cbdaa37..c71ac199 100644 --- a/roles/monitor-bot-journalctl/templates/monitor-bot-journalctl.service.j2 +++ b/roles/mon-bot-journalctl/templates/mon-bot-journalctl.service.j2 @@ -4,4 +4,4 @@ OnFailure=alert-compose.cymais@%n.service [Service] Type=oneshot -ExecStart=/bin/bash {{health_journalctl_folder}}monitor-bot-journalctl.sh +ExecStart=/bin/bash {{health_journalctl_folder}}mon-bot-journalctl.sh diff --git a/roles/mon-bot-journalctl/vars/main.yml b/roles/mon-bot-journalctl/vars/main.yml new file mode 100644 index 00000000..cb30ebe0 --- /dev/null +++ b/roles/mon-bot-journalctl/vars/main.yml @@ -0,0 +1 @@ +health_journalctl_folder: "{{path_administrator_scripts}}mon-bot-journalctl/" \ No newline at end of file diff --git a/roles/monitor-bot-msmtp/README.md b/roles/mon-bot-msmtp/README.md similarity index 55% rename from roles/monitor-bot-msmtp/README.md rename to roles/mon-bot-msmtp/README.md index 6d5a3fac..e6fb3ed3 100644 --- a/roles/monitor-bot-msmtp/README.md +++ b/roles/mon-bot-msmtp/README.md @@ -1,4 +1,4 @@ -# monitor-bot-msmtp +# mon-bot-msmtp ## Description @@ -6,15 +6,15 @@ This Ansible role sends periodic health check emails using **msmtp** to verify t ## Overview -Optimized for Archlinux, this role creates the required directory structure, installs and configures the monitor-bot-check script, and integrates with the **alert-telegram** role. It uses the **generic-timer** role to schedule regular checks based on your customizable `OnCalendar` setting. +Optimized for Archlinux, this role creates the required directory structure, installs and configures the mon-bot-check script, and integrates with the **alert-telegram** role. It uses the **generic-timer** role to schedule regular checks based on your customizable `OnCalendar` setting. ## Purpose -The **monitor-bot-msmtp** role ensures that your mail transport system stays available by sending a test email at defined intervals. If the email fails, a Telegram alert is triggered, allowing you to detect and address issues before they impact users. +The **mon-bot-msmtp** role ensures that your mail transport system stays available by sending a test email at defined intervals. If the email fails, a Telegram alert is triggered, allowing you to detect and address issues before they impact users. ## Features -- **Directory & Script Deployment:** Sets up `monitor-bot-msmtp/` and deploys a templated Bash script to send test emails via msmtp. +- **Directory & Script Deployment:** Sets up `mon-bot-msmtp/` and deploys a templated Bash script to send test emails via msmtp. - **Systemd Service & Timer:** Provides `.service` and `.timer` units to run the check and schedule it automatically. - **Failure Notifications:** Leverages **alert-telegram** to push alerts when the script exits with an error. - **Configurable Schedule:** Define your desired check frequency using the `on_calendar_health_msmtp` variable. diff --git a/roles/mon-bot-msmtp/handlers/main.yml b/roles/mon-bot-msmtp/handlers/main.yml new file mode 100644 index 00000000..6817c7d1 --- /dev/null +++ b/roles/mon-bot-msmtp/handlers/main.yml @@ -0,0 +1,5 @@ +- name: reload mon-bot-msmtp.cymais.service + systemd: + name: mon-bot-msmtp.cymais.service + enabled: yes + daemon_reload: yes \ No newline at end of file diff --git a/roles/monitor-bot-msmtp/meta/main.yml b/roles/mon-bot-msmtp/meta/main.yml similarity index 100% rename from roles/monitor-bot-msmtp/meta/main.yml rename to roles/mon-bot-msmtp/meta/main.yml diff --git a/roles/monitor-bot-msmtp/tasks/main.yml b/roles/mon-bot-msmtp/tasks/main.yml similarity index 57% rename from roles/monitor-bot-msmtp/tasks/main.yml rename to roles/mon-bot-msmtp/tasks/main.yml index 3dae3e05..c57f7826 100644 --- a/roles/monitor-bot-msmtp/tasks/main.yml +++ b/roles/mon-bot-msmtp/tasks/main.yml @@ -4,17 +4,17 @@ state: directory mode: 0755 -- name: create monitor-bot-msmtp.sh +- name: create mon-bot-msmtp.sh template: - src: monitor-bot-msmtp.sh.j2 - dest: "{{ health_msmtp_folder }}monitor-bot-msmtp.sh" + src: mon-bot-msmtp.sh.j2 + dest: "{{ health_msmtp_folder }}mon-bot-msmtp.sh" mode: '0755' -- name: create monitor-bot-msmtp.cymais.service +- name: create mon-bot-msmtp.cymais.service template: - src: monitor-bot-msmtp.service.j2 - dest: /etc/systemd/system/monitor-bot-msmtp.cymais.service - notify: reload monitor-bot-msmtp.cymais.service + src: mon-bot-msmtp.service.j2 + dest: /etc/systemd/system/mon-bot-msmtp.cymais.service + notify: reload mon-bot-msmtp.cymais.service - name: set service_name to the name of the current role set_fact: diff --git a/roles/monitor-bot-msmtp/templates/monitor-bot-msmtp.service.j2 b/roles/mon-bot-msmtp/templates/mon-bot-msmtp.service.j2 similarity index 62% rename from roles/monitor-bot-msmtp/templates/monitor-bot-msmtp.service.j2 rename to roles/mon-bot-msmtp/templates/mon-bot-msmtp.service.j2 index ef970249..2f5ba8d4 100644 --- a/roles/monitor-bot-msmtp/templates/monitor-bot-msmtp.service.j2 +++ b/roles/mon-bot-msmtp/templates/mon-bot-msmtp.service.j2 @@ -4,4 +4,4 @@ OnFailure=alert-telegram.cymais@%n.service [Service] Type=oneshot -ExecStart=/bin/bash {{ health_msmtp_folder }}monitor-bot-msmtp.sh +ExecStart=/bin/bash {{ health_msmtp_folder }}mon-bot-msmtp.sh diff --git a/roles/monitor-bot-msmtp/templates/monitor-bot-msmtp.sh.j2 b/roles/mon-bot-msmtp/templates/mon-bot-msmtp.sh.j2 similarity index 100% rename from roles/monitor-bot-msmtp/templates/monitor-bot-msmtp.sh.j2 rename to roles/mon-bot-msmtp/templates/mon-bot-msmtp.sh.j2 diff --git a/roles/mon-bot-msmtp/vars/main.yml b/roles/mon-bot-msmtp/vars/main.yml new file mode 100644 index 00000000..0cc56857 --- /dev/null +++ b/roles/mon-bot-msmtp/vars/main.yml @@ -0,0 +1 @@ +health_msmtp_folder: "{{ path_administrator_scripts }}mon-bot-msmtp/" \ No newline at end of file diff --git a/roles/monitor-bot-webserver/README.md b/roles/mon-bot-webserver/README.md similarity index 97% rename from roles/monitor-bot-webserver/README.md rename to roles/mon-bot-webserver/README.md index d6e74229..70e3c7db 100644 --- a/roles/monitor-bot-webserver/README.md +++ b/roles/mon-bot-webserver/README.md @@ -1,4 +1,4 @@ -# monitor-bot-webserver +# mon-bot-webserver ## Description Verifies that each of your Nginx‐served domains returns an expected HTTP status (200, 301, etc.) and alerts on deviations. diff --git a/roles/monitor-bot-webserver/TODO.md b/roles/mon-bot-webserver/TODO.md similarity index 100% rename from roles/monitor-bot-webserver/TODO.md rename to roles/mon-bot-webserver/TODO.md diff --git a/roles/mon-bot-webserver/handlers/main.yml b/roles/mon-bot-webserver/handlers/main.yml new file mode 100644 index 00000000..266207cc --- /dev/null +++ b/roles/mon-bot-webserver/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload mon-bot-webserver.cymais.service" + systemd: + name: mon-bot-webserver.cymais.service + enabled: yes + daemon_reload: yes diff --git a/roles/monitor-bot-webserver/meta/main.yml b/roles/mon-bot-webserver/meta/main.yml similarity index 100% rename from roles/monitor-bot-webserver/meta/main.yml rename to roles/mon-bot-webserver/meta/main.yml diff --git a/roles/monitor-bot-webserver/tasks/main.yml b/roles/mon-bot-webserver/tasks/main.yml similarity index 72% rename from roles/monitor-bot-webserver/tasks/main.yml rename to roles/mon-bot-webserver/tasks/main.yml index c6683895..9a584192 100644 --- a/roles/monitor-bot-webserver/tasks/main.yml +++ b/roles/mon-bot-webserver/tasks/main.yml @@ -11,17 +11,17 @@ mode: 0755 when: run_once_health_nginx is not defined -- name: create monitor-bot-webserver.py +- name: create mon-bot-webserver.py template: - src: monitor-bot-webserver.py.j2 - dest: "{{ health_nginx_folder }}monitor-bot-webserver.py" + src: mon-bot-webserver.py.j2 + dest: "{{ health_nginx_folder }}mon-bot-webserver.py" when: run_once_health_nginx is not defined -- name: create monitor-bot-webserver.cymais.service +- name: create mon-bot-webserver.cymais.service template: - src: monitor-bot-webserver.service.j2 - dest: /etc/systemd/system/monitor-bot-webserver.cymais.service - notify: reload monitor-bot-webserver.cymais.service + src: mon-bot-webserver.service.j2 + dest: /etc/systemd/system/mon-bot-webserver.cymais.service + notify: reload mon-bot-webserver.cymais.service when: run_once_health_nginx is not defined - name: set service_name to the name of the current role diff --git a/roles/monitor-bot-webserver/templates/monitor-bot-webserver.py.j2 b/roles/mon-bot-webserver/templates/mon-bot-webserver.py.j2 similarity index 100% rename from roles/monitor-bot-webserver/templates/monitor-bot-webserver.py.j2 rename to roles/mon-bot-webserver/templates/mon-bot-webserver.py.j2 diff --git a/roles/monitor-bot-webserver/templates/monitor-bot-webserver.service.j2 b/roles/mon-bot-webserver/templates/mon-bot-webserver.service.j2 similarity index 60% rename from roles/monitor-bot-webserver/templates/monitor-bot-webserver.service.j2 rename to roles/mon-bot-webserver/templates/mon-bot-webserver.service.j2 index e6d11e12..0c115d6e 100644 --- a/roles/monitor-bot-webserver/templates/monitor-bot-webserver.service.j2 +++ b/roles/mon-bot-webserver/templates/mon-bot-webserver.service.j2 @@ -4,4 +4,4 @@ OnFailure=alert-compose.cymais@%n.service [Service] Type=oneshot -ExecStart=/usr/bin/python3 {{ health_nginx_folder }}monitor-bot-webserver.py +ExecStart=/usr/bin/python3 {{ health_nginx_folder }}mon-bot-webserver.py diff --git a/roles/mon-bot-webserver/vars/main.yml b/roles/mon-bot-webserver/vars/main.yml new file mode 100644 index 00000000..a232f0f1 --- /dev/null +++ b/roles/mon-bot-webserver/vars/main.yml @@ -0,0 +1 @@ +health_nginx_folder: "{{ path_administrator_scripts }}mon-bot-webserver/" diff --git a/roles/monitor-bot-btrfs/handlers/main.yml b/roles/monitor-bot-btrfs/handlers/main.yml deleted file mode 100644 index d87ace57..00000000 --- a/roles/monitor-bot-btrfs/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload monitor-bot-btrfs.cymais.service" - systemd: - name: monitor-bot-btrfs.cymais.service - enabled: yes - daemon_reload: yes \ No newline at end of file diff --git a/roles/monitor-bot-btrfs/vars/main.yml b/roles/monitor-bot-btrfs/vars/main.yml deleted file mode 100644 index 8949f13f..00000000 --- a/roles/monitor-bot-btrfs/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -docker_health_btrfs_folder: "{{path_administrator_scripts}}monitor-bot-btrfs/" \ No newline at end of file diff --git a/roles/monitor-bot-csp/handlers/main.yml b/roles/monitor-bot-csp/handlers/main.yml deleted file mode 100644 index faf160c6..00000000 --- a/roles/monitor-bot-csp/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload monitor-bot-csp.cymais.service" - systemd: - name: monitor-bot-csp.cymais.service - enabled: yes - daemon_reload: yes diff --git a/roles/monitor-bot-csp/vars/main.yml b/roles/monitor-bot-csp/vars/main.yml deleted file mode 100644 index e74d13b7..00000000 --- a/roles/monitor-bot-csp/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -health_csp_crawler_folder: "{{ path_administrator_scripts }}monitor-bot-csp/" -health_csp_crawler_script: "{{ health_csp_crawler_folder }}monitor-bot-csp.py" \ No newline at end of file diff --git a/roles/monitor-bot-disc-space/handlers/main.yml b/roles/monitor-bot-disc-space/handlers/main.yml deleted file mode 100644 index a9817147..00000000 --- a/roles/monitor-bot-disc-space/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload monitor-bot-disc-space.cymais.service" - systemd: - name: monitor-bot-disc-space.cymais.service - enabled: yes - daemon_reload: yes diff --git a/roles/monitor-bot-disc-space/templates/monitor-bot-disc-space.service.j2 b/roles/monitor-bot-disc-space/templates/monitor-bot-disc-space.service.j2 deleted file mode 100644 index 0f71d360..00000000 --- a/roles/monitor-bot-disc-space/templates/monitor-bot-disc-space.service.j2 +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=checking disc space -OnFailure=alert-compose.cymais@%n.service - -[Service] -Type=oneshot -ExecStart=/bin/bash {{health_disc_space_folder}}monitor-bot-disc-space.sh {{size_percent_disc_space_warning}} diff --git a/roles/monitor-bot-disc-space/vars/main.yml b/roles/monitor-bot-disc-space/vars/main.yml deleted file mode 100644 index 882f6525..00000000 --- a/roles/monitor-bot-disc-space/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -health_disc_space_folder: "{{path_administrator_scripts}}monitor-bot-disc-space/" \ No newline at end of file diff --git a/roles/monitor-bot-docker-container/handlers/main.yml b/roles/monitor-bot-docker-container/handlers/main.yml deleted file mode 100644 index 5f27c7e2..00000000 --- a/roles/monitor-bot-docker-container/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload monitor-bot-docker-container.cymais.service" - systemd: - name: monitor-bot-docker-container.cymais.service - enabled: yes - daemon_reload: yes diff --git a/roles/monitor-bot-docker-volumes/handlers/main.yml b/roles/monitor-bot-docker-volumes/handlers/main.yml deleted file mode 100644 index 7b645149..00000000 --- a/roles/monitor-bot-docker-volumes/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload monitor-bot-docker-volumes.cymais.service" - systemd: - name: monitor-bot-docker-volumes.cymais.service - enabled: yes - daemon_reload: yes diff --git a/roles/monitor-bot-docker-volumes/templates/monitor-bot-docker-volumes.service.j2 b/roles/monitor-bot-docker-volumes/templates/monitor-bot-docker-volumes.service.j2 deleted file mode 100644 index 4894024a..00000000 --- a/roles/monitor-bot-docker-volumes/templates/monitor-bot-docker-volumes.service.j2 +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Checking docker health -OnFailure=alert-compose.cymais@%n.service - -[Service] -Type=oneshot -ExecStart=/bin/bash {{ health_docker_volumes_folder }}monitor-bot-docker-volumes.sh "{{ whitelisted_anonymous_docker_volumes | join(' ') }}" diff --git a/roles/monitor-bot-journalctl/handlers/main.yml b/roles/monitor-bot-journalctl/handlers/main.yml deleted file mode 100644 index 01979acd..00000000 --- a/roles/monitor-bot-journalctl/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload monitor-bot-journalctl.cymais.service" - systemd: - name: monitor-bot-journalctl.cymais.service - enabled: yes - daemon_reload: yes \ No newline at end of file diff --git a/roles/monitor-bot-journalctl/vars/main.yml b/roles/monitor-bot-journalctl/vars/main.yml deleted file mode 100644 index 600083f4..00000000 --- a/roles/monitor-bot-journalctl/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -health_journalctl_folder: "{{path_administrator_scripts}}monitor-bot-journalctl/" \ No newline at end of file diff --git a/roles/monitor-bot-msmtp/handlers/main.yml b/roles/monitor-bot-msmtp/handlers/main.yml deleted file mode 100644 index 9a23bd2c..00000000 --- a/roles/monitor-bot-msmtp/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: reload monitor-bot-msmtp.cymais.service - systemd: - name: monitor-bot-msmtp.cymais.service - enabled: yes - daemon_reload: yes \ No newline at end of file diff --git a/roles/monitor-bot-msmtp/vars/main.yml b/roles/monitor-bot-msmtp/vars/main.yml deleted file mode 100644 index 909eeaa5..00000000 --- a/roles/monitor-bot-msmtp/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -health_msmtp_folder: "{{ path_administrator_scripts }}monitor-bot-msmtp/" \ No newline at end of file diff --git a/roles/monitor-bot-webserver/handlers/main.yml b/roles/monitor-bot-webserver/handlers/main.yml deleted file mode 100644 index 412182a5..00000000 --- a/roles/monitor-bot-webserver/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload monitor-bot-webserver.cymais.service" - systemd: - name: monitor-bot-webserver.cymais.service - enabled: yes - daemon_reload: yes diff --git a/roles/monitor-bot-webserver/vars/main.yml b/roles/monitor-bot-webserver/vars/main.yml deleted file mode 100644 index cb0189cb..00000000 --- a/roles/monitor-bot-webserver/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -health_nginx_folder: "{{ path_administrator_scripts }}monitor-bot-webserver/" diff --git a/roles/webserver-core/meta/main.yml b/roles/webserver-core/meta/main.yml index 2b292e57..514f9158 100644 --- a/roles/webserver-core/meta/main.yml +++ b/roles/webserver-core/meta/main.yml @@ -20,5 +20,5 @@ galaxy_info: issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues" documentation: "https://github.com/kevinveenbirkenbach/cymais/roles/webserver-core" dependencies: - - monitor-bot-webserver - - monitor-bot-csp \ No newline at end of file + - mon-bot-webserver + - mon-bot-csp \ No newline at end of file diff --git a/tasks/plays/02_server.yml b/tasks/plays/02_server.yml index 5e10e5ba..9c52e193 100644 --- a/tasks/plays/02_server.yml +++ b/tasks/plays/02_server.yml @@ -6,9 +6,9 @@ loop: - core-security - core-journalctl - - monitor-bot-disc-space + - mon-bot-disc-space - cleanup-disc-space - - monitor-bot-btrfs + - mon-bot-btrfs - maintenance-btrfs-auto-balancer - name: "Integrate Docker Role includes"