Merge pull request #52 from systemli/Drop-monit-&-munin-support

Drop monit & munin support
systemli · Sep 28, 2024 · 068c927 · 068c927
2 parents dd36301 + d649064
commit 068c927
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 322 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
-
 murmur_database: "/var/lib/mumble-server/mumble-server.sqlite"
 murmur_dbdriver: ""
 murmur_ice: "tcp -h 127.0.0.1 -p 6502"
@@ -52,12 +51,6 @@ murmur_sslcert: "/etc/ssl/mumble-server-cert.pem"
 murmur_sslkey: "/etc/ssl/mumble-server-key.pem"
 murmur_sslciphers: "EECDH+AESGCM:EDH+aRSA+AESGCM"
 
-murmur_monitoring_monit_enabled: False
-murmur_monitoring_munin_enabled: False
-murmur_monitoring_munin_packages:
-  - python3-zeroc-ice
-  - zeroc-ice-slice
-
 # mumble-web settings
 mumble_web: False
 mumble_web_path: /usr/lib/node_modules/mumble-web/

diff --git a/files/monit/conf.d/mumble-server b/files/monit/conf.d/mumble-server
diff --git a/files/murmur-munin.py b/files/murmur-munin.py
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -4,16 +4,6 @@
     name: mumble-server
     state: restarted
 
-- name: Restart munin-node
-  ansible.builtin.service:
-    name: munin-node
-    state: restarted
-
-- name: Restart monit
-  ansible.builtin.service:
-    name: monit
-    state: restarted
-
 - name: Set superuser password
   ansible.builtin.command: murmurd -ini /etc/mumble-server.ini -supw "{{ murmur_superuser_password }}"
   register: murmurd_superuser_password

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -7,10 +7,6 @@
   when: mumble_web
   tags: mumble-web
 
-- name: Import monitoring tasks
-  ansible.builtin.import_tasks: monitoring.yml
-  when: murmur_monitoring_monit_enabled or murmur_monitoring_munin_enabled
-
 - name: Import goss tasks
   ansible.builtin.import_tasks: goss.yml
   tags:

diff --git a/tasks/monitoring.yml b/tasks/monitoring.yml