nagios_server: Check Koschei pod count instead of processes

roles/nagios_server/files/nagios/commands/openshift.cfg

@@ -0,0 +1,29 @@
+################################################################################
+# COMMAND DEFINITIONS
+#
+# SYNTAX:
+#
+#	define command{
+#               template      <templatename>
+#		name          <objectname>
+#               command_name  <commandname>
+#               command_line  <commandline>
+#               }
+#
+# WHERE:
+#
+# <templatename> = object name of another command definition that should be
+#                  used as a template for this definition (optional)
+# <objectname>   = object name of command definition, referenced by other
+#                  command definitions that use it as a template (optional)
+# <commandname>  = name of the command, as recognized/used by Nagios
+# <commandline>  = command line
+#
+################################################################################
+
+# 'check_openshift_objects'
+define command{
+        command_name    check_openshift_objects
+        command_line    $USER1$/check_openshift_objects
+}
+

roles/nagios_server/files/nagios/services/koschei.cfg

@@ -1,34 +1,6 @@
 define service {
-  host_name             koschei-backend01.phx2.fedoraproject.org
+  hostgroup_name        os_masters
-  service_description   koschei-polling process
+  service_description   koschei-watcher
-  check_command         check_by_nrpe!check_koschei_polling_proc
+  check_command         check_openshift_objects!koschei!pods!deploymentconfig!watcher!1
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             koschei-backend01.phx2.fedoraproject.org
-  service_description   koschei-build-resolver process
-  check_command         check_by_nrpe!check_koschei_build_resolver_proc
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             koschei-backend01.phx2.fedoraproject.org
-  service_description   koschei-repo-resolver process
-  check_command         check_by_nrpe!check_koschei_repo_resolver_proc
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             koschei-backend01.phx2.fedoraproject.org
-  service_description   koschei-scheduler process
-  check_command         check_by_nrpe!check_koschei_scheduler_proc
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             koschei-backend01.phx2.fedoraproject.org
-  service_description   koschei-watcher process
-  check_command         check_by_nrpe!check_koschei_watcher_proc
   use                   defaulttemplate
 }

roles/nagios_server/tasks/main.yml

@@ -143,6 +143,7 @@
     - misc.cfg
     - notify.cfg
     - nrpe.cfg
+    - openshift.cfg
     - perfdata.cfg
     - ping.cfg
     - rsyslog.cfg