Merge lp:~brad-marshall/charms/trusty/memcached/add-monitors-relation into lp:charms/trusty/memcached

[Brad Marshall]

Add support for local-monitor interface, this will allow using the nrpe and nagios charms.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #13367 memcached for brad-marshall mp276958
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/13207679/
Build: http://10.245.162.77:8080/job/charm_lint_check/13367/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #12504 memcached for brad-marshall mp276958
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/12504/

[Peter Sabaini (peter-sabaini)]

2 minor comments inline

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7821 memcached for brad-marshall mp276958
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13207715/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7821/

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1390/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1400/

review: Needs Fixing (automated testing)

[lp:~brad-marshall/charms/trusty/memcached/add-monitors-relation]

72. By Brad Marshall on 2015-11-23

[bradm] Fix lint warnings, tidy up comments

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14250 memcached for brad-marshall mp276958
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/13463175/
Build: http://10.245.162.77:8080/job/charm_lint_check/14250/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13281 memcached for brad-marshall mp276958
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/13281/

[Brad Marshall (brad-marshall)]

Updated to fix the lint problems I caused, and some other minor issues. The test failures are pre-existing, nothing to do with my changes best I can tell.

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8013 memcached for brad-marshall mp276958
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13476838/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8013/

[Konstantinos Tsakalozos (kos.tsakalozos)]

The charm tests fail because the firewall blocks port 11214 of memcached while the tests try to telnet there. The newly created bug https://bugs.launchpad.net/charms/+source/memcached/+bug/1525026 has all the details for this issue.

The above bug is not directly related to the patch proposed here. However, at this point there is no proper way to verify that we do not break something. Also, there is no test dedicated to the added functionality.

review: Needs Fixing

[Adam Israel (aisrael)]

Hi Brad,

I'm happy to report that the blocking bug, lp:1525026, has been addressed. With that in place, your tests now pass.

We'd still like to have tests for the new functionality, but I won't block on that.

Thanks for your work towards improving this charm!

review: Approve

=== added symlink 'hooks/local-monitors-relation-changed'
=== target is u'memcached_hooks.py'
=== modified file 'hooks/memcached_hooks.py'
--- hooks/memcached_hooks.py	2015-07-22 20:37:00 +0000
+++ hooks/memcached_hooks.py	2015-11-23 00:13:51 +0000
@@ -14,6 +14,7 @@
     relation_get,
     relation_set,
     unit_get,
+    hook_name,
     Hooks,
     UnregisteredHookError,
 )
@@ -287,6 +288,8 @@
 
 
 @hooks.hook('nrpe-external-master-relation-changed')
[e-mail]('monitors-relation-changed')
[e-mail]('local-monitors-relation-changed')
 @restart_on_change(RESTART_MAP)
 def nrpe_external_master_relation_changed():
 
@@ -296,9 +299,10 @@
     ufw.service('5666', 'open')
     open_port('5666')
 
-    # make sure rsync port is open for check collection by external master
-    ufw.service('873/tcp', 'open')
-    open_port('873')
+    if ('nrpe-external-master' in hook_name()):
+        # make sure rsync port is open for check collection by external master
+        ufw.service('873/tcp', 'open')
+        open_port('873')
 
     if not os.path.isdir(LOCAL_NAGIOS_PLUGINS):
         os.makedirs(LOCAL_NAGIOS_PLUGINS)
@@ -319,10 +323,19 @@
     templating.render('nrpe_check_memcached.cfg.tmpl',
                       '/etc/nagios/nrpe.d/check_memcached.cfg',
                       configs)
-    templating.render('nrpe_export.cfg.tmpl',
-                      ('/var/lib/nagios/export/service__{}_check_'
-                       'memcached.cfg').format(nagios_hostname),
-                      configs)
+
+    if ('nrpe-external-master' in hook_name()):
+        templating.render('nrpe_export.cfg.tmpl',
+                          ('/var/lib/nagios/export/service__{}_check_'
+                           'memcached.cfg').format(nagios_hostname),
+                          configs)
+
+    if ('monitors' in hook_name()):
+        with open('monitors.yaml') as mon_file:
+            mon_data = mon_file.read()
+
+        relation_set(monitors=mon_data, target_id=nagios_hostname,
+                     target_address=unit_get('private-address'))
 
     service_reload('nagios-nrpe-server')
 

=== added symlink 'hooks/monitors-relation-changed'
=== target is u'memcached_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-02-12 22:13:27 +0000
+++ metadata.yaml	2015-11-23 00:13:51 +0000
@@ -14,9 +14,14 @@
     interface: memcache
   munin:
     interface: munin-node
+  monitors:
+    interface: monitors
+  local-monitors:
+    interface: local-monitors
+    scope: container
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
 peers:
   cluster:
-    interface: memcached-replication
\ No newline at end of file
+    interface: memcached-replication

=== added file 'monitors.yaml'
--- monitors.yaml	1970-01-01 00:00:00 +0000
+++ monitors.yaml	2015-11-23 00:13:51 +0000
@@ -0,0 +1,6 @@
+version: '0.3'
+monitors:
+    remote:
+        nrpe:
+            memcached:
+                command: check_memcached