diff --git a/defaults/main.yml b/defaults/main.yml index 12632ed..d793b11 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -35,9 +35,6 @@ userli_prometheus_textfile_collector_enabled: False userli_prometheus_textfile_collector_path: "/var/lib/prometheus/node-exporter" userli_prometheus_textfile_collector_on_calendar: "*-*-* *:*:00" -# munin integration -userli_munin: False - userli_primary: True userli_webserver: apache2 diff --git a/handlers/main.yml b/handlers/main.yml index 550a4b1..d7c1660 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,9 +1,4 @@ --- -- name: Restart munin-node - ansible.builtin.service: - name: munin-node - state: restarted - - name: Dump environment for better performance # noqa no-changed-when ignore-errors ansible.builtin.command: composer dump-env prod args: diff --git a/tasks/main.yml b/tasks/main.yml index 15895e1..c255dc5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -100,10 +100,6 @@ ansible.builtin.import_tasks: deployment.yml when: userli_update | bool -- name: Import Munin tasks - ansible.builtin.import_tasks: munin.yml - when: userli_munin | bool - - name: Import metrics tasks ansible.builtin.import_tasks: metrics.yml when: userli_prometheus_textfile_collector_enabled | bool diff --git a/tasks/munin.yml b/tasks/munin.yml deleted file mode 100644 index e3176ee..0000000 --- a/tasks/munin.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: Ensure munin plugins from userli are linked - ansible.builtin.file: - src: "{{ userli_symfony_path }}/bin/{{ item }}" - dest: "/etc/munin/plugins/{{ item }}" - state: link - notify: Restart munin-node - with_items: - - user-accounts - - user-aliases - - user-vouchers - -- name: Ensure user plugin config is present - ansible.builtin.template: - src: user.munin.j2 - dest: /etc/munin/plugin-conf.d/user - owner: root - group: root - mode: "0644" diff --git a/templates/user.munin.j2 b/templates/user.munin.j2 deleted file mode 100644 index d58747d..0000000 --- a/templates/user.munin.j2 +++ /dev/null @@ -1,2 +0,0 @@ -[user-*] -user {{ userli_user }}