Merge lp:~bac/charms/precise/juju-gui/expose-cookies into lp:~juju-gui/charms/precise/juju-gui/trunk
Proposed by
Brad Crittenden
Status: | Merged |
---|---|
Merged at revision: | 69 |
Proposed branch: | lp:~bac/charms/precise/juju-gui/expose-cookies |
Merge into: | lp:~juju-gui/charms/precise/juju-gui/trunk |
Diff against target: |
108 lines (+28/-4) 6 files modified
config.yaml (+10/-0) config/config.js.template (+1/-0) hooks/backend.py (+2/-1) hooks/utils.py (+2/-1) revision (+1/-1) tests/test_utils.py (+12/-1) |
To merge this branch: | bzr merge lp:~bac/charms/precise/juju-gui/expose-cookies |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+170118@code.launchpad.net |
Description of the change
Expose 'use-analytics' via the charm.
To post a comment you must log in.
Reviewers: mp+170118_ code.launchpad. net,
Message:
Please take a look.
Description:
Expose 'use-analytics' via the charm.
https:/ /code.launchpad .net/~bac/ charms/ precise/ juju-gui/ expose- cookies/ +merge/ 170118
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/10395043/
Affected files: config. js.template
A [revision details]
M config.yaml
M config/
M hooks/backend.py
M hooks/utils.py
M revision
M tests/test_utils.py
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision: <email address hidden>
Index: config.yaml
'add-apt- repository' . gui-charmers/ stable
=== modified file 'config.yaml'
--- config.yaml 2013-06-12 08:59:15 +0000
+++ config.yaml 2013-06-18 15:38:18 +0000
@@ -140,3 +140,13 @@
type: string
default: ppa:juju-
+ use-analytics:
+ description: |
+ The team developing the Juju GUI benefits from understanding how
+ different deployments use the tool. By enabling this setting,
+ anonymized usage data is reported back using Google Analytics. The
type
+ of data collected includes the charms that are deployed and the
number
+ of units per service. Use of analytics is optional but we hope you
will
+ allow us to improve our tool based on your experience.
+ type: boolean
+ default: true
Index: revision
=== modified file 'revision'
--- revision 2013-06-12 09:07:29 +0000
+++ revision 2013-06-18 15:39:35 +0000
@@ -1,1 +1,1 @@
-53
+54
Index: config/ config. js.template config. js.template' config. js.template 2013-04-26 21:05:03 +0000 config. js.template 2013-06-18 15:38:18 +0000
=== modified file 'config/
--- config/
+++ config/
@@ -22,5 +22,6 @@
apiBackend: {{api_backend}}, // Value can be 'python' or 'go'.
readOnly: {{readonly}},
sandbox: {{sandbox}},
+ useAnalytics: {{use_analytics}},
login_help: {{login_help}}
};
Index: hooks/backend.py
config[ 'juju-gui- console- enabled' ], config[ 'login- help'],
config[ 'read-only' ], config['staging'], 'ssl-cert- path'],
config[ 'charmworld- url'], config[ 'serve- tests'] , config[ 'secure' ], sandbox= config[ 'sandbox' ]) config[ 'secure' ], sandbox= config[ 'sandbox' ], config[ 'use-analytics' ])
charmhelpers .open_port( 80)
charmhelpers .open_port( 443)
=== modified file 'hooks/backend.py'
--- hooks/backend.py 2013-06-11 14:04:04 +0000
+++ hooks/backend.py 2013-06-18 15:38:18 +0000
@@ -108,7 +108,8 @@
config[
- secure=
+ secure=
+ use_analytics=
Index: hooks/utils.py
console_ enabled, login_help, readonly, in_staging, ssl_cert_path,
charmworld_ url, serve_tests, path='/ etc/haproxy/ haproxy. cfg', js_path= None, secure=True, sandbox=False):
=== modified file 'hooks/utils.py'
--- hooks/utils.py 2013-06-12 08:59:15 +0000
+++ hooks/utils.py 2013-06-18 15:38:18 +0000
@@ -360,7 +360,7 @@
def start_gui(
haproxy_
- config_
...