Merge lp:~nick-moffitt/charm-helpers/nrpe-servicegroup-comments into lp:charm-helpers

[Nick Moffitt]

I'm working on better ways to collect nagios checks than the current rsync model, and right now that means as much info as possible goes into the nrpe configs. The result is that servicegroup data need to be written in specially-formatted comments in the nrpe.d config files, just before the alerts they describe.

[Stuart Bishop (stub)]

specially-formatted comments probably need a comment in nrpe.py explaining that they are specially-formatted, or someone will stomp you.

Otherwise, sure. I've done worse... but it would be nice if you could store this data somewhere else in a real format.

review: Approve

[Nick Moffitt (nick-moffitt)]

Well, the whole goal is to make the nrpe configs the complete representation of what needs to be replicated. This allows us to monitor everything that can be monitored. Part of the goal of this is to increase coverage, while making something more rigorous and perfect for data definition is best left to the prometheus monitoring systems.

[Nick Moffitt (nick-moffitt)]

I'll add the warning though, as that's a good point.

[lp:~nick-moffitt/charm-helpers/nrpe-servicegroup-comments]

740. By Nick Moffitt on 2017-05-02

Add a warning to the nrpe files

741. By Nick Moffitt on 2017-05-16

merge

742. By Nick Moffitt on 2017-05-16

Make the warning a bit stronger at barryprice's urging

[Barry Price (barryprice)]

Makes sense, +1

review: Approve

=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
--- charmhelpers/contrib/charmsupport/nrpe.py	2017-03-30 05:30:11 +0000
+++ charmhelpers/contrib/charmsupport/nrpe.py	2017-05-16 09:59:34 +0000
@@ -193,6 +193,13 @@
         nrpe_check_file = self._get_check_filename()
         with open(nrpe_check_file, 'w') as nrpe_check_config:
             nrpe_check_config.write("# check {}\n".format(self.shortname))
+            if nagios_servicegroups:
+                nrpe_check_config.write(
+                    "# The following header was added automatically by juju\n")
+                nrpe_check_config.write(
+                    "# Modifying it will affect nagios monitoring and alerting\n")
+                nrpe_check_config.write(
+                    "# servicegroups: {}\n".format(nagios_servicegroups))
             nrpe_check_config.write("command[{}]={}\n".format(
                 self.command, self.check_cmd))
 

=== modified file 'tests/contrib/charmsupport/test_nrpe.py'
--- tests/contrib/charmsupport/test_nrpe.py	2017-03-30 05:30:11 +0000
+++ tests/contrib/charmsupport/test_nrpe.py	2017-05-16 09:59:34 +0000
@@ -159,6 +159,9 @@
 """
         expected = [
             '# check myservice\n',
+            '# The following header was added automatically by juju\n',
+            '# Modifying it will affect nagios monitoring and alerting\n',
+            '# servicegroups: a\n',
             'command[check_myservice]=/usr/lib/nagios/plugins/check_http http://localhost\n',
             service_file_contents,
         ]