From 3897e0d8f5559e3899a72715e284015875002160 Mon Sep 17 00:00:00 2001
From: Thomas Dalichow <thomas.dalichow@publicispixelpark.de>
Date: Thu, 3 May 2018 15:55:26 +0200
Subject: [PATCH] pixelpark - dev-monitoring: add checks for rsyslogd and
 postfix

---
 .../dev-monitoring.pixelpark.com.yaml         | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/customer/pixelpark/dev-monitoring.pixelpark.com.yaml b/customer/pixelpark/dev-monitoring.pixelpark.com.yaml
index 85773c4a..5c2d497e 100644
--- a/customer/pixelpark/dev-monitoring.pixelpark.com.yaml
+++ b/customer/pixelpark/dev-monitoring.pixelpark.com.yaml
@@ -134,7 +134,18 @@ infra::profile::icinga2::object::service:
     assign:
       - 'host.address && (host.name == dev-monitoring-client.pixelpark.com || host.name == dev-monitoring.pixelpark.com)'
     notes: 'This is a load check'
-  'service-crond':
+  'systemd-status':
+    target: '/etc/icinga2/conf.d/default-services.conf'
+    import:
+      - 'generic-service'
+    check_command: 'check_systemd'
+#_ppplugindir_
+    command_endpoint: 'host.name'
+    apply: true
+    assign:
+      - 'host.address && (host.name == dev-monitoring-client.pixelpark.com || host.name == dev-monitoring.pixelpark.com)'
+    notes: 'This checks, what systemd thinks of the overall system state'
+  'crond-service-status':
     target: '/etc/icinga2/conf.d/default-services.conf'
     import:
       - 'generic-service'
@@ -144,18 +155,29 @@ infra::profile::icinga2::object::service:
     apply: true
     assign:
       - 'host.address && (host.name == dev-monitoring-client.pixelpark.com || host.name == dev-monitoring.pixelpark.com)'
-    notes: 'This checks, whether crond exists, is enabled and is running'
-  'systemd-status':
+    notes: 'This checks, whether the crond unit exists, is enabled and is running'
+  'rsyslogd-service-status':
     target: '/etc/icinga2/conf.d/default-services.conf'
     import:
       - 'generic-service'
-    check_command: 'check_systemd'
+    check_command: 'check_rsyslogd'
 #_ppplugindir_
     command_endpoint: 'host.name'
     apply: true
     assign:
       - 'host.address && (host.name == dev-monitoring-client.pixelpark.com || host.name == dev-monitoring.pixelpark.com)'
-    notes: 'This checks, what systemd thinks of the overall system state'
+    notes: 'This checks, whether the rsyslogd unit exists, is enabled and is running'
+  'postfix-service-status':
+    target: '/etc/icinga2/conf.d/default-services.conf'
+    import:
+      - 'generic-service'
+    check_command: 'check_postfix'
+#_ppplugindir_
+    command_endpoint: 'host.name'
+    apply: true
+    assign:
+      - 'host.address && (host.name == dev-monitoring-client.pixelpark.com || host.name == dev-monitoring.pixelpark.com)'
+    notes: 'This checks, whether the rsyslogd unit exists, is enabled and is running'
 #  'disk':
 #    target: '/etc/icinga2/conf.d/default-services.conf'
 #    import:
@@ -177,6 +199,16 @@ infra::profile::icinga2::object::checkcommand:
       - 'ipv4-or-ipv6' 
     command: '/opt/pixelpark-monitoring-checks/check_service crond' 
     target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' 
+  'check_service_rsyslogd': 
+    import: 
+      - 'ipv4-or-ipv6' 
+    command: '/opt/pixelpark-monitoring-checks/check_service rsyslogd' 
+    target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' 
+  'check_service_postfix': 
+    import: 
+      - 'ipv4-or-ipv6' 
+    command: '/opt/pixelpark-monitoring-checks/check_service postfix' 
+    target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' 
   'check_systemd': 
     import: 
       - 'ipv4-or-ipv6' 
-- 
2.39.5