From db6dc98940b4e4ef05130eb087b42f2ddbb3c297 Mon Sep 17 00:00:00 2001 From: Silvie Chlupova Date: Mon, 31 Jan 2022 10:33:30 +0100 Subject: [PATCH] copr: fix nagios service for checking Copr CDN Fixes: https://pagure.io/fedora-infrastructure/issue/10508 --- .../nagios_server/files/nagios/commands/httpd.cfg | 5 +++++ .../templates/nagios/services/websites.cfg.j2 | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/roles/nagios_server/files/nagios/commands/httpd.cfg b/roles/nagios_server/files/nagios/commands/httpd.cfg index 21843f4be9..8d9a9764d1 100644 --- a/roles/nagios_server/files/nagios/commands/httpd.cfg +++ b/roles/nagios_server/files/nagios/commands/httpd.cfg @@ -61,6 +61,11 @@ define command{ command_line $USER1$/check_http -w 30 -c 40 --ssl --sni -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$ -s "$ARG3$" } +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_ssl_cert command_line $USER1$/check_http --sni -I $HOSTADDRESS$ -H $ARG1$ -C $ARG2$ diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index f1e5fabf72..69001230e3 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_follow_ssl!download.copr.fedorainfracloud.org!/!Index of / + max_check_attempts 8 + use websitetemplate +}