diff --git a/roles/copr/backend/tasks/monitoring.yml b/roles/copr/backend/tasks/monitoring.yml index 1dd3cb60e3..6bae609441 100644 --- a/roles/copr/backend/tasks/monitoring.yml +++ b/roles/copr/backend/tasks/monitoring.yml @@ -2,15 +2,6 @@ - name: install nrpe dnf: name=nrpe state=present -- name: install nrpe checks - template: src=copr_backend_nrpe.cfg - dest=/etc/nrpe.d/copr_backend_nrpe.cfg - notify: - - restart nrpe - tags: - - nagios_client - - copr_ping - - name: set acl for nrpe on /etc/copr acl: name=/etc/copr entity=nrpe etype=user permissions=rx state=present diff --git a/roles/copr/backend/templates/copr_backend_nrpe.cfg b/roles/copr/backend/templates/copr_backend_nrpe.cfg deleted file mode 100644 index 4851c31e27..0000000000 --- a/roles/copr/backend/templates/copr_backend_nrpe.cfg +++ /dev/null @@ -1 +0,0 @@ -command[check_copr_ping]=/usr/bin/copr-ping-check.py diff --git a/roles/copr/base/tasks/main.yml b/roles/copr/base/tasks/main.yml index 33a676286b..ee9f8fe125 100644 --- a/roles/copr/base/tasks/main.yml +++ b/roles/copr/base/tasks/main.yml @@ -117,5 +117,15 @@ - name: start node exporter service: state=started enabled=yes name=node_exporter +- name: install nrpe checks + template: src=copr_nrpe.cfg + dest=/etc/nrpe.d/copr_nrpe.cfg + notify: + - restart nrpe + tags: + - nagios_client + - copr_cdn + - copr_ping + # - name: enable and run logrotate service # service: name="logrotate" state=started diff --git a/roles/copr/base/templates/copr_nrpe.cfg b/roles/copr/base/templates/copr_nrpe.cfg new file mode 100644 index 0000000000..003fc1274f --- /dev/null +++ b/roles/copr/base/templates/copr_nrpe.cfg @@ -0,0 +1,6 @@ +command[check_copr_ping]=/usr/bin/copr-ping-check.py +command[check_copr_cdn]=/usr/bin/copr-cdn-check.py +command[check_copr_backend]=/usr/lib64/nagios/plugins/check_http -H copr-be.aws.fedoraproject.org --ssl +command[check_copr_distgit]=/usr/lib64/nagios/plugins/check_http -w 30 -c 40 --ssl --sni -H copr-dist-git.fedorainfracloud.org -u '/cgit/' -s 'Git repository browser' +command[check_copr_frontend]=/usr/lib64/nagios/plugins/check_http -w 30 -c 40 --ssl --sni -H copr.fedorainfracloud.org -u '/' -s 'Copr hosts' + diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml index 0375d1572c..0946098e4a 100644 --- a/roles/copr/frontend/tasks/main.yml +++ b/roles/copr/frontend/tasks/main.yml @@ -177,15 +177,6 @@ - name: install nrpe dnf: name=nrpe state=present -- name: install nrpe checks - template: src=copr_frontend_nrpe.cfg - dest=/etc/nrpe.d/copr_frontend_nrpe.cfg - notify: - - restart nrpe - tags: - - nagios_client - - copr_cdn - - name: install the check script template: dest: "/usr/bin/copr-cdn-check.py" diff --git a/roles/copr/frontend/templates/copr_frontend_nrpe.cfg b/roles/copr/frontend/templates/copr_frontend_nrpe.cfg deleted file mode 100644 index 08cec82f2b..0000000000 --- a/roles/copr/frontend/templates/copr_frontend_nrpe.cfg +++ /dev/null @@ -1 +0,0 @@ -command[check_copr_cdn]=/usr/bin/copr-cdn-check.py diff --git a/roles/nagios_server/files/nagios/commands/httpd.cfg b/roles/nagios_server/files/nagios/commands/httpd.cfg index f29f0a0e56..21843f4be9 100644 --- a/roles/nagios_server/files/nagios/commands/httpd.cfg +++ b/roles/nagios_server/files/nagios/commands/httpd.cfg @@ -51,11 +51,6 @@ define command{ command_line $USER1$/check_http -w 30 -c 40 -I $HOSTADDRESS$ -H $ARG1$ -u "$ARG2$" -s "$ARG3$" -f follow } -define command{ - command_name check_website_follow_ssl - command_line $USER1$/check_http -w 30 -c 40 --ssl --sni -I $HOSTADDRESS$ -H $ARG1$ -u "$ARG2$" -s "$ARG3$" -f follow -} - define command{ command_name check_website_ppc command_line $USER1$/check_http -w 300 -c 400 -I $HOSTADDRESS$ -H $ARG1$ -u "$ARG2$" -s "$ARG3$" diff --git a/roles/nagios_server/files/nagios/services/copr.cfg b/roles/nagios_server/files/nagios/services/copr.cfg index 5273322967..6a877aee24 100644 --- a/roles/nagios_server/files/nagios/services/copr.cfg +++ b/roles/nagios_server/files/nagios/services/copr.cfg @@ -40,26 +40,26 @@ define service { use defaulttemplate } -#define service { -# hostgroup_name copr_dist_git_aws -# service_description http-copr-be.aws.fedoraproject.org -# check_command check_https!copr-be.aws.fedoraproject.org -# max_check_attempts 8 -# use websitetemplate -#} +define service { + hostgroup_name copr_dist_git_aws + service_description http-copr-be.aws.fedoraproject.org + check_command check_by_nrpe!check_copr_backend + max_check_attempts 8 + use websitetemplate +} -#define service { -# hostgroup_name copr_front_aws -# service_description http-copr-dist-git.fedorainfracloud.org -# check_command check_website_ssl!copr-dist-git.fedorainfracloud.org!/cgit/!Git repository browser -# max_check_attempts 8 -# use websitetemplate -#} +define service { + hostgroup_name copr_front_aws + service_description http-copr-dist-git.fedorainfracloud.org + check_command check_by_nrpe!check_copr_distgit + max_check_attempts 8 + use websitetemplate +} -#define service { -# hostgroup_name copr_back_aws -# service_description http-copr.fedorainfracloud.org -# check_command check_website_ssl!copr.fedorainfracloud.org!Copr hosts -# max_check_attempts 8 -# use websitetemplate -#} +define service { + hostgroup_name copr_back_aws + service_description http-copr.fedorainfracloud.org + check_command check_by_nrpe!check_copr_frontend + max_check_attempts 8 + use websitetemplate +} diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index 5d87dbbee7..aae8dfd20d 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -336,10 +336,10 @@ define service { {% endif %} -#define service { -# hostgroup_name proxies -# service_description http-download.copr.fedorainfracloud.org -# check_command check_website_follow_ssl!download.copr.fedorainfracloud.org!Index of / -# max_check_attempts 8 -# use websitetemplate -#} +define service { + hostgroup_name proxies + service_description http-download.copr.fedorainfracloud.org + check_command check_website_ssl!download.copr.fedorainfracloud.org!/!Index of / + max_check_attempts 8 + use websitetemplate +}