From 8721732d2585d0736aca78a1ed211e42fe6871f4 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 9 Jan 2017 23:16:23 +0000 Subject: [PATCH] and we try to make some nice names --- .../files/nagios/services/disk.cfg | 4 +- .../files/nagios/services/dns.cfg | 2 +- .../files/nagios/services/ping.cfg | 20 ++--- .../files/nagios/services/procs.cfg | 58 +------------- .../files/nagios/services/raid.cfg | 6 +- .../files/nagios/services/smtp-mm.cfg | 2 +- .../files/nagios/services/ssh.cfg | 10 +-- .../files/nagios/services/ssl.cfg | 10 +-- .../files/nagios/services/unbound.cfg | 8 +- .../files/nagios/services/vpnclients.cfg | 2 +- .../files/nagios/services/websites.cfg | 78 +++++++++---------- 11 files changed, 72 insertions(+), 128 deletions(-) diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg index 703b51b1ee..b1d8ad1b02 100644 --- a/roles/nagios_server/files/nagios/services/disk.cfg +++ b/roles/nagios_server/files/nagios/services/disk.cfg @@ -1,12 +1,12 @@ define service { - hostgroup_name kvmServers + hostgroup_name virtservers service_description Disk Space / check_command check_by_nrpe!check_disk_/ use disktemplate } define service { - hostgroup_name kvmServers,proxies + hostgroup_name virtservers,proxies service_description Disk Space /boot check_command check_by_nrpe!check_disk_/boot use disktemplate diff --git a/roles/nagios_server/files/nagios/services/dns.cfg b/roles/nagios_server/files/nagios/services/dns.cfg index 0f1eb14b8d..dbf24b4007 100644 --- a/roles/nagios_server/files/nagios/services/dns.cfg +++ b/roles/nagios_server/files/nagios/services/dns.cfg @@ -1,5 +1,5 @@ define service { - hostgroup_name dnsservers + hostgroup_name dns service_description DNS: fp.o check_command check_dns_fpo use criticaltemplate diff --git a/roles/nagios_server/files/nagios/services/ping.cfg b/roles/nagios_server/files/nagios/services/ping.cfg index 5685c64de5..dae065e41d 100644 --- a/roles/nagios_server/files/nagios/services/ping.cfg +++ b/roles/nagios_server/files/nagios/services/ping.cfg @@ -1,20 +1,14 @@ define service { hostgroup_name all - service_description ICMP Ping4 + service_description ICMP-Ping4 check_command check_ping4!350.0,20%!500.0,60% use criticaltemplate } -define service { - hostgroup_name all - service_description ICMP Ping6 - check_command check_ping6!350.0,20%!500.0,60% - use criticaltemplate -} +# define service { +# hostgroup_name all +# service_description ICMP-Ping6 +# check_command check_ping6!350.0,20%!500.0,60% +# use criticaltemplate +# } -#define service { -# hostgroup_name euservers -# service_description ICMP Ping -# check_command check_ping!350.0,20%!500.0,60% -# use criticaltemplate -#} diff --git a/roles/nagios_server/files/nagios/services/procs.cfg b/roles/nagios_server/files/nagios/services/procs.cfg index 4cfae963db..75616ecb7e 100644 --- a/roles/nagios_server/files/nagios/services/procs.cfg +++ b/roles/nagios_server/files/nagios/services/procs.cfg @@ -1,75 +1,25 @@ -#define service { -# hostgroup puppetservers -# service_description Puppetmaster -# check_command check_by_nrpe!check_puppetmaster -# use defaulttemplate -#} - define service { - hostgroup kvmServers + hostgroup virtservers service_description Total Processes check_command check_by_nrpe!check_total_procs use defaulttemplate } define service { - hostgroup kvmServers + hostgroup virtservers service_description Zombie Processes check_command check_by_nrpe!check_zombie_procs use defaulttemplate } -#define service { -# hostgroup buildservers -# service_description Total Processes -# check_command check_by_nrpe!check_total_procs -# use defaulttemplate -# retry_check_interval 5 -# max_check_attempts 12 -#} - - -#define service { -# hostgroup buildservers -# service_description Zombie Processes -# check_command check_by_nrpe!check_zombie_procs -# use defaulttemplate -# retry_check_interval 5 -# max_check_attempts 12 -#} - -#define service { -# hostgroup servers -# service_description Audit Daemon -# check_command check_by_nrpe!check_auditd -# use defaulttemplate -#} - -#define service { -# hostgroup buildservers -# service_description Audit Daemon -# check_command check_by_nrpe!check_auditd -# use defaulttemplate -# retry_check_interval 5 -# max_check_attempts 12 -#} define service { - hostgroup kvmServers + hostgroup virtservers service_description Cron Daemon check_command check_by_nrpe!check_cron use defaulttemplate } -#define service { -# hostgroup buildservers -# service_description Cron Daemon -# check_command check_by_nrpe!check_cron -# use defaulttemplate -# retry_check_interval 5 -# max_check_attempts 12 -#} - define service { hostgroup proxies service_description Varnish Process @@ -78,7 +28,7 @@ define service { } define service { - hostgroup unboundservers + hostgroup unbound service_description Unbound Process check_command check_by_nrpe!check_unbound_proc use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/raid.cfg b/roles/nagios_server/files/nagios/services/raid.cfg index 6d9891b8db..aca0562340 100644 --- a/roles/nagios_server/files/nagios/services/raid.cfg +++ b/roles/nagios_server/files/nagios/services/raid.cfg @@ -1,6 +1,6 @@ define service { - hostgroup_name kvmServers - service_description Check Raid + hostgroup_name virtservers + service_description Check_Raid check_command check_by_nrpe!check_raid use lighttemplate } @@ -16,7 +16,7 @@ define service { define service { hostgroup_name retrace - service_description Check Raid + service_description Check_Raid check_command check_by_nrpe!check_raid use retracetemplate } diff --git a/roles/nagios_server/files/nagios/services/smtp-mm.cfg b/roles/nagios_server/files/nagios/services/smtp-mm.cfg index d909f64b48..4935b27f89 100644 --- a/roles/nagios_server/files/nagios/services/smtp-mm.cfg +++ b/roles/nagios_server/files/nagios/services/smtp-mm.cfg @@ -1,6 +1,6 @@ define service { hostgroup_name smtp-mm - service_description Check smtp servers + service_description smtp-mm check_command check_smtp use defaulttemplate } diff --git a/roles/nagios_server/files/nagios/services/ssh.cfg b/roles/nagios_server/files/nagios/services/ssh.cfg index 30f08719b0..ea46ff56bf 100644 --- a/roles/nagios_server/files/nagios/services/ssh.cfg +++ b/roles/nagios_server/files/nagios/services/ssh.cfg @@ -1,13 +1,13 @@ define service { - hostgroup_name kvmServers - service_description SSH + hostgroup_name virtservers + service_description SSH-virtservers check_command check_ssh use defaulttemplate } define service { - hostgroup_name bastions - service_description SSH + hostgroup_name bastion + service_description SSH-bastion check_command check_ssh use defaulttemplate } @@ -30,7 +30,7 @@ define service { define service { hostgroup_name retrace - service_description SSH + service_description SSH-retrace check_command check_ssh use retracetemplate } diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg index 8d6585a030..150411df71 100644 --- a/roles/nagios_server/files/nagios/services/ssl.cfg +++ b/roles/nagios_server/files/nagios/services/ssl.cfg @@ -1,34 +1,34 @@ define service { hostgroup_name proxies - service_description admin.fedoraproject.org SSL Cert + service_description https-admin.fedoraproject.org check_command check_ssl_cert!admin.fedoraproject.org!60 use defaulttemplate } define service { hostgroup_name proxies - service_description fedoraproject.org SSL Cert + service_description https-fedoraproject.org-cert check_command check_ssl_cert!fedoraproject.org!60 use defaulttemplate } define service { hostgroup_name proxies - service_description translate.fedoraproject.org SSL Cert + service_description https-translate.fedoraproject.org-cert check_command check_ssl_cert!translate.fedoraproject.org!60 use defaulttemplate } define service { hostgroup_name koji - service_description Koji SSL Cert + service_description https-Koji-cert check_command check_ssl_cert!koji.fedoraproject.org!60 use defaulttemplate } define service { hostgroup_name pkgs - service_description Pkgs SSL Cert + service_description https-Pkgs-cert check_command check_ssl_cert!pkgs.fedoraproject.org!60 use defaulttemplate } diff --git a/roles/nagios_server/files/nagios/services/unbound.cfg b/roles/nagios_server/files/nagios/services/unbound.cfg index bb5ad0439a..368d570d92 100644 --- a/roles/nagios_server/files/nagios/services/unbound.cfg +++ b/roles/nagios_server/files/nagios/services/unbound.cfg @@ -1,13 +1,13 @@ define service { - hostgroup_name unboundservers - service_description Unbound 80/tcp + hostgroup_name unbound + service_description Unbound-80 check_command check_unbound_80!www.fedoraproject.org use defaulttemplate } define service { - hostgroup_name unboundservers - service_description Unbound 443/tcp + hostgroup_name unbound + service_description Unbound-443 check_command check_unbound_443!8881!www.fedoraproject.org use defaulttemplate } diff --git a/roles/nagios_server/files/nagios/services/vpnclients.cfg b/roles/nagios_server/files/nagios/services/vpnclients.cfg index b96151af55..13142f0f2c 100644 --- a/roles/nagios_server/files/nagios/services/vpnclients.cfg +++ b/roles/nagios_server/files/nagios/services/vpnclients.cfg @@ -1,6 +1,6 @@ define service { hostgroup_name vpnclients - service_description Check vpnclients for working vpn connection + service_description vpnclients check_command check_by_nrpe!check_openvpn_link use defaulttemplate } diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg index d4bd78dafa..8383b23bff 100644 --- a/roles/nagios_server/files/nagios/services/websites.cfg +++ b/roles/nagios_server/files/nagios/services/websites.cfg @@ -1,13 +1,13 @@ define service { hostgroup_name proxies - service_description fedoraproject.org + service_description http-fedoraproject.org check_command check_website!fedoraproject.org!/!getfedora.org use websitetemplate } define service { hostgroup_name proxies - service_description fedoraproject.org - wiki + service_description http-fedoraproject.org-wiki check_command check_website!fedoraproject.org!/wiki/Fedora_Project_Wiki!Fedora Marketing max_check_attempts 10 use websitetemplate @@ -15,7 +15,7 @@ define service { define service { hostgroup_name proxies - service_description fedoraproject.org - wiki - non-cached + service_description http-fedoraproject.org-wiki-non-cached check_command check_website!fedoraproject.org!/wiki/Special:Version!MediaWiki is free software max_check_attempts 10 use websitetemplate @@ -23,35 +23,35 @@ define service { define service { hostgroup_name proxies - service_description mirrors.fedoraproject.org - mirrorlist + service_description http-mirrors.fedoraproject.org-mirrorlist check_command check_website!mirrors.fedoraproject.org!/mirrorlist?repo=rawhide&arch=x86_64&country=global!development use websitetemplate } define service { hostgroup_name proxies - service_description pkgdb-external + service_description http-pkgdb-external check_command check_website_ssl!admin.fedoraproject.org!/pkgdb/collections/!EPEL use websitetemplate } define service { hostgroup_name proxies - service_description start.fedoraproject.org + service_description http-start.fedoraproject.org check_command check_website_ssl!start.fedoraproject.org!/!The Fedora Project is maintained use websitetemplate } define service { hostgroup_name proxies - service_description accounts + service_description http-accounts check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency use websitetemplate } define service { hostgroup_name proxies - service_description bodhi + service_description http-bodhi check_command check_website_ssl!bodhi.fedoraproject.org!/!Fedora max_check_attempts 8 use websitetemplate @@ -59,7 +59,7 @@ define service { define service { hostgroup_name proxies - service_description bodhi2 + service_description http-bodhi2 check_command check_website_ssl!bodhi.fedoraproject.org!/!top testers max_check_attempts 8 use websitetemplate @@ -70,14 +70,14 @@ define service { define service { hostgroup_name anitya-frontend - service_description release-monitoring.org/ Anitya + service_description http-release-monitoring.org-anitya check_command check_website_ssl!release-monitoring.org!/!Anitya use websitetemplate } define service { hostgroup_name autocloud-web - service_description autocloud-internal + service_description http-autocloud-internal check_command check_website!localhost!/autocloud/jobs/!Output max_check_attempts 8 use internalwebsitetemplate @@ -85,7 +85,7 @@ define service { define service { hostgroup_name badges-web - service_description badges.fedoraproject.org/ Tahrir + service_description http-badges.fedoraproject.org-tahrir check_command check_website!localhost!/!Tahrir use websitetemplate } @@ -93,7 +93,7 @@ define service { define service { hostgroup_name bodhi2 - service_description bodhi-internal + service_description http-bodhi-internal check_command check_website!localhost!/!Fedora max_check_attempts 8 use internalwebsitetemplate @@ -101,7 +101,7 @@ define service { define service { hostgroup_name bodhi2 - service_description bodhi2-internal + service_description http-bodhi2-internal check_command check_website!localhost!/!top testers max_check_attempts 8 use internalwebsitetemplate @@ -109,14 +109,14 @@ define service { define service { hostgroup_name darkserver - service_description darkserver-serverversion + service_description http-darkserver-serverversion use websitetemplate check_command check_website!localhost!/darkserver/serverversion!server-version } define service { hostgroup_name datagrepper - service_description datagrepper-frontpage + service_description http-datagrepper-frontpage check_command check_website!localhost!/datagrepper/reference/!General max_check_attempts 8 use internalwebsitetemplate @@ -124,7 +124,7 @@ define service { define service { hostgroup_name datagrepper - service_description datagrepper-db-query + service_description http-datagrepper-db-query check_command check_website!localhost!/datagrepper/raw/?delta=86400!timestamp max_check_attempts 8 use internalwebsitetemplate @@ -132,7 +132,7 @@ define service { define service { hostgroup_name docker-registry - service_description docker-registry + service_description http-docker-registry check_command check_website!localhost:5000!/v2/!{} max_check_attempts 8 use internalwebsitetemplate @@ -140,14 +140,14 @@ define service { define service { hostgroup_name fas - service_description accounts + service_description http-accounts check_command check_website!localhost!/accounts/help/get_help/user_telephone!emergency use internalwebsitetemplate } define service { hostgroup_name github2fedmsg - service_description github2fedmsg-internal + service_description http-github2fedmsg-internal check_command check_website!localhost!/github2fedmsg/!stuff max_check_attempts 8 use internalwebsitetemplate @@ -156,7 +156,7 @@ define service { define service { hostgroup_name ipsilon - service_description ipsilon-internal + service_description http-ipsilon-internal check_command check_website!localhost!/!Federated Open Authentication max_check_attempts 8 use internalwebsitetemplate @@ -165,7 +165,7 @@ define service { define service { hostgroup_name ipa - service_description ipa-internal + service_description http-ipa-internal check_command check_website!localhost!/ipa/ui/!Identity Management max_check_attempts 8 use internalwebsitetemplate @@ -174,7 +174,7 @@ define service { define service { hostgroup_name koschei-web - service_description koschei-internal + service_description http-koschei-internal check_command check_website!localhost!/koschei/!All packages max_check_attempts 8 use internalwebsitetemplate @@ -183,14 +183,14 @@ define service { define service { hostgroup_name koji - service_description koji + service_description http-koji check_command check_website!koji.fedoraproject.org!/koji/hosts!arm04-builder use websitetemplate } define service { hostgroup_name mm-frontend - service_description mm-publiclist-internal + service_description http-mm-publiclist-internal check_command check_website_publiclist!localhost!/mirrormanager/api/mirroradmins/?name=dl.fedoraproject.org use internalwebsitetemplate event_handler restart_httpd @@ -198,21 +198,21 @@ define service { define service { hostgroup_name notifs-web - service_description apps.fedoraproject.org/notifications fmn.web + service_description http-apps.fedoraproject.org-notifications-fmn.web check_command check_website!localhost!/notifications!Notifications use websitetemplate } define service { hostgroup_name nuancier - service_description apps.fedoraproject.org/nuancier nuancier + service_description http-apps.fedoraproject.org-nuancier check_command check_website!localhost!/nuancier!Nuancier use websitetemplate } define service { hostgroup_name packages - service_description packages-internal + service_description http-packages-internal check_command check_website!localhost!/packages/!Packages max_check_attempts 8 use internalwebsitetemplate @@ -221,7 +221,7 @@ define service { define service { hostgroup_name packages - service_description packages-internal-bugstab + service_description http-packages-internal-bugstab check_command check_website!localhost!/packages/fcomm_connector/bugzilla/query/query_bugs/%7B%22filters%22:%7B%22package%22:%22nethack%22,%22version%22:%22%22%7D,%22rows_per_page%22:10,%22start_row%22:0%7D!total_rows max_check_attempts 8 use internalwebsitetemplate @@ -243,7 +243,7 @@ define service { define service { hostgroup_name paste - service_description Pastebin webapp on paste + service_description http-Pastebin check_command check_website!localhost!/!Archives use websitetemplate } @@ -251,14 +251,14 @@ define service { define service { hostgroup_name pkgs - service_description Cgit on pkgs + service_description http-pkgs-cgit check_command check_website!localhost!/cgit/rpms/!Description use websitetemplate } define service { hostgroup_name pkgdb - service_description pkgdb-internal + service_description http-pkgdb-internal check_command check_website!localhost!/pkgdb/collections/!EPEL use internalwebsitetemplate event_handler restart_httpd @@ -266,14 +266,14 @@ define service { define service { hostgroup_name sundries - service_description freemedia-internal + service_description http-freemedia-internal check_command check_website!localhost!/freemedia/FreeMedia-form.html!Media use internalwebsitetemplate } define service { hostgroup_name tagger - service_description tagger-internal + service_description http-tagger-internal check_command check_website!localhost!/tagger/api/v1/score/ralph/!libravatar.org max_check_attempts 8 use internalwebsitetemplate @@ -281,8 +281,8 @@ define service { } define service { - hostgroup_name value - service_description Check møte process + hostgroup_name value + service_description http-møte check_command check_website!localhost!/!møte use websitetemplate } @@ -294,21 +294,21 @@ define service { define service { hostgroup_name koji - service_description koji-frontend + service_description http-koji-frontend check_command check_website_ppc!localhost!/koji/!Recent use ppc-secondarytemplate } define service { host_name status-fedora2 - service_description status.fedoraproject.org status + service_description http-status.fedoraproject.org check_command check_website!status-fedora2.rhcloud.com!/index.html!All systems go use websitetemplate } define service { host_name magazine.fedorainfracloud.org - service_description HTTP check + service_description http-magazine use websitetemplate check_command check_website!magazine.fedorainfracloud.org!/ }