Merge lp:~michael.nelson/charms/trusty/logstash/fix-es-hosts into lp:~canonical-is-sa/charms/trusty/logstash/logstash2

[Michael Nelson]

Include all ES hosts in the output-elasticsearch.conf

I've used json.dumps to create a string list compatible with that used in the ruby file. A python list is rendered with u"10.x.x.x:9200" unicode strings which logstash obviously doesn't like.

Tested on local doployment.

[lp:~michael.nelson/charms/trusty/logstash/fix-es-hosts]

59. By Michael Nelson on 2015-11-06

Add client-relation-departed

60. By Michael Nelson on 2015-11-06

Add client-relation-departed to hooks python file.

[Michael Foley (foli)]

looks good.

review: Approve

=== modified file 'hooks/client-relation-changed'
--- hooks/client-relation-changed	2015-09-08 19:45:13 +0000
+++ hooks/client-relation-changed	2015-11-06 04:06:33 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+import json
 import os
 import sys
 
@@ -19,45 +20,23 @@
 BASEPATH = os.path.join(os.path.sep, 'opt', 'logstash')
 
 
[e-mail]('client-relation-changed')
[e-mail]('client-relation-changed', 'client-relation-departed')
 def rest_changed():
-    cache_hosts()
     write_config()
     host.service_restart(SERVICE) or host.service_start(SERVICE)
 
 
 def write_config():
-    with open('host_cache', 'r') as f:
-        hosts = f.readlines()
-    if not hosts:
-        sys.exit(0)
-
-    # Use last host in list as it will be the most recently added
-    # and first host in list may not exist anymore! TODO fix that.
-    opts = {'hosts': hosts[-1].rstrip()}
-
-    out = os.path.join(BASEPATH, 'conf.d', 'output-elasticsearch.conf')
-    with open(out, 'w') as p:
-        p.write(render(os.path.basename(out), opts))
-
-
-def cache_hosts():
     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()
-    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))
+    hosts = json.dumps(
+        ["%s:%s" % (client['host'], client['port']) for client in rels])
+
+    out = os.path.join(BASEPATH, 'conf.d', 'output-elasticsearch.conf')
+    with open(out, 'w') as p:
+        p.write(render(os.path.basename(out), dict(hosts=hosts)))
 
 
 if __name__ == "__main__":

=== added symlink 'hooks/client-relation-departed'
=== target is u'client-relation-changed'
=== modified file 'templates/output-elasticsearch.conf'
--- templates/output-elasticsearch.conf	2015-11-02 23:00:01 +0000
+++ templates/output-elasticsearch.conf	2015-11-06 04:06:33 +0000
@@ -1,5 +1,5 @@
 output {
     elasticsearch {
-        hosts => "{{hosts}}"
+        hosts => {{ hosts }}
     }
 }