X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=41909ebcf9d8edeae616d28ab77cb354641bfed5;hb=b8582c8caec8828f76eb14cd65e94c31885f92eb;hp=9e92b44d3ddcb56eb0555175e67f4f016f30477f;hpb=e0a6d547b5420b27fbce9459e246969cb0006d67;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 9e92b44..41909eb 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -511,6 +511,13 @@ servicegroups:
     alias: raid checks
   kernel:
     alias: kernel checks
+  weaksshkeys:
+    alias: weak ssh keys
+  apt:
+    alias: apt upgrade status
+  security:
+    alias: security
+    servicegroup_members: apt, weaksshkeys, kernel
 
 #############################
 # services
@@ -547,6 +554,12 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /"
     hostgroups: computers
+    excludehosts: ries
+  -
+    name: disk usage on /
+    servicegroups: diskspace
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /"
+    hosts: ries
   -
     name: disk usage on /boot
     servicegroups: diskspace
@@ -561,12 +574,12 @@ services:
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: bartok, sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini
   -
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /org"
-    hosts: merkel
+    hosts: merkel, bartok
   -
     name: disk usage on /srv
     servicegroups: diskspace
@@ -620,14 +633,12 @@ services:
 
  ############ All Computers ############
  ####
-  #-
-  #  name: apt - security updates
-  #  nrpe: "/usr/local/bin/nagios-check-apt-updates --warnifupdates"
-  #  hostgroups: computers
-  #  normal_check_interval: 480
-  #  notification_interval: 480
-  #  max_check_attempts: 4
-  #  retry_check_interval: 12
+  -
+    name: apt - security updates
+    servicegroups: apt
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
+    hostgroups: computers
+    normal_check_interval:  360
  ####
   -
     name: backup
@@ -726,9 +737,15 @@ services:
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2"
     depends: network service - sshd
     hostgroups: computers, deadslow
-    excludehosts: agnesi
+    excludehosts: agnesi, crest, kullervo
     excludehostgroups: lenny
     normal_check_interval:  360
+  -
+    name: "network service - sshd - version"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2+m68k1"
+    depends: network service - sshd
+    hosts: crest, kullervo
+    normal_check_interval:  360
   -
     name: "network service - sshd - version"
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.7p1 Debian-9"
@@ -741,6 +758,13 @@ services:
     depends: network service - sshd - 2260
     hosts: agnesi
     normal_check_interval:  360
+ #
+  -
+    name: ssh - weak keys
+    servicegroups: weaksshkeys
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/weak-ssh-keys"
+    hostgroups: computers
+    normal_check_interval:  360
  ####
   -
     name: network service - nrpe
@@ -1188,7 +1212,7 @@ services:
  ###
   -
     name: process - slapd
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -g openldap -u openldap'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:50 -u openldap -C slapd -a '/usr/sbin/slapd -h ldap:/// ldaps:/// -g openldap -u openldap'"
     hosts: samosa
  ###
   -