Merge lp:~timkuhlman/charms/trusty/grafana/layer-grafana-http into lp:~canonical-is-sa/charms/trusty/grafana/layer-grafana

[Tim Kuhlman]

Add optional anonymous access

[lp:~timkuhlman/charms/trusty/grafana/layer-grafana-http]

38. By Tim Kuhlman on 2016-05-06

Fixed template variables and double checking of config changed

[Jacek Nykis (jacekn)]

Do you know why data_changed does not work? If not I think we should investigate why because it should, we use this approach in other places too and it seems to work just fine there.

review: Needs Information

[Tim Kuhlman (timkuhlman)]

data_changed does work but reports on the data changed since the last time it was run not since the last hook. So what was happening was that when the config_changed hook would fire the function check_config would get called since grafana was already started. It does a data_changed call found out the data changed and would call setup_grafana, setup_grafana would run and do another data_changed call which found nothing had changed since the last run of the command in the check_config function and so would skip over the actual code update. By removing the second data_changed call I fixed that problem.

It is possible that on initial install or if grafana is not running setup_grafana will be called and then on the next config_changed hook check_config will call setup_grafana a second time. I didn't fully trace the logic through of that initial setup but thought a double config in that case is a lot better than failing to update after config-changed.

[Jacek Nykis (jacekn)]

Makes sense! LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-04-29 23:23:21 +0000
+++ config.yaml	2016-05-06 22:05:36 +0000
@@ -33,6 +33,14 @@
     default: 'production'
     type: string
     description: 'production or development'
+  anonymous:
+    default: False
+    type: boolean
+    description: Whether to allow anonymous users, defaults to False.
+  anonymous_role:
+    default: 'Viewer'
+    type: string
+    description: The role given to anonymous users if enabled.
   datasources:
     default: ""
     description: |

=== modified file 'reactive/grafana.py'
--- reactive/grafana.py	2016-05-04 15:28:47 +0000
+++ reactive/grafana.py	2016-05-06 22:05:36 +0000
@@ -69,14 +69,13 @@
     hookenv.status_set('maintenance', 'Configuring grafana')
     install_packages()
     config = hookenv.config()
-    if data_changed('grafana.config', config):
-        settings = {'config': config}
-        render(source=GRAFANA_INI_TMPL,
-               target=GRAFANA_INI,
-               context=settings,
-               owner='root', group='grafana',
-               perms=0o640,
-               )
+    settings = {'config': config}
+    render(source=GRAFANA_INI_TMPL,
+           target=GRAFANA_INI,
+           context=settings,
+           owner='root', group='grafana',
+           perms=0o640,
+           )
     check_ports(config.get('port'))
     set_state('grafana.start')
     hookenv.status_set('active', 'Ready')

=== modified file 'templates/grafana.ini.j2'
--- templates/grafana.ini.j2	2016-02-24 19:08:53 +0000
+++ templates/grafana.ini.j2	2016-05-06 22:05:36 +0000
@@ -124,14 +124,20 @@
 #################################### Anonymous Auth ##########################
 [auth.anonymous]
 # enable anonymous access
+{% if config['anonymous'] -%}
+enabled = true
+
+# specify role for unauthenticated users
+org_role = {{ config['anonymous_role'] }}
+{% else -%}
 ;enabled = false
 
+# specify role for unauthenticated users
+;org_role = Viewer
+{% endif %}
 # specify organization name that should be used for unauthenticated users
 ;org_name = Main Org.
 
-# specify role for unauthenticated users
-;org_role = Viewer
-
 #################################### Github Auth ##########################
 [auth.github]
 ;enabled = false