Merge ~jacekn/charm-grafana:master into ~prometheus-charmers/charm-grafana:master

[Jacek Nykis]

Rewrite import-dashboard action to support import of files on disk

Rewrite import-dashboard action to support import of files on disk

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Alexandre Gomes (alejdg)]

+1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision e6bc20bc38df1dbedccb9dca369c11484919ce7f

diff --git a/actions.yaml b/actions.yaml
index 81b8a67..5476855 100644
--- a/actions.yaml
+++ b/actions.yaml
@@ -1,10 +1,16 @@
 import-dashboard:
-  description: Imports a dashboard to grafana, takes dashboard argument, base64 encoded json dashboard
+  description: |
+      Imports dashboards to grafana. The dashboard argument contains base64
+      encoded json dashboard. The location contains path on disk to
+      a directory or file containing dashboards to be imported.  This must
+      exist on the unit runinng the action
   params:
     dashboard:
       type: string
       description: Contains the dashboard to be imported, in base64 encoded json format
-  required: [dashboard]
+    location:
+      type: string
+      description: Path to a file or directory containing dashboards to import.
   additionalProperties: false
 get-admin-password:
   description: Retrieves the admin password, either auto generated or set in config
diff --git a/actions/import-dashboard b/actions/import-dashboard
index d9e3477..c10596d 100755
--- a/actions/import-dashboard
+++ b/actions/import-dashboard
@@ -5,7 +5,7 @@ import requests
 import json
 import base64
 import traceback
-import sys
+import os
 from charmhelpers.core.hookenv import (
     config,
     action_fail,
@@ -16,44 +16,63 @@ from charmhelpers.core.hookenv import (
 
 from grafana_utils import get_admin_password
 
-action = "import-dashboard"
-
-passwd = get_admin_password()
-
-if passwd is None:
-    action_fail('Unable to retrieve password.')
-    sys.exit(0)
-
-port = config('port')
-grafana = "http://localhost:%s" % (port)
-api_auth = ('admin', passwd)
-api_dash_import_url = "/api/dashboards/import"
-try:
-    dashboard_data = json.loads(base64.b64decode(action_get('dashboard')).decode('utf-8'))
-except base64.binascii.Error:
-    action_fail("Failed to base64 decode dashboard!")
-    exit(0)
-except json.JSONDecodeError as e:
-    action_fail("Fail to json decode the dashboard: %s" % (e.msg))
-    exit(0)
-except Exception:
-    action_fail('Unhandled exception')
-    tb = traceback.format_exc()
-    action_set(dict(traceback=tb))
-    log('Unhandled exception in action {}'.format(action))
-    print(tb)
-
-# Needs to be the format:
-# { "dashboard": { dashboard },
-#   "overwrite": true } - use false here if you don't want to overwrite 
-#                         existing dashboards
-
-headers = {'Content-Type': 'application/json'}
-r = requests.post(grafana + api_dash_import_url, auth=api_auth, headers=headers,
-                  data=json.dumps(dashboard_data))
-title = dashboard_data['dashboard']['title']
-if r.status_code == 200:
-    action_set({"loaded": title})
-else:
-    action_fail("Dashboard %s failed to load" % (title))
 
+def import_dashboard(dashboard):
+    headers = {'Content-Type': 'application/json'}
+    import_url = 'http://localhost:{}/api/dashboards/import'.format(
+                  config('port'))
+    passwd = get_admin_password()
+    if passwd is None:
+        action_fail('Unable to retrieve grafana password.')
+        return False
+    api_auth = ('admin', passwd)
+    r = requests.post(import_url, auth=api_auth, headers=headers,
+                      data=json.dumps(dashboard))
+    if r.status_code == 200:
+        return True
+    else:
+        title = dashboard['dashboard']['title']
+        action_fail('Error importing dashboard: "{}"'.format(title))
+        return False
+
+
+def import_file(path):
+    with open(path, 'r') as f:
+        d = f.read()
+    try:
+        j = json.loads(d)
+    except json.JSONDecodeError as e:
+        action_fail('Fail to json decode the dashboard: {}'.format(e.msg))
+        return False
+    return import_dashboard(j)
+
+
+if action_get('dashboard'):
+    try:
+        d = json.loads(base64.b64decode(action_get('dashboard')).decode('utf-8'))
+    except base64.binascii.Error:
+        action_fail("Failed to base64 decode dashboard!")
+    except json.JSONDecodeError as e:
+        action_fail("Fail to json decode the dashboard: %s" % (e.msg))
+    except Exception:
+        action_fail('Unhandled exception, check logs')
+        log(traceback.format_exc())
+    import_dashboard(d)
+
+if action_get('location'):
+    path = action_get('location')
+    if not os.path.exists(path):
+        action_fail('Provided path does not exist on unit: {}'.format(path))
+    elif os.path.isfile(path):
+        import_file(path)
+    elif os.path.isdir(path):
+        f_count = 0
+        s_count = 0
+        for f in os.listdir(path):
+            if import_file(os.path.join(path, f)):
+                s_count += 1
+            else:
+                f_count += 1
+        action_set({'summary': 'Found {}. Imported: {}. Failed: {}'.format(s_count+f_count, s_count, f_count)})
+        if f_count > 0:
+            action_fail('Number of dashboards that failed to impor: {}'.format(f_count))