Merge lp:~chris-gondolin/charms/trusty/nrpe/fix-sub-postfix into lp:charms/trusty/nrpe

[Chris Stratford]

This adds a new "sub_postfix" option to allow the deployer to specify what (if any) extension they want used for the subordinate checks automatically added by the charm (check_disk_root, etc.)

By default it's set to "_sub", so we end up with /etc/nagios/nrpe.d/check_disk_root_sub (i.e. the same as the current version), but if set to "" it makes the checks compatible with the old nagios-external-master charm and should fix bug#1473205.

[David Ames (thedac)]

Chris,

This looks good. Approved.

review: Approve

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-03-23 09:45:10 +0000
+++ config.yaml	2016-02-11 10:31:07 +0000
@@ -84,3 +84,9 @@
         If True nagios check definitions are written to
         '/var/lib/nagios/export' and rync is configured to allow nagios_master
         to collect them. Useful when Nagios is outside of the juju environment
+  sub_postfix:
+    default: "_sub"
+    type: string
+    description: |
+        A string to be appended onto all the nrpe checks created by this charm
+        to avoid potential clashes with existing checks

=== modified file 'hooks/nrpe_helpers.py'
--- hooks/nrpe_helpers.py	2016-02-03 22:49:58 +0000
+++ hooks/nrpe_helpers.py	2016-02-11 10:31:07 +0000
@@ -274,9 +274,10 @@
             },
         ]
         self['checks'] = []
+        sub_postfix = str(hookenv.config("sub_postfix"))
         for check in checks:
             check['description'] += " (sub)"
-            check['cmd_name'] += "_sub"
+            check['cmd_name'] += sub_postfix
             self['checks'].append(check)
 
     def proc_count(self):

=== modified file 'tests/10-tests'
--- tests/10-tests	2016-02-03 22:17:17 +0000
+++ tests/10-tests	2016-02-11 10:31:07 +0000
@@ -244,6 +244,16 @@
         }
         self.check_nrpe_setting(**test_config)
 
+    def test_sub_postfix(self):
+        sentry = self.deployment.sentry['nrpe'][0]
+        test_config = {
+            'filename': '/etc/nagios/nrpe.d/check_disk_root_testing.cfg',
+            'expected_settings': {'command[check_disk_root]': '/usr/lib/nagios/plugins/check_disk -u GB -w 25% -c 20% -K 5% -p /'},
+            'juju_kv': { 'sub_postfix': '_testing'},
+            'filedelim': '=',
+        }
+        self.check_nrpe_setting(**test_config)
+
     def test_custom_disk_check_params(self):
         chk_key = 'command[check_disk_root]=/usr/lib/nagios/plugins/check_disk'
         test_config = {