Merge pull request #4 from inmotionhosting/NGX-356

NGX-356: Update monit configuration

defaults/main.yml

@@ -3,15 +3,14 @@
 monit_daemon: monit
 monit_executable_path: /usr/bin/monit
 monit_config_dir: "/etc/monit.d/"
+monit_config_file: "/etc/monitrc"
 monitored_services:
   - { var_name: 'apache_daemon',  daemon_name: 'httpd'   }
   - { var_name: 'mysql_daemon',   daemon_name: 'mariadb' }
   - { var_name: 'nginx_daemon',   daemon_name: 'nginx'   }
   - { var_name: 'php_fpm_daemon', daemon_name: 'php-fpm' }
   - { var_name: 'redis_daemon',   daemon_name: 'redis'   }
-  - { var_name: 'network',        daemon_name: 'network' }
 
 # Enable systemd to restart monit if monit fails
 monit_systemd_restart: true
 systemd_restart_setting: on-failure
-monit_prometheus_exporter: false

tasks/facts.yml

@@ -16,6 +16,17 @@
     monit_config_dir is not string
     or monit_config_dir == 0
 
+- name: Check monit_config_file
+  fail:
+    msg: |
+      Invalid value for 'monit_config_file': {{ monit_config_file }}
+
+      Supported types  : String
+      Supported values : Any non-null string
+  when: >-
+    monit_config_file is not string
+    or monit_config_file == 0
+
 - name: Check monitored_services
   fail:
     msg: |

tasks/main.yml

@@ -23,11 +23,6 @@
   package:
     name: monit
     state: present
-
-- name: Install Monit Prometheus Exporter
-  package:
-    name: imh-monit-prometheus
-    state: present
 
 - name: Include systemd restart configuation
   include: systemd.yml
@@ -44,11 +39,11 @@
 
 - name: Install Monit config
   template:
-    src: monitrc
-    dest: "{{ monit_config_dir }}/monitrc"
+    src: etc/monitrc
+    dest: "{{ monit_config_file }}"
     owner: root
     group: root
-    mode: 0644
+    mode: 0600
   notify: restart monit
 
 - name: Install service configs

templates/monitrc → templates/etc/monitrc

@@ -12,3 +12,5 @@ set eventqueue
 set httpd port 11000 and
     use address localhost   # only accept connection from localhost (drop if you use M/Monit)
     allow localhost         # allow localhost to connect to the server
+
+include /etc/monit.d/*

vars/Debian.yml

@@ -1,3 +1,4 @@
 # vars/Debian.yml
 
 monit_config_dir: "/etc/monit/conf.d/"
+monit_config_file: "/etc/monit.d/monitrc"