diff --git a/group_vars/all.yaml b/group_vars/all.yaml index b5e2982..21618b1 100644 --- a/group_vars/all.yaml +++ b/group_vars/all.yaml @@ -1,2 +1,4 @@ --- checks: +nsca_server: 192.168.122.107 +nsca_password: HISTORY_PURGED_SECRET diff --git a/roles/monitoring-client/tasks/main.yaml b/roles/monitoring-client/tasks/main.yaml index 173c59c..b09b897 100644 --- a/roles/monitoring-client/tasks/main.yaml +++ b/roles/monitoring-client/tasks/main.yaml @@ -60,3 +60,8 @@ dest: /etc/monitoring.conf owner: root mode: 644 + +- name: Add monitoring report cronjob + cron: + name: "monitoring" + job: "/etc/monitoring/monitoring-report.py -c /etc/monitoring.conf --nsca-bin /bin/send_nsca --nsca-config /etc/send_nsca.cfg" diff --git a/roles/monitoring-client/templates/monitoring.conf.j2 b/roles/monitoring-client/templates/monitoring.conf.j2 index 5f06b0a..877ea26 100644 --- a/roles/monitoring-client/templates/monitoring.conf.j2 +++ b/roles/monitoring-client/templates/monitoring.conf.j2 @@ -1,7 +1,7 @@ -nobody disk /usr/lib/nagios/plugins/check_disk -w 10% -c 5% -p / -nobody load /usr/lib/nagios/plugins/check_load -w 5,3,2 -c 10,6,4 -nobody procs /usr/lib/nagios/plugins/check_procs -nobody systemd /etc/monitoring-tools/pynagsystemd.py +nobody disk-remote /usr/lib/nagios/plugins/check_disk -w 10% -c 5% -p / +nobody load-remote /usr/lib/nagios/plugins/check_load -w 5,3,2 -c 10,6,4 +nobody procs-remote /usr/lib/nagios/plugins/check_procs +nobody systemd /etc/monitoring-tools/pynagsystemd.py {% if checks %} {% for entry in checks %} diff --git a/roles/monitoring-client/templates/send_nsca.cfg.j2 b/roles/monitoring-client/templates/send_nsca.cfg.j2 index ff15746..4efd8c2 100644 --- a/roles/monitoring-client/templates/send_nsca.cfg.j2 +++ b/roles/monitoring-client/templates/send_nsca.cfg.j2 @@ -1,5 +1,5 @@ -identity = {{ nsca_identity }} +identity = {{ group_names[0] }} password = {{ nsca_password }} server = {{ nsca_server }} -port = {{ nsca_server_port }} +port = 5668 tls_ciphers = "PSK-AES256-CBC-SHA"