Merge lp:~verterok/charms/trusty/logstash/fix-the-thing into lp:~tanuki/charms/trusty/logstash/trunk

[Guillermo Gonzalez]

Fix config-changed to not overwrite ES config. Also make cache_hosts (in hooks/client-relation-changed) iterate over all client relations instead of just the current one.

- Make cache_hosts (in hooks/client-relation-changed) generic by iterate over all client relations, and fix identation.
  This simplified debugging the hooks. can remove it if there are any objections
- Fix copy_config (hooks/config-changed) to not overwrite output-elasticsearch.conf

[Celso Providelo (cprov)]

Guillermo,

As pointed on IRC, good catch on the "output" template overwrite.

I am not sure how iterating over all "client" relations would affect us, specially when we have multiple ES units. However it's not a problem for now.

review: Approve

=== modified file 'hooks/client-relation-changed'
--- hooks/client-relation-changed	2014-09-23 16:59:13 +0000
+++ hooks/client-relation-changed	2015-09-08 16:27:29 +0000
@@ -34,24 +34,26 @@
 
     out = os.path.join(BASEPATH, 'conf.d', 'output-elasticsearch.conf')
     with open(out, 'w') as p:
-      p.write(render(os.path.basename(out), opts))
-
+        p.write(render(os.path.basename(out), opts))
 
 
 def cache_hosts():
-    host = hookenv.relation_get('host')
-    if not host:
-      log('No host received. Assuming nothing to do.')
-      sys.exit(0)
-
+    rels = hookenv.relations_of_type("client")
+    if not rels:
+        log('No client relations. Assuming nothing to do.')
+        sys.exit(0)
     if not os.path.exists('host_cache'):
         open('host_cache', 'a').close()
-
-    with open('host_cache', 'r') as f:
-        hosts = f.readlines()
-    if not host in hosts:
-        with open('host_cache', 'a') as f:
-            f.write('{}\n'.format(host))
+    for rel in rels:
+        host = rel.get('host')
+        if not host:
+            log('No host received for relation: {}.'.format(rel))
+            continue
+        with open('host_cache', 'r') as f:
+            hosts = f.readlines()
+        if host not in hosts:
+            with open('host_cache', 'a') as f:
+                f.write('{}\n'.format(host))
 
 
 if __name__ == "__main__":

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-09-01 22:03:23 +0000
+++ hooks/config-changed	2015-09-08 16:27:29 +0000
@@ -59,6 +59,10 @@
     key_file = os.path.join(cert_dir, 'logstash.key')
 
     for f in files:
+        # skip output-elasticsearch.conf, is managed by
+        # hooks/client-relation-changed
+        if os.path.basename(f) == "output-elasticsearch.conf":
+            continue
         if os.path.basename(f) != lumberjack_template:
             with open(os.path.join(BASEPATH, 'conf.d', f), 'w') as p:
                 p.write(render(os.path.basename(f), opts))