diff --git a/roles/nagios_client/templates/check_datanommer_history.cfg.j2 b/roles/nagios_client/templates/check_datanommer_history.cfg.j2
index 2b1c6cbbec..85bacf91af 100644
--- a/roles/nagios_client/templates/check_datanommer_history.cfg.j2
+++ b/roles/nagios_client/templates/check_datanommer_history.cfg.j2
@@ -41,6 +41,8 @@ command[check_datanommer_faf]={{libdir}}/nagios/plugins/check_datanommer_timesin
 command[check_datanommer_koschei]={{libdir}}/nagios/plugins/check_datanommer_timesince.py koschei 86400 604800
 command[check_datanommer_autocloud]={{libdir}}/nagios/plugins/check_datanommer_timesince.py autocloud 259200 1814400
 command[check_datanommer_twoweekatomic]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py org.fedoraproject.prod.releng.atomic.twoweek.complete 1296000 1382400
+command[check_datanommer_mdapi]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py mdapi 14400 86400
+command[check_datanommer_greenwave]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py greenwave 14400 86400
 
 # This one is retired since it times out all the time.  Too few messages.
 #command[check_datanommer_nuancier]={{libdir}}/nagios/plugins/check_datanommer_timesince.py nuancier 23652000 31536000
diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg
index d7eb667e17..de71e68fd7 100644
--- a/roles/nagios_server/files/nagios/services/fedmsg.cfg
+++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg
@@ -347,6 +347,18 @@ define service {
   check_command         check_by_nrpe!check_datanommer_twoweekatomic
   use                   defaulttemplate
 }
+define service {
+  host_name             busgateway01.phx2.fedoraproject.org
+  service_description   Check datanommer for recent mdapi messages
+  check_command         check_by_nrpe!check_datanommer_mdapi
+  use                   defaulttemplate
+}
+define service {
+  host_name             busgateway01.phx2.fedoraproject.org
+  service_description   Check datanommer for recent greenwave messages
+  check_command         check_by_nrpe!check_datanommer_greenwave
+  use                   defaulttemplate
+}
 
 
 # BEGIN, check consumers and producers