X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=1f8efb90f1a3b83a72d8a6409e8a7c8e153a2d30;hb=f858ae075e7ccdfad149a9c4d64ecdefec84bb22;hp=cfdf20c0cd99d63e004d56093f4cca73a48137ac;hpb=035dc154e96daabc3ef8d7208e4d7ace2d6373e9;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index cfdf20c..1f8efb9 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -529,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
@@ -672,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
@@ -749,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
@@ -769,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