X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=967b4d884459dc04b88e6884ca318bd3baf34194;hb=a0364d5c6999b2c7b87de612b8e6293faacb42f2;hp=1cd76836250f59ef3ba42140e550532229da6c71;hpb=1494edc65963ffbd510d901b652af1cc37d5ffc9;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 1cd7683..967b4d8 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -15,7 +15,6 @@
 #  - verdi: pg upgrade, openvpn
 #  - mundy: salinfo_decode
 #  - puccini: mailgraph
-#  - lebrun: ippl
 
 # down:
 #  - sarti
@@ -271,7 +270,7 @@ servers:
   mahler:
     address: 128.31.0.46
     parents: gw-mit-csail
-    hostgroups: computers, single-cpu, lenny, porterbox
+    hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts
 
   klecker:
     address: 194.109.137.218
@@ -306,7 +305,8 @@ servers:
   albeniz:
     address: 193.62.202.27
     parents: gw-sanger
-    hostgroups: computers, porterbox, sw-raid
+    # SMP kernel doesn't run stable
+    hostgroups: computers, porterbox, sw-raid, single-cpu
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
@@ -387,6 +387,10 @@ servers:
     address: 161.53.160.165
     parents: gw-carnet
     hostgroups: computers, buildd
+  schroeder:
+    address: 161.53.160.164
+    parents: gw-carnet
+    hostgroups: computers, buildd, sw-raid
 
   tartini:
     address: 82.94.249.158
@@ -460,6 +464,9 @@ hostgroups:
   syslog-ng-hosts:
     alias: hosts running syslog-ng instead of sysklogd
     private: 1
+  rsyslog-hosts:
+    alias: hosts running rsyslogd instead of sysklogd
+    private: 1
   postfix-hosts:
     alias: hosts running postfix instead of exim
     private: 1
@@ -522,9 +529,11 @@ servicegroups:
     alias: weak ssh keys
   apt:
     alias: apt upgrade status
+  samhain:
+    alias: samhain integrity status
   security:
     alias: security
-    servicegroup_members: apt, weaksshkeys, kernel
+    servicegroup_members: apt, weaksshkeys, kernel, samhain
 
 #############################
 # services
@@ -571,7 +580,7 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, auber
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, auber, schroeder
   -
     name: disk usage on /var
     servicegroups: diskspace
@@ -581,7 +590,7 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini, ravel, mahler
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini, ravel, mahler, schroeder
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -665,6 +674,20 @@ services:
     normal_check_interval: 180
     retry_check_interval: 5
 
+ ####
+  -
+    name: process - samhain
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C samhain -a '/usr/sbin/samhain'"
+    hostgroups: computers
+  -
+    name: samhain
+    servicegroups: samhain
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-samhain"
+    hostgroups: computers
+    depends: process - samhain
+    normal_check_interval: 240
+    retry_check_interval: 5
+
  ####
   -
     name: users
@@ -742,7 +765,7 @@ services:
 
   -
     name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd
     hostgroups: computers, deadslow
     excludehosts: agnesi, crest, kullervo
@@ -762,7 +785,7 @@ services:
     normal_check_interval:  360
   -
     name: "network service - sshd - version - 2260"
-    check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch2"
+    check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd - 2260
     hosts: agnesi
     normal_check_interval:  360
@@ -833,17 +856,22 @@ services:
     name: process - syslog-ng
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
     hostgroups: syslog-ng-hosts
+ ###
+  -
+    name: process - rsyslogd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C rsyslogd  -a '/usr/sbin/rsyslogd -c3'"
+    hostgroups: rsyslog-hosts
  ###
   -
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts
+    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts
+    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
 
  ### MAIL STUFF
  ###
@@ -1236,7 +1264,7 @@ services:
   -
     name: process - udevd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C udevd -a 'udevd'"
-    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, verdi, liszt, kassia, agricola, arcadelt, argento, allegri, morales, bartok
+    hosts: sperger, ries, steffani, merkel, spohr, peri, penalosa, albeniz, verdi, liszt, kassia, agricola, arcadelt, argento, allegri, morales, bartok, schroeder
  ###
   -
     name: process - acpid
@@ -1367,7 +1395,7 @@ services:
   -
     name: process - debianqueued
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued"
-    hosts: ries
+    hosts: ries, ravel
 
  ###
   -