Merge ~brad-marshall/charm-grafana/+git/grafana-charm-dashboard-action:actions into ~prometheus-charmers/charm-grafana:master

[Brad Marshall]

Include add-dashboard action to import json exported dashboards

[Jacek Nykis (jacekn)]

A few small comments in line but IMO it's fine. They only comment I'd like answered is about trusty vs xenial

[Brad Marshall (brad-marshall)]

I'll work on this soon, some good feedback here.

[Jacek Nykis (jacekn)]

LGTM, merged. I did _not_ compose new charm, feel free to do that when convenient.

diff --git a/README.md b/README.md
index c3881b8..37aed68 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,19 @@ To retrieve autogenerated password run:
     juju run --service grafana "scripts/get_admin_password"
 
 
+#Actions
+
+This charm supports importing dashboards, simply run:
+
+ $ juju run-action grafana/0 import-dashboard dashboard="$(base64 mydashboard.json)"
+
+where mydashboard.json is a json file:
+
+ { "dashboard": { exported-json-dashboard },
+   "overwrite": true }
+
+If you don't want to overwrite the dashboard, set overwrite to false.
+
 #Development
 
 Explicitly set `JUJU_REPOSITORY`:
diff --git a/actions.yaml b/actions.yaml
new file mode 100644
index 0000000..4d5f671
--- /dev/null
+++ b/actions.yaml
@@ -0,0 +1,8 @@
+import-dashboard:
+  description: Imports a dashboard to grafana, takes dashboard argument, base64 encoded json dashboard
+  params:
+    dashboard:
+      type: string
+      description: Contains the dashboard to be imported, in base64 encoded json format
+  required: [dashboard]
+  additionalProperties: false
diff --git a/actions/import-dashboard b/actions/import-dashboard
new file mode 100755
index 0000000..d61ff5f
--- /dev/null
+++ b/actions/import-dashboard
@@ -0,0 +1,55 @@
+#!/usr/bin/python3
+# Imports a json based dashboard into grafana
+
+import requests
+import json
+import base64
+from charmhelpers.core.hookenv import (
+    action_fail,
+    action_set,
+    action_get,
+    config,
+)
+
+from charmhelpers.core import unitdata
+
+kv = unitdata.kv()
+if kv.get('grafana.admin_password'):
+    # print('Admin password: {}'.format(kv.get('grafana.admin_password')))
+    passwd = kv.get('grafana.admin_password')
+elif config('admin_password'):
+    passwd = config('admin_password')
+    # print('Admin password: {}'.format(config('admin_password')))
+else:
+    action_fail('ERROR! Unable to retrieve password.')
+    exit(0)
+
+grafana = "http://localhost:3000"
+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)
+else:
+    action_fail("Unknown error dealing with dashboard!")
+    exit(0)
+
+# 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))
+