Merge lp:~bloodearnest/charms/trusty/logstash-forwarder/trunk into lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk

[Simon Davy]

Follow up on previous branch, use the remote unit name for juju fields

Follow up on previous branch, use the remote unit name for juju fields

[lp:~bloodearnest/charms/trusty/logstash-forwarder/trunk]

18. By Chris Stratford on 2017-03-21

[bloodearnest,r=chriss] use the remote unit name for juju fields

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2017-03-07 10:46:24 +0000
+++ hooks/hooks.py	2017-03-20 22:19:41 +0000
@@ -14,9 +14,9 @@
 import socket
 sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
 from charmhelpers.core.hookenv import (
-    Hooks, log, charm_dir, relations_of_type, local_unit, service_name
+    Hooks, log, charm_dir, relations_of_type
 )
-from charmhelpers.core import host
+from charmhelpers.core import host, hookenv
 from charmhelpers.core.host import mkdir, service_start, service_stop, service_restart
 from charmhelpers.core.services import RelationContext
 from charmhelpers.fetch import apt_install, apt_update, add_source
@@ -120,23 +120,40 @@
                 })
             config["files"] = files
 
-    default_fields = {
-        'hostname': socket.gethostname(),
-        'juju_unit': local_unit().replace('/', '-'),
-        'juju_service': service_name(),
-    }
+    default_fields = {'hostname': socket.gethostname()}
     model = os.environ.get('JUJU_MODEL_NAME', os.environ.get('JUJU_ENV_NAME'))
     if model:
         default_fields['juju_model'] = model
 
+    units = []
+    relations = hookenv.relations()
+    if relations['logs']:
+        units = [u for u in relations['logs'].values()[0]
+                 if u != hookenv.local_unit()]
+
+    if not units:
+        units = [u for u in relations['juju-info'].values()[0]
+                 if u != hookenv.local_unit()]
+
+    units = [u for u in units if u != hookenv.local_unit()]
+
+    if units:
+        unit = units[0]
+        default_fields['juju_unit'] = unit.replace('/', '-')
+        default_fields['juju_service'] = unit.split('/')[0]
+
+    for file in config["files"]:
+        for default, value in default_fields.items():
+            file["fields"].setdefault(default, value)
+
     if logs_relation_data is not None:
         for path, rel_fields in logs_relation_data.items():
             fields = default_fields.copy()
             fields.update(rel_fields)
             config["files"].append({"paths": [path], "fields": fields})
 
-    host.write_file(conf.configFile(),
-        json.dumps(config, sort_keys=True, indent=4))
+    host.write_file(
+        conf.configFile(), json.dumps(config, sort_keys=True, indent=4))
 
 
 def writeEtcHosts():
@@ -251,6 +268,8 @@
 @hooks.hook('logs-relation-changed')
 @hooks.hook('logs-relation-departed')
 @hooks.hook('logs-relation-broken')
[e-mail]("juju-info-relation-joined")
[e-mail]("juju-info-relation-departed")
 def logs_relation_hooks():
     log('logs relation')
     writeConfig()
 
=== added symlink 'hooks/juju-info-relation-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/juju-info-relation-departed'
=== target is u'hooks.py'
=== modified file 'hooks/test_hooks.py'
--- hooks/test_hooks.py	2017-03-07 10:46:24 +0000
+++ hooks/test_hooks.py	2017-03-20 22:19:41 +0000
@@ -87,6 +87,20 @@
         self.mock_gethostname = self.patch(mock.patch('socket.gethostname'))
         self.mock_gethostname.return_value = 'HOSTNAME'
 
+        self.mrelations = self.patch(
+            mock.patch.object(hookenv, 'relations')
+        )
+
+        self.relations = {
+            'logs': {
+                'baz': {
+                    'logstash-forwarder/0': {},
+                    'remote/0': {},
+                }
+            }
+        }
+        self.mrelations.return_value = self.relations
+
     def test_logs_hooks(self):
         conf_path = hookenv.config("config_dir") + "/logstash_forwarder.conf"
         host.write_file.reset_mock()
@@ -96,8 +110,8 @@
         conf = json.loads(host.write_file.call_args[0][1])
         self.assertEqual("file1", conf["files"][0]["paths"][0])
         expected_fields = {
-            u'juju_service': u'logstash-forwarder',
-            u'juju_unit': u'logstash-forwarder-0',
+            u'juju_service': u'remote',
+            u'juju_unit': u'remote-0',
             u'juju_model': u'test-model',
             u'hostname': u'HOSTNAME',
             u'type': u'type1',