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

[Jacek Nykis]

Add ability to retrieve autogenerated admin password. Fix one bug in install_file config option handling

[Neale Pickett (neale)]

review: Approve

=== modified file 'README.md'
--- README.md	2016-02-24 19:08:53 +0000
+++ README.md	2016-05-04 15:39:22 +0000
@@ -5,6 +5,14 @@
 #Usage
 
     juju deploy grafana
+    juju add-relation prometheus:grafana-source grafana:grafana-source
+
+Above will automatcially configure prometheus as grafana datasource
+
+If admin password is not set using configuration option it is autogenated.
+To retried autogenerated password run:
+    juju run --service grafana "scripts/get_admin_password"
+
 
 #Development
 
@@ -15,7 +23,7 @@
 
 Branch code to
 
-    $JUJU_REPOSITORY/layers/prometheus/
+    $JUJU_REPOSITORY/layers/layer-grafana/
 
 Modify
 
@@ -25,6 +33,6 @@
 
 #Contact Information
 
-Author: Alvaro Uria <[e-mail]>
+Author: Alvaro Uria <[e-mail]>, Jacek Nykis <[e-mail]>
 Report bugs at: http://bugs.launchpad.net/~canonical-bootstack/charms/trusty/bootstack-grafana/composer
 Location: http://jujucharms.com/charms/trusty/bootstack-grafana

=== modified file 'reactive/grafana.py'
--- reactive/grafana.py	2016-04-29 22:11:08 +0000
+++ reactive/grafana.py	2016-05-04 15:39:22 +0000
@@ -38,7 +38,7 @@
 def install_packages():
     config = hookenv.config()
     install_opts = ('install_sources', 'install_keys')
-    if config.changed('install_file'):
+    if config.changed('install_file') and config.get('install_file', False):
         hookenv.status_set('maintenance', 'Installing deb pkgs')
         fetch.apt_install(GRAFANA_DEPS)
         pkg_file = '/tmp/grafana.deb'
@@ -283,9 +283,8 @@
     passwd = config.get('admin_password', False)
     if not passwd:
         passwd = host.pwgen(16)
-        # TODO: Allow users to retrieve password, possibly using an action
-        # Below does not make the password visible in juju get output
-        config['admin_password'] = passwd
+        kv = unitdata.kv()
+        kv.set('grafana.admin_password', passwd)
 
     try:
         stmt = "UPDATE user SET email=?, name='BootStack Team'"

=== added directory 'scripts'
=== added file 'scripts/get_admin_password'
--- scripts/get_admin_password	1970-01-01 00:00:00 +0000
+++ scripts/get_admin_password	2016-05-04 15:39:22 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/env python3
+
+from charmhelpers.core import unitdata
+
+kv = unitdata.kv()
+if kv.get('grafana.admin_password'):
+    print('Admin password: {}'.format(kv.get('grafana.admin_password')))
+else:
+    print('ERROR! Unable to retrieve password. Was it set using config option?')