normal_check_interval is deprecated. Replace it with check_interval.

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 658ea02..cd2d253 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -1380,21 +1380,21 @@ services:
     check: "check_ping!350.0,20%!600.0,40%"
     hostgroups: pingable
     excludehostgroups: layer3-infrastructure, high-RTT
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!600.0,20%!900.0,40%"
     hostgroups: high-RTT
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
     name: PING
     check: "check_ping!2000.0,60%!3000.0,80%"
     hostgroups: layer3-infrastructure
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   # }}}
@@ -1523,13 +1523,13 @@ services:
     name: setup - dsa config
     nrpe: "/usr/lib/nagios/plugins/dsa-check-config"
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
     excludehostgroups: alioth
   -
     name: setup - local hostname etc-hosts
     nrpe: 'if getent ahosts `hostname` | grep -q 127.0; then echo "Warning: local hostname resolves to 127/8 address"; exit 1; else echo "OK: Hostname resolves to non-127/8 address."; exit 0; fi'
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
   # }}}
   # {{{ os health
   ####
@@ -1596,7 +1596,7 @@ services:
   -
     name: system - filesystem check
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-filesystems"
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     hostgroups: computers
   # }}}
@@ -1607,7 +1607,7 @@ services:
     nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
     hostgroups: computers
     excludehosts: backuphost, storace, backuphost
-    normal_check_interval: 60
+    check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   -
@@ -1615,7 +1615,7 @@ services:
     servicegroups: backup
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dabackup-server"
     hosts: storace
-    normal_check_interval: 60
+    check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   -
@@ -1625,7 +1625,7 @@ services:
     runfrom: dinis
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
   -
     name: backup - bacula - last full backup
@@ -1634,7 +1634,7 @@ services:
     runfrom: dinis
     hostgroups: computers
     excludehostgroups: buildd, porterbox, no-bacula
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
   -
     name: process - bacula-fd
@@ -1660,14 +1660,14 @@ services:
     servicegroups: kernel
     nrpe: "/usr/lib/nagios/plugins/dsa-check-running-kernel"
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
     retry_check_interval: 5
   -
     name: apt - security updates
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
   -
     name: unexpected file - apt sources.list
@@ -1681,7 +1681,7 @@ services:
     #nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
     hostgroups: computers
     excludehostgroups: freebsd
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     notification_interval: 10080
   -
@@ -1720,7 +1720,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/samhain"
     hostgroups: computers
     depends: process - samhain
-    normal_check_interval: 60
+    check_interval: 60
     retry_check_interval: 5
     excludehostgroups: brokensamhain
   -
@@ -1775,7 +1775,7 @@ services:
     check: dsa_check_ssh
     hostgroups: computers
     depends: process - sshd
-    normal_check_interval:  60
+    check_interval:  60
     notification_interval: 1440
   ####
   -
@@ -1850,7 +1850,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
     runfrom: rainier
     hostgroups: computers
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     excludehostgroups: alioth, broken_mq
   -
@@ -1859,7 +1859,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/dsa-check-mq-connection $HOSTNAME$ ud dsa"
     runfrom: rapoport
     hostgroups: computers
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
     excludehostgroups: alioth, broken_mq
   ###
@@ -1867,7 +1867,7 @@ services:
     name: local resolver
     nrpe: "/usr/lib/nagios/plugins/dsa-check-resolver www.debian.org www.google.com"
     hostgroups: computers
-    normal_check_interval: 60
+    check_interval: 60
   -
     name: process - unbound
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u unbound -C unbound -a '/usr/sbin/unbound'"
@@ -1940,7 +1940,7 @@ services:
     name: unwanted process - openvpn
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C openvpn"
     hostgroups: computers
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: unwanted process - gkrellmd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
@@ -2007,76 +2007,76 @@ services:
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
-    normal_check_interval: 120
+    check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl180
     excludehosts: schein, rietz, mirror-anu, mirror-isc, mirror-umn
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-controller-ok --ignore-controller='P700m'"
-    normal_check_interval: 120
+    check_interval: 120
     hostgroups: bm-bl
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: schein, rietz
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli-enclosure 1 1E:1"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: franck
   -
     name: HW - hpacucli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
-    normal_check_interval: 120
+    check_interval: 120
     hostgroups: dl585
   -
     name: HW - hpssacli status
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: mirror-anu, mirror-isc, mirror-umn
   ###
 #  -
 #    name: HW - edac status
 #    nrpe: "/usr/lib/nagios/plugins/dsa-check-edac"
-#    normal_check_interval: 120
+#    check_interval: 120
     #hostgroups: computers
     #excludehosts: villa, lobos, schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
-    normal_check_interval: 120
+    check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl585, bm-bl
     excludehosts: villa, lobos, schein, storace, mirror-anu
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: villa
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --ps-no-redundant  --ignore-failed='PS2'"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: lobos
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-no-redundant"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: schein
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: storace
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm --fan-ignore-not-present --ps-no-redundant --ignore-failed='PS1'"
-    normal_check_interval: 120
+    check_interval: 120
     hosts: mirror-anu
   ###
   -
@@ -2315,7 +2315,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_http -H localhost -p 465 -S -C 14 -t 45"
     hostgroups: postfix-hosts
     depends: process - postfix - master
-    normal_check_interval: 120
+    check_interval: 120
   # }}}
   # {{{ mail - network service
   -
@@ -2392,31 +2392,31 @@ services:
     excludehosts: menotti
     excludehostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_want_auth
     hosts: menotti
     depends: "process - apache2 - master"
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: network service - https
     check: dsa_check_https_any_status
     hostgroups: broken_https_default_vhost
     depends: "process - apache2 - master"
-    normal_check_interval: 120
+    check_interval: 120
   -
     name: network service - https cert
     check: dsa_check_cert!443
     hostgroups: apache-https
     depends: network service - https
-    normal_check_interval: 60
+    check_interval: 60
   -
     name: unwanted network service - https
     check: dsa_check_port_closed!443
     hostgroups: apache2-hosts
     excludehostgroups: apache-https
-    normal_check_interval: 60
+    check_interval: 60
   # }}}
   # {{{ FTP
   -
@@ -2496,7 +2496,7 @@ services:
     nrpe: "(/usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0 > /dev/null || /usr/lib/nagios/plugins/check_procs -a schroot -s Zs -c 0) && /usr/lib/nagios/plugins/check_procs -a schroot -s ZNs -c 0"
     hostgroups: buildd
     contact_groups: +buildd
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 24
     retry_check_interval: 5
   -
@@ -2546,14 +2546,14 @@ services:
     name: mirror sync - packages
     check: "dsa_check_mirrorsync_skew!packages.debian.org!Pics/.trace!3600:57600"
     hosts: global
-    normal_check_interval: 15
+    check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
   -
     name: mirror sync - snapshot
     check: "dsa_check_mirrorsync_skew!snapshot.debian.org!project/trace/snapshot-master.debian.org!3600:28800"
     hosts: global
-    normal_check_interval: 15
+    check_interval: 15
     max_check_attempts: 5
     retry_check_interval: 5
   # }}}
@@ -2636,7 +2636,7 @@ services:
     remotecheck: "/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 50,10% -c 200,30%"
     runfrom: ubc-bl8
     hosts: giustini
-    normal_check_interval: 5
+    check_interval: 5
     max_check_attempts: 4
     retry_check_interval: 1
   -
@@ -2655,7 +2655,7 @@ services:
     name: current chroots
     nrpe: "/usr/lib/nagios/plugins/dsa-check-dchroots-current"
     hostgroups: porterbox
-    normal_check_interval:  60
+    check_interval:  60
     retry_check_interval: 15
   # }}}
   # {{{ openstack
@@ -2720,7 +2720,7 @@ services:
     name: network service - ldaps cert
     check: dsa_check_cert!636
     depends: process - slapd
-    normal_check_interval: 60
+    check_interval: 60
     hosts: draghi
   ###
   -
@@ -2775,19 +2775,19 @@ services:
   -
     name: network service - sip-tls cert - 443
     check: dsa_check_cert!443
-    normal_check_interval: 60
+    check_interval: 60
     hosts: vogler
   -
     name: network service - sip-tls cert - 5061
     check: dsa_check_cert!5061
-    normal_check_interval: 60
+    check_interval: 60
     hosts: vogler
   ####
   -
     name: puppetmaster cert
     nrpe: "sudo -u puppet /usr/lib/nagios/plugins/dsa-check-cert-expire /var/lib/puppet/ssl/certs/ca.pem"
     hosts: handel
-    normal_check_interval: 60
+    check_interval: 60
     max_check_attempts: 2
     retry_check_interval: 5
   # }}}

diff --git a/config/static/objects/generic-service.cfg b/config/static/objects/generic-service.cfg
index 5f27062..0a42371 100644 (file)
--- a/config/static/objects/generic-service.cfg
+++ b/config/static/objects/generic-service.cfg
@@ -21,7 +21,7 @@ define service{
        notification_interval           300
        is_volatile                     0
        check_period                    24x7
-       normal_check_interval           15
+       check_interval                  15
        retry_check_interval            2
        max_check_attempts              6
        notification_period             24x7