From b2a26bf3bfe8a62798cd5483da3fc2ef90cd0347 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 21 Aug 2014 17:47:10 +0000
Subject: [PATCH] Add some of the newer fedmsg categories to nagios.

---
 .../templates/check_datanommer_history.cfg.j2 |  8 +++-
 .../files/nagios/services/fedmsg.cfg          | 43 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/roles/nagios_client/templates/check_datanommer_history.cfg.j2 b/roles/nagios_client/templates/check_datanommer_history.cfg.j2
index fb563c5413..5bd99c9500 100644
--- a/roles/nagios_client/templates/check_datanommer_history.cfg.j2
+++ b/roles/nagios_client/templates/check_datanommer_history.cfg.j2
@@ -30,8 +30,14 @@ command[check_datanommer_fedbadges]={{libdir}}/nagios/plugins/check_datanommer_t
 command[check_datanommer_nuancier]={{libdir}}/nagios/plugins/check_datanommer_timesince.py nuancier 23652000 31536000
 command[check_datanommer_fedocal]={{libdir}}/nagios/plugins/check_datanommer_timesince.py fedocal 7884000 23652000
 command[check_datanommer_ansible]={{libdir}}/nagios/plugins/check_datanommer_timesince.py ansible 432000 604800
+command[check_datanommer_summershum]={{libdir}}/nagios/plugins/check_datanommer_timesince.py summershum 604800 1814400
+command[check_datanommer_jenkins]={{libdir}}/nagios/plugins/check_datanommer_timesince.py jenkins 432000 604800
+command[check_datanommer_github]={{libdir}}/nagios/plugins/check_datanommer_timesince.py github 432000 604800
+command[check_datanommer_kerneltest]={{libdir}}/nagios/plugins/check_datanommer_timesince.py kerneltest 604800 1814400
+command[check_datanommer_fmn]={{libdir}}/nagios/plugins/check_datanommer_timesince.py fmn 604800 1814400
 
 # These are not actually finished and deployed yet
 command[check_datanommer_mailman]={{libdir}}/nagios/plugins/check_datanommer_timesince.py mailman 14400 86400
 command[check_datanommer_cnucnuweb]={{libdir}}/nagios/plugins/check_datanommer_timesince.py cnucnuweb 604800 1814400
-command[check_datanommer_summershum]={{libdir}}/nagios/plugins/check_datanommer_timesince.py summershum 604800 1814400
+command[check_datanommer_fedimg]={{libdir}}/nagios/plugins/check_datanommer_timesince.py fedimg 259200 604800
+command[check_datanommer_bugzilla]={{libdir}}/nagios/plugins/check_datanommer_timesince.py bugzilla 86400 259200
diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg
index c4fbe81931..486216cc99 100644
--- a/roles/nagios_server/files/nagios/services/fedmsg.cfg
+++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg
@@ -178,10 +178,49 @@ define service {
 #}
 #define service {
 #  host_name             busgateway01
-#  service_description   Check datanommer for recent summershum messages
-#  check_command         check_by_nrpe!check_datanommer_summershum
+#  service_description   Check datanommer for recent fedimg messages
+#  check_command         check_by_nrpe!check_datanommer_fedimg
 #  use                   defaulttemplate
 #}
+#define service {
+#  host_name             busgateway01
+#  service_description   Check datanommer for recent bugzilla messages
+#  check_command         check_by_nrpe!check_datanommer_bugzilla
+#  use                   defaulttemplate
+#}
+define service {
+  host_name             busgateway01
+  service_description   Check datanommer for recent summershum messages
+  check_command         check_by_nrpe!check_datanommer_summershum
+  use                   defaulttemplate
+}
+define service {
+  host_name             busgateway01
+  service_description   Check datanommer for recent jenkins messages
+  check_command         check_by_nrpe!check_datanommer_jenkins
+  use                   defaulttemplate
+}
+define service {
+  host_name             busgateway01
+  service_description   Check datanommer for recent github messages
+  check_command         check_by_nrpe!check_datanommer_github
+  use                   defaulttemplate
+}
+define service {
+  host_name             busgateway01
+  service_description   Check datanommer for recent kerneltest messages
+  check_command         check_by_nrpe!check_datanommer_kerneltest
+  use                   defaulttemplate
+}
+define service {
+  host_name             busgateway01
+  service_description   Check datanommer for recent fmn messages
+  check_command         check_by_nrpe!check_datanommer_fmn
+  use                   defaulttemplate
+}
+
+
+
 
 define service {
   host_name             busgateway01