Merge lp:~michael.nelson/charms/trusty/logstash-forwarder/enable-files-to-be-list-of-hashes into lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk

[Michael Nelson]

Enable files option to be normal list of hashes as per https://github.com/elastic/logstash-forwarder .
This allows extra fields to be sent with the data (useful for providing a field to differentiate different services sending data).

I've tested this on staging already, and works as expected.

[Michael Foley (foli)]

+1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-10-27 00:53:20 +0000
+++ config.yaml	2015-11-05 05:07:22 +0000
@@ -23,6 +23,9 @@
         and their field type
         e.g. {"syslog": ["/var/log/syslog", "/var/log/*.log"],
               "apache": ["/var/log/apache2/*log"]}
+        Alternatively, this can also be the full list of hashes, as per the
+        definition of the files attribute of the logstash-forwarder config at
+        https://github.com/elastic/logstash-forwarder
   package_name:
     default: "logstash-forwarder_0.4.0_amd64.deb"
     type: string

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-09-28 18:29:30 +0000
+++ hooks/hooks.py	2015-11-05 05:07:22 +0000
@@ -99,9 +99,18 @@
 
     fileSpec = conf.files()
     if fileSpec is not None:
-        for logType in fileSpec:
-            files.append({"paths": fileSpec[logType], "fields": {"type": logType}})
-        config["files"] = files
+        if isinstance(fileSpec, list):
+            # The files option is a list of hashes, as per the definition
+            # of the files attribute of the logstash-forwarder config at:
+            # https://github.com/elastic/logstash-forwarder
+            config["files"] = fileSpec
+        else:
+            for logType in fileSpec:
+                files.append({
+                    "paths": fileSpec[logType],
+                    "fields": {"type": logType}
+                })
+            config["files"] = files
 
     with open(conf.configFile(), "w") as f:
         f.write(json.dumps(config, sort_keys=True, indent=4))