Merge lp:~jacekn/charms/trusty/grafana/grafana-url into lp:~canonical-is-sa/charms/trusty/grafana/layer-grafana

[Jacek Nykis]

Allow grafana to be installed from http URL, needed until we package it

[Neale Pickett (neale)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-03-16 17:22:22 +0000
+++ config.yaml	2016-04-27 16:52:58 +0000
@@ -22,13 +22,22 @@
         install_keys: |
          - ""
          - ""
+  install_file:
+    default: ""
+    type: string
+    description: |
+      Location where grafana .deb file can be found. If set install_sources and
+      install_keys options are ignored. Example:
+        install_file: http://my.company.com/packages/grafana/grafana_3.0.0_amd64.deb
   app_mode:
     default: 'production'
     type: string
     description: 'production or development'
   datasources:
-    default: |
-      - 'prometheus,BootStack Prometheus,proxy,http://localhost:9090,,,'
+    default: ""
+    description: |
+      List of datasources in format:
+        - 'prometheus,BootStack Prometheus,proxy,http://localhost:9090,,,'
     type: string
     description: |
       - type,name,access,url,password,user,database

=== modified file 'reactive/grafana.py'
--- reactive/grafana.py	2016-04-27 15:09:30 +0000
+++ reactive/grafana.py	2016-04-27 16:52:58 +0000
@@ -3,6 +3,8 @@
 import glob
 import hashlib
 import datetime
+import requests
+import subprocess
 from time import sleep
 from charmhelpers import fetch
 from charmhelpers.core import host, hookenv, unitdata
@@ -30,17 +32,26 @@
 SVCNAME = 'grafana-server'
 GRAFANA_INI = '/etc/grafana/grafana.ini'
 GRAFANA_INI_TMPL = 'grafana.ini.j2'
+GRAFANA_DEPS = ['libfontconfig1']
 
 
 def install_packages():
     config = hookenv.config()
     install_opts = ('install_sources', 'install_keys')
-    if not any(config.changed(opt) for opt in install_opts):
-        return
-    hookenv.status_set('maintenance', 'Installing deb pkgs')
-    packages = ['grafana']
-    fetch.configure_sources(update=True)
-    fetch.apt_install(packages)
+    if config.changed('install_file'):
+        hookenv.status_set('maintenance', 'Installing deb pkgs')
+        fetch.apt_install(GRAFANA_DEPS)
+        pkg_file = '/tmp/grafana.deb'
+        with open(pkg_file, 'wb') as f:
+            r = requests.get(config.get('install_file'), stream=True)
+            for block in r.iter_content(1024):
+                f.write(block)
+        subprocess.check_call(['dpkg', '-i', pkg_file])
+    elif any(config.changed(opt) for opt in install_opts):
+        hookenv.status_set('maintenance', 'Installing deb pkgs')
+        packages = ['grafana']
+        fetch.configure_sources(update=True)
+        fetch.apt_install(packages)
     hookenv.status_set('maintenance', 'Waiting for start')