From ec6c5cab14793969a6b3481525bf3a5ec3fb582b Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 25 Sep 2019 14:40:21 +0200
Subject: [PATCH] nagios_server: Check Koschei pod count instead of processes

---
 .../files/nagios/commands/openshift.cfg       | 29 ++++++++++++++++
 .../files/nagios/services/koschei.cfg         | 34 ++-----------------
 roles/nagios_server/tasks/main.yml            |  1 +
 3 files changed, 33 insertions(+), 31 deletions(-)
 create mode 100644 roles/nagios_server/files/nagios/commands/openshift.cfg

diff --git a/roles/nagios_server/files/nagios/commands/openshift.cfg b/roles/nagios_server/files/nagios/commands/openshift.cfg
new file mode 100644
index 0000000000..f81b62a08b
--- /dev/null
+++ b/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
+}
+
diff --git a/roles/nagios_server/files/nagios/services/koschei.cfg b/roles/nagios_server/files/nagios/services/koschei.cfg
index fdc1e6e0ae..b26c57ac96 100644
--- a/roles/nagios_server/files/nagios/services/koschei.cfg
+++ b/roles/nagios_server/files/nagios/services/koschei.cfg
@@ -1,34 +1,6 @@
 define service {
-  host_name             koschei-backend01.phx2.fedoraproject.org
-  service_description   koschei-polling process
-  check_command         check_by_nrpe!check_koschei_polling_proc
-  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
+  hostgroup_name        os_masters
+  service_description   koschei-watcher
+  check_command         check_openshift_objects!koschei!pods!deploymentconfig!watcher!1
   use                   defaulttemplate
 }
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 13de18b0c7..77be6d23fb 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -143,6 +143,7 @@
     - misc.cfg
     - notify.cfg
     - nrpe.cfg
+    - openshift.cfg
     - perfdata.cfg
     - ping.cfg
     - rsyslog.cfg