X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2Fnagios-master.cfg;h=70ac720158cd86477be55a2fabe4608910f3e993;hb=a72e60c2247bd36d1f1fa417b18ef872ba1e0d91;hp=57f2096aaac4b4bcf029168c8a481deb49242697;hpb=24ab1cba8b96677c362bc0d9f09c8988ee73733a;p=mirror%2Fdsa-nagios.git diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 57f2096..70ac720 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -102,10 +102,6 @@ servers: # address: 157.193.39.254 # parents: gw-ubc # hostgroups: routing-infrastructure - gw-agnesi: - address: 65.173.90.22 - parents: gw-ubc - hostgroups: routing-infrastructure gw-ubc: address: 206.12.19.254 parents: tchaikovsky @@ -115,10 +111,6 @@ servers: address: 161.53.160.1 parents: gw-ubc hostgroups: routing-infrastructure - gw-telegraaf: - address: 82.94.249.153 - parents: gw-ubc - hostgroups: routing-infrastructure gw-telegraaf2: address: 217.196.40.15 parents: gw-ubc @@ -183,7 +175,7 @@ servers: parents: gw-ubc hostgroups: routing-infrastructure gw-conova: - address: 217.196.146.254 + address: 217.196.149.238 parents: gw-ubc hostgroups: routing-infrastructure @@ -365,10 +357,6 @@ servers: address: 140.211.15.34 parents: gw-osuosl hostgroups: computers, service, dl360, hassrvfs, acpid-hosts, apache2-hosts, heavy-exim, postgres84-hosts, squeeze - zee: - address: 140.211.166.16 - parents: gw-osuosl - hostgroups: computers, porterbox, hassrvfs, hasbootfs, sparc, lenny parry: address: 140.211.15.153 parents: gw-osuosl @@ -525,11 +513,6 @@ servers: hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, squeeze contacts: luk - agnesi: - address: 67.233.102.241 - parents: gw-agnesi - hostgroups: deadslow, porterbox, lenny - spontini: address: 206.12.19.14 parents: gw-ubc @@ -538,7 +521,7 @@ servers: ravel: address: 206.12.19.5 parents: tchaikovsky - hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-server, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze + hostgroups: computers, general, dl385, apache2-hosts, acpid-hosts, hasbootfs, nfs-client, rsyncd-hosts, bind9-hosts, uploadqueue, hasorgfs, heavy-exim, xinetd-hosts, squeeze, autofs dijkstra: address: 206.12.19.218 parents: tchaikovsky @@ -625,7 +608,7 @@ servers: rossini: address: 206.12.19.19 parents: tchaikovsky - hostgroups: computers, dl585, acpid-hosts, service, squeeze, apache2-hosts, apache-https + hostgroups: computers, dl585, acpid-hosts, service, squeeze salieri: address: 206.12.19.20 parents: tchaikovsky @@ -716,11 +699,6 @@ servers: parents: gw-carnet hostgroups: computers, buildd, sw-raid, hassrvfs, sparc, squeeze - tartini: - address: 82.94.249.158 - parents: gw-telegraaf - hostgroups: computers, sw-raid, apache2-hosts, mysql-hosts, hasbootfs, hassrvfs, hasvarfs, hasusrfs, service, lenny - piatti: address: 193.167.161.225 parents: gw-helsinki @@ -934,11 +912,11 @@ servers: hostgroups: computers, buildd, hassrvfs, squeeze, incomingmailrelayed sompek: - address: 217.196.146.208 + address: 217.196.149.225 parents: gw-conova hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc stadler: - address: 217.196.146.209 + address: 217.196.149.226 parents: gw-conova hostgroups: computers, buildd, hassrvfs, sw-raid, squeeze, sparc @@ -1087,9 +1065,6 @@ hostgroups: postgres90-hosts: alias: hosts running postgres90 private: 1 - mysql-hosts: - alias: hosts running mysql - private: 1 no-ulogd: alias: hosts not running ulogd private: 1 @@ -1181,6 +1156,8 @@ servicegroups: alias: apt upgrade status samhain: alias: samhain integrity status + time: + alias: time stuff security: alias: security servicegroup_members: apt, weaksshkeys, kernel, samhain @@ -1263,7 +1240,7 @@ services: name: disk usage on /tmp servicegroups: diskspace nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp" - hosts: saens, tartini, powell, piatti + hosts: saens, powell, piatti - name: disk usage on /usr servicegroups: diskspace @@ -1542,12 +1519,6 @@ services: normal_check_interval: 60 notification_interval: 1440 - - - name: "network service - sshd - 2260" - check: dsa_check_ssh_port!2260 - hosts: agnesi - normal_check_interval: 180 - - name: ssh - weak keys servicegroups: weaksshkeys @@ -1594,6 +1565,7 @@ services: name: process - ntpd nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -p 1 -C ntpd -a '/usr/sbin/ntpd -p /var/run/ntpd.pid'" hostgroups: computers + servicegroups: time - name: network service - ntp check: dsa_check_ntp @@ -1601,12 +1573,14 @@ services: depends: process - ntpd excludehosts: ancina excludehostgroups: ntpsuckers + servicegroups: time # - name: network service - time check: dsa_check_time hosts: ancina depends: process - xinetd + servicegroups: time ### - @@ -1964,6 +1938,10 @@ services: name: "host SSL cert" nrpe: "if [ -e /etc/ssl/certs/thishost.pem ]; then /usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/thishost.pem; else echo 'No thishost.pem on this host.'; fi" hostgroups: computers + - + name: "pg SSL cert" + nrpe: "/usr/lib/nagios/plugins/dsa-check-cert-expire /etc/ssl/certs/pg-ubcece.debian.org-chained.pem" + hosts: danzi ############ Processes/Services that only run on some computers ############ #### @@ -2356,17 +2334,6 @@ services: name: postgresql backups nrpe: "/usr/bin/sudo -u debbackup /usr/lib/nagios/plugins/dsa-check-backuppg" hosts: beethoven - #### - - - name: process - mysql - master - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:2 -c 1: -u root -C mysqld_safe -a '/bin/sh /usr/bin/mysqld_safe'" - hostgroups: mysql-hosts - - - name: process - mysql - workers - nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u mysql -C mysqld -a /usr/sbin/mysqld" - hostgroups: mysql-hosts - depends: process - mysql - master - #### - name: process - stunnel4 - postgres-udd