Merge lp:~maxiberta/charms/trusty/grafana/layer-grafana-plugins into lp:~canonical-is-sa/charms/trusty/grafana/layer-grafana

[Maximiliano Bertacchini]

Add support for grafana plugins.

Add support for grafana plugins.

[Celso Providelo (cprov)]

Thanks, Maxi.

The code change looks sane, let's wait for the IS review.

review: Approve

[Stuart Bishop (stub)]

The target branch is now in git at https://launchpad.net/grafana-charm. I don't think there is much divergence yet so patches should apply cleanly.

tbh I think this should be Juju2 and using resources rather than http urls and hosting to be setup. I don't know if Juju resources supports this use case though (iirc you can't specify a arbitrarily long list of resources, making it useless for this sort of thing)

(this is not a real review - I'm not here at the moment)

[Maximiliano Bertacchini (maxiberta)]

Thanks. Rebased onto lp:grafana-charm, which is indeed basically the exact same code: https://code.launchpad.net/~maxiberta/grafana-charm/+git/grafana-charm/+merge/308551.

review: Needs Resubmitting

Unmerged revisions

44. By Maximiliano Bertacchini on 2016-10-05

Add support for grafana plugins.

43. By Maximiliano Bertacchini on 2016-10-05

Fix typo that prevented the config-changed hook from running.

42. By Maximiliano Bertacchini on 2016-10-05

Fix typo in README.

=== modified file 'README.md'
--- README.md	2016-07-20 01:50:58 +0000
+++ README.md	2016-10-05 22:27:37 +0000
@@ -10,7 +10,7 @@
 Above will automatcially configure prometheus as grafana datasource
 
 If admin password is not set using configuration option it is autogenerated.
-To retried autogenerated password run:
+To retrieve autogenerated password, run:
     juju run --service grafana "scripts/get_admin_password"
 
 

=== modified file 'config.yaml'
--- config.yaml	2016-07-20 02:03:04 +0000
+++ config.yaml	2016-10-05 22:27:37 +0000
@@ -91,3 +91,10 @@
     type: string
     description: |
       Location where to put dashboard dumps
+  install_plugins:
+    default: ""
+    type: string
+    description: |
+      Comma separated list of locations where grafana plugin tarballs can be found.
+      Example:
+        install_plugins: http://my.company.com/packages/grafana/plugins/plugin-panel.tar.gz

=== modified file 'reactive/grafana.py'
--- reactive/grafana.py	2016-07-21 02:47:36 +0000
+++ reactive/grafana.py	2016-10-05 22:27:37 +0000
@@ -7,12 +7,13 @@
 import json
 import subprocess
 import base64
+import shutil
 from charmhelpers import fetch
 from charmhelpers.core import host, hookenv, unitdata
 from charmhelpers.core.templating import render
 from charmhelpers.contrib.charmsupport import nrpe
 from charms.reactive import hook, remove_state, set_state, when, when_not
-from charms.reactive.helpers import any_file_changed, data_changed
+from charms.reactive.helpers import any_file_changed, data_changed, is_state
 
 
 try:
@@ -61,6 +62,41 @@
     hookenv.status_set('active', 'Completed installing grafana')
 
 
+@when('grafana.installed')
+@when('config.changed.install_plugins')
+def install_plugins():
+    plugins_dir = '/var/lib/grafana/plugins/'
+
+    if os.path.exists(plugins_dir):
+        hookenv.log('Cleaning up currently installed plugins')
+        hookenv.status_set('maintenance', 'Cleaning up currently installed plugins')
+        for entry in os.listdir(plugins_dir):
+            entry_path = os.path.join(plugins_dir, entry)
+            if os.path.isfile(entry_path):
+                os.unlink(entry_path)
+            elif os.path.isdir(entry_path):
+                shutil.rmtree(entry_path)
+        hookenv.log('Completed cleaning up grafana plugins')
+        hookenv.status_set('active', 'Completed cleaning up grafana plugins')
+
+    config = hookenv.config()
+    if config.get('install_plugins', False):
+        hookenv.log('Installing plugins')
+        hookenv.status_set('maintenance', 'Installing plugins')
+        plugin_file = '/tmp/grafana-plugin.tar.gz'
+        for plugin_url in config.get('install_plugins').split(','):
+            plugin_url = plugin_url.strip()
+            hookenv.log('Downloading plugin: {!r}'.format(plugin_url))
+            with open(plugin_file, 'wb') as f:
+                r = requests.get(plugin_url, stream=True)
+                for block in r.iter_content(1024):
+                    f.write(block)
+            hookenv.log('Extracting plugin: {!r}'.format(plugin_url))
+            shutil.unpack_archive(plugin_file, plugins_dir)
+        hookenv.log('Completed installing grafana plugins')
+        hookenv.status_set('active', 'Completed installing grafana plugins')
+
+
 @hook('upgrade-charm')
 def upgrade_charm():
     hookenv.status_set('maintenance', 'Forcing package update and reconfiguration on upgrade-charm')
@@ -68,7 +104,7 @@
     remove_state('grafana.configured')
 
 
-@hook('config.changed')
+@hook('config-changed')
 def config_changed():
     remove_state('grafana.configured')
     config = hookenv.config()
@@ -191,7 +227,7 @@
         hookenv.status_set('maintenance', msg)
         hookenv.log(msg)
         host.service_start(SVCNAME)
-    elif any_file_changed([GRAFANA_INI]):
+    elif any_file_changed([GRAFANA_INI]) or is_state('config.changed.install_plugins'):
         msg = 'Restarting {}'.format(SVCNAME)
         hookenv.log(msg)
         hookenv.status_set('maintenance', msg)