Merge lp:~pedronis/charms/trusty/apache2/nagios_extra_check_https into lp:~tanuki/charms/trusty/apache2/trunk

[Samuele Pedroni]

support new config nagios_extra_http_checks to specify extra nrpe check_http checks, useful when fronting more than one backend

support new config nagios_extra_http_checks to specify extra nrpe check_http checks, useful when fronting more than one backend, with tests

at least here not all the preexisting tests pass :/

[lp:~pedronis/charms/trusty/apache2/nagios_extra_check_https]

69. By Samuele Pedroni on 2015-08-28

the spelling was confusing, rename

[Celso Providelo (cprov)]

Samuele,

Thanks for the changes, as discussed on IRC, test failure were there pre-fork (FAILED (errors=4, failures=2)), so don't worry (much).

I think we will probably need to pass a proper "description" for each extra check (as part of our guided-alerts story), but let's do it when we need.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-08-11 19:06:25 +0000
+++ config.yaml	2015-08-28 12:49:12 +0000
@@ -118,6 +118,19 @@
      default: ""
      type: string
      description: The parameters to pass to the nrpe plugin check_http.
+  nagios_extra_http_checks:
+     default: ""
+     type: string
+     description: |
+         Extra nrpe plugin check_http checks. Useful when fronting more than
+         one backend. A string with a YAML sequence of mappings with keys
+         name, params (like nagios_check_http_params) and optionally
+         description:
+             - name: backend1
+               params: -H ...
+             - name: backend2
+               description: Check backend2 endpoint
+               params: -H ...
   logrotate_rotate:
     type: string
     description: daily, weekly, monthly, or yearly?
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-04-15 20:23:01 +0000
+++ hooks/hooks.py	2015-08-28 12:49:12 +0000
@@ -437,6 +437,15 @@
             description='Check Virtual Host',
             check_cmd='check_http %s' % check_http_params
         )
+    extra_http_checks = conf.get('nagios_extra_http_checks')
+    if extra_http_checks:
+        for check_http in yaml.safe_load(extra_http_checks):
+            name = check_http['name']
+            nrpe_compat.add_check(
+                shortname=name,
+                description=check_http.get('description', 'Check %s' % name),
+                check_cmd='check_http %s' % check_http['params']
+            )
     nrpe_compat.write()
 
 
 
=== modified file 'hooks/tests/test_nrpe_hooks.py'
--- hooks/tests/test_nrpe_hooks.py	2015-03-09 16:32:43 +0000
+++ hooks/tests/test_nrpe_hooks.py	2015-08-28 12:49:12 +0000
@@ -1,5 +1,5 @@
 from testtools import TestCase
-from mock import patch
+from mock import call, patch
 
 import hooks
 
@@ -28,3 +28,30 @@
         hooks.update_nrpe_checks()
         self.assertFalse(nrpe.add_check.called)
         nrpe.write.assert_called_once_with()
+
+    @patch('hooks.nrpe.NRPE')
+    def test_update_nrpe_with_extra_http_checks(self, mock_nrpe):
+        nrpe = mock_nrpe.return_value
+        nrpe.config = {
+            'nagios_extra_http_checks': """
+- name: backend1
+  params: -H bar1
+- name: backend2
+  description: Check backend2 endpoint
+  params: -H bar2
+""",
+        }
+        hooks.update_nrpe_checks()
+        add_check_calls = nrpe.add_check.mock_calls
+        self.assertEqual(len(add_check_calls), 2)
+        self.assertEqual(add_check_calls[0], call(
+            shortname='backend1',
+            description='Check backend1',
+            check_cmd='check_http -H bar1'
+        ))
+        self.assertEqual(add_check_calls[1], call(
+            shortname='backend2',
+            description='Check backend2 endpoint',
+            check_cmd='check_http -H bar2'
+        ))
+        nrpe.write.assert_called_once_with()