Merge lp:~verterok/charms/trusty/logstash/lumberjack-cert-check into lp:~tanuki/charms/trusty/logstash/trunk

[Guillermo Gonzalez]

Add nrpe check of lumberjack ssl certificate expiration.

Add nrpe check of lumberjack ssl certificate expiration.

WARNING before 30 days and CRITICAL from 14 days until end date

[Celso Providelo (cprov)]

Nice work! Clear and objective check shortname & description.

Hopefully it will also make its way upstream.

Thanks Guillermo.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-09-07 21:39:38 +0000
+++ config.yaml	2015-09-30 13:31:17 +0000
@@ -47,3 +47,7 @@
     default: "--ssl -H localhost -p 5043 -c 0.3"
     type: string
     description: The parameters to pass to the nrpe plugin check_tcp.
+  nagios_check_cert_params:
+    default: "-D 30,14 -H 127.0.0.1 -p 5043"
+    type: string
+    description: The parameters to pass to the nrpe plugin "check_tcp --ssl" to check certificate expiration date.
 
=== modified file 'hooks/nrpe-external-master-relation-changed'
--- hooks/nrpe-external-master-relation-changed	2015-05-05 23:38:46 +0000
+++ hooks/nrpe-external-master-relation-changed	2015-09-30 13:31:17 +0000
@@ -7,10 +7,46 @@
 
 from charmhelpers.core import hookenv
 from charmhelpers.contrib.charmsupport import nrpe
+from charmhelpers.contrib.charmsupport.nrpe import NRPE
 
 hooks = hookenv.Hooks()
 log = hookenv.log
 
+
+class CustomIntervalCheck(nrpe.Check):
+
+    service_template = ("""
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+define service {{
+    use                             active-service
+    host_name                       {nagios_hostname}
+    service_description             {nagios_hostname}[{shortname}] """
+                        """{description}
+    check_command                   check_nrpe!{command}
+    servicegroups                   {nagios_servicegroup}
+%s
+}}
+""")
+    intervals_template = "    {}                   {}\n"
+
+    def __init__(self, shortname, description, check_cmd, normal_check_interval=None,
+                 retry_check_interval=None, notification_interval=None):
+        super(CustomIntervalCheck, self).__init__(shortname, description, check_cmd)
+        intervals = {}
+        if normal_check_interval:
+            intervals['normal_check_interval'] = normal_check_interval
+        if retry_check_interval:
+            intervals['retry_check_interval'] = retry_check_interval
+        if notification_interval:
+            intervals['notification_interval'] = notification_interval
+        intervals_config = ""
+        for k, v in intervals.items():
+            intervals_config += self.intervals_template.format(k, v)
+        self.service_template = CustomIntervalCheck.service_template % intervals_config
+
+
 @hooks.hook('nrpe-external-master-relation-changed')
 def update_nrpe_checks():
     nrpe_compat = nrpe.NRPE()
@@ -23,6 +59,7 @@
             check_cmd='check_procs %s' % check_procs_params
         )
     check_tcp_params = conf.get('nagios_check_tcp_params')
+    check_cert_params = conf.get('nagios_check_cert_params')
     config_data = hookenv.config()
     # Only setup lumberjack protocol if ssl cert and key are configured
     if config_data['ssl_cert'] and config_data['ssl_key']:
@@ -32,6 +69,17 @@
                 description='Check logstash lumberjack input tcp port',
                 check_cmd='check_tcp %s' % check_tcp_params
             )
+        if check_cert_params:
+            # check certificate expiry date, daily and retry every 2 hs
+            cert_check = CustomIntervalCheck(
+                shortname='lumberjack_ssl_check',
+                description='Check logstash ssl certificate expiry date',
+                check_cmd='check_tcp --ssl {}'.format(check_cert_params),
+                normal_check_interval=1440,  # minutes
+                retry_check_interval=120,  # minutes
+            )
+            nrpe_compat.checks.append(cert_check)
+
     nrpe_compat.write()
 
 if __name__ == "__main__":