X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=5b22d6628e4c091b80734180362eda8738bc27e1;hb=6db15777be2201c9f753bd51a50fe03de73a90dd;hp=2f3dc37b2557b321b2a4902bf0b6d8fb6f0408ac;hpb=1e3afdf654d044f6cd74e5d04c1f75793e4df368;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 2f3dc37..5b22d66 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -213,7 +213,7 @@ servers:
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, dl385
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, postfix-hosts, heavy-postfix, amavis-hosts, dl385
     contacts: bzed
 
   master:
@@ -463,7 +463,7 @@ hostgroups:
     alias: "hosts running the full mail stuff, including clamav, SA, and greylistd"
     private: 1
   heavy-postfix:
-    alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, amavis, policyd-weight"
+    alias: "postfix hosts running the full mail stuff, including clamav, SA, postgrey, policyd-weight"
     private: 1
   apache2-hosts:
     alias: hosts running apache2
@@ -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
@@ -620,14 +627,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
@@ -741,6 +746,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