Merge lp:~verterok/charms/trusty/haproxy/statistics-interface into lp:charms/trusty/haproxy

[Guillermo Gonzalez]

Add statistics interface and relation support.

Add statistics interface and relation support.

This is to share the information about the statistics/monitoring endpoint to a subordinate, for example to the telegraf subordinate in order to automatically setup a haproxy input config when telegraf and haproxy are related.

[Andrew McLeod (admcleod)]

Hi Guillermo,

So, bundletester still passes (as expected since there are no related changes) and a 'make build' runs through and works OK...

However, I wasn't sure that was enough so I deployed this and related it to telegraf, and didn't see any hooks fired that were clearly 'statistics interface' related - I assume this is because I didn't relate them specifically enough, but would you be able to provide some instructions on how I can do this to make sure the hooks are firing correctly and successfully?

http://pastebin.ubuntu.com/15347650/

Thanks,
Andrew

review: Needs Information

[Guillermo Gonzalez (verterok)]

Hi Andrew,

> Hi Guillermo,
>
> So, bundletester still passes (as expected since there are no related changes)
> and a 'make build' runs through and works OK...

Thanks for looking at this.

>
> However, I wasn't sure that was enough so I deployed this and related it to
> telegraf, and didn't see any hooks fired that were clearly 'statistics
> interface' related - I assume this is because I didn't relate them
> specifically enough, but would you be able to provide some instructions on how
> I can do this to make sure the hooks are firing correctly and successfully?
>
> http://pastebin.ubuntu.com/15347650/

You'r right, there is no support for statistics interface in the telegraf charm yet, still waiting for a review on https://code.launchpad.net/~verterok/charms/trusty/telegraf/haproxy-statistics/+merge/288009
But you can test the haproxy side by using the above branch when deploying the telegraf subordinate.

The telegraf charm changes should be landed soon-ish (need to poke/chase some team mates to geta review on it)

Thanks.

[Andrew McLeod (admcleod)]

I've tested this MR against telegraf with the MR in your comment and it all looks good to me:

+1

review: Approve

[Cory Johns (johnsca)]

This has been merged and will be available in cs:trusty/haproxy shortly.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-03-03 16:47:14 +0000
+++ hooks/hooks.py	2016-03-03 20:15:59 +0000
@@ -1283,6 +1283,24 @@
     os.chown(path, uid, -1)
 
 
+def statistics_interface():
+    config = config_get()
+    enable_monitoring = config['enable_monitoring']
+    monitoring_port = config['monitoring_port']
+    monitoring_password = get_monitoring_password()
+    monitoring_username = config['monitoring_username']
+    for relid in get_relation_ids('statistics'):
+        if not enable_monitoring:
+            relation_set(relation_id=relid,
+                         enabled=enable_monitoring)
+        else:
+            relation_set(relation_id=relid,
+                         enabled=enable_monitoring,
+                         port=monitoring_port,
+                         password=monitoring_password,
+                         user=monitoring_username)
+
+
 # #############################################################################
 # Main section
 # #############################################################################
@@ -1301,6 +1319,7 @@
             install_hook()
         config_changed()
         update_nrpe_config()
+        statistics_interface()
         if config_data.implicit_save:
             config_data.save()
     elif hook_name == "start":
@@ -1326,6 +1345,9 @@
     elif hook_name in ("nrpe-external-master-relation-joined",
                        "local-monitors-relation-joined"):
         update_nrpe_config()
+    elif hook_name in ("statistics-relation-joined",
+                       "statistics-relation-changed"):
+        statistics_interface()
     else:
         print "Unknown hook"
         sys.exit(1)

=== added symlink 'hooks/statistics-relation-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/statistics-relation-joined'
=== target is u'hooks.py'
=== added file 'hooks/tests/test_statistics_hooks.py'
--- hooks/tests/test_statistics_hooks.py	1970-01-01 00:00:00 +0000
+++ hooks/tests/test_statistics_hooks.py	2016-03-03 20:15:59 +0000
@@ -0,0 +1,60 @@
+
+from testtools import TestCase
+from mock import patch
+from charmhelpers.core.hookenv import Config
+
+import hooks
+
+
+class StatisticsRelationTest(TestCase):
+
+    def setUp(self):
+        super(StatisticsRelationTest, self).setUp()
+        config = Config(**{"monitoring_port": 10001,
+                           "monitoring_username": "mon_user",
+                           "enable_monitoring": True})
+        self.config_get = self.patch_hook("config_get")
+        self.config_get.return_value = config
+        # patch changed and save methods to do nothing
+        self.config_get().changed = lambda x: False
+        self.config_get().save = lambda: None
+        self.get_monitoring_password = \
+            self.patch_hook("get_monitoring_password")
+        self.get_monitoring_password.return_value = "this-is-a-secret"
+        self.relation_set = self.patch_hook("relation_set")
+        self.get_relation_ids = self.patch_hook("get_relation_ids")
+        self.get_relation_ids.return_value = ['__stats-rel-id__']
+        self.log = self.patch_hook("log")
+
+    def patch_hook(self, hook_name):
+        mock_controller = patch.object(hooks, hook_name)
+        mock = mock_controller.start()
+        self.addCleanup(mock_controller.stop)
+        return mock
+
+    def test_relation_joined(self):
+        hooks.statistics_interface()
+        self.get_relation_ids.assert_called_once_with('statistics')
+        self.relation_set.assert_called_once_with(
+            relation_id=self.get_relation_ids()[0],
+            enabled=True,
+            port=10001,
+            password="this-is-a-secret",
+            user="mon_user")
+
+    def test_relation_joined_monitoring_disabled(self):
+        self.config_get.return_value['enable_monitoring'] = False
+        hooks.statistics_interface()
+        self.get_relation_ids.assert_called_once_with('statistics')
+        self.relation_set.assert_called_once_with(
+            relation_id=self.get_relation_ids()[0],
+            enabled=False)
+
+    def test_called_on_config_change(self):
+        config_changed = self.patch_hook('config_changed')
+        update_nrpe_config = self.patch_hook('update_nrpe_config')
+        statistics_interface = self.patch_hook('statistics_interface')
+        hooks.main('config-changed')
+        config_changed.assert_called_once_with()
+        update_nrpe_config.assert_called_once_with()
+        statistics_interface.assert_called_once_with()

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-05-15 16:54:14 +0000
+++ metadata.yaml	2016-03-03 20:15:59 +0000
@@ -22,6 +22,9 @@
   local-monitors:
     interface: local-monitors
     scope: container
+  statistics:
+    interface: statistics
+    scope: container
 peers:
   peer:
     interface: haproxy-peer