Merge ~hloeung/charm-graylog:master into ~graylog-charmers/charm-graylog:master

[Haw Loeung]

Fix set_conf() add config option when not present

At present, if the config shipped out doesn't have the required
config, nothing happens. This adds the config to the end if it
doesn't.

Also fixed to reduce tracebacks when we can't query the API.

[Junien F (axino)]

+1

review: Approve

diff --git a/lib/graylogapi.py b/lib/graylogapi.py
index e7a7ef3..8fb191b 100644
--- a/lib/graylogapi.py
+++ b/lib/graylogapi.py
@@ -79,8 +79,9 @@ class GraylogAPI:
         url = 'system/indices/index_sets'
         if index_id:
             return self._request('{}/{}'.format(url, index_id))
-        else:
-            return self._request(url)['index_sets'] or None
+        resp = self._request(url)
+        if resp:
+            return resp.get('index_sets', None)
 
     def index_set_update(self, index_id, data):
         if not self.token:
@@ -94,8 +95,9 @@ class GraylogAPI:
         url = 'system/inputs'
         if input_id:
             return self._request('{}/{}'.format(url, input_id))
-        else:
-            return self._request(url)['inputs'] or None
+        resp = self._request(url)
+        if resp:
+            return resp.get('inputs', None)
 
     def log_input_update(self, input_id=None, data=None):
         if not self.token:
diff --git a/reactive/graylog.py b/reactive/graylog.py
index 49902a1..5f5ad71 100644
--- a/reactive/graylog.py
+++ b/reactive/graylog.py
@@ -348,12 +348,13 @@ def set_conf(key, value, conf_path=CONF_FILE):
     changed = False
     replaced = False
     with open(conf_path, 'rb') as conf_file:
+        found = False
         for line in conf_file:
             line = line.decode().rstrip()
             if not key_re.match(line):
                 conf.append(line)
                 continue
-
+            found = True
             if not replaced:
                 new = '{} = {}'.format(key, value)
                 if line != new:
@@ -365,6 +366,10 @@ def set_conf(key, value, conf_path=CONF_FILE):
                 conf.append('#' + line)
             else:
                 conf.append(line)
+        if not found:
+            hookenv.log('Updating configuration file new option "{}".'.format(key))
+            changed = True
+            conf.append('{} = {}'.format(key, value))
 
     if changed:
         set_state('graylog.needs_restart')
@@ -419,6 +424,10 @@ def configure_nagios(nagios):
                    password=nagios_password,
                    token_name='nagios')
     nagios_token = g.token_get()
+    if not nagios_token:
+        # API not ready, let's write out what we have anyways.
+        nrpe_setup.write()
+        return
     host.write_file('/var/lib/nagios/graylog-api-token', nagios_token.encode(),
                     group='nagios', perms=0o640)
     for f in ('files/check_graylog_health.py', 'lib/graylogapi.py'):