Repository: ambari Updated Branches: refs/heads/branch-2.2 b713cc02e -> 9169716d1
AMBARI-15237. Create Grafana user through Ambari and add user to Grafana. Missing changes. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9169716d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9169716d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9169716d Branch: refs/heads/branch-2.2 Commit: 9169716d15935e04ceefd5844997cc23c89f6bfd Parents: b713cc0 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Wed Mar 2 21:09:33 2016 -0800 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Wed Mar 2 21:09:33 2016 -0800 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml | 2 +- .../AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9169716d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml index f15cd20..be4c0ae 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml @@ -53,7 +53,7 @@ </property> <property require-input="true"> <name>metrics_grafana_password</name> - <value> </value> + <value>admin</value> <property-type>PASSWORD</property-type> <display-name>Metrics Grafana Admin Password</display-name> <description> http://git-wip-us.apache.org/repos/asf/ambari/blob/9169716d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml index 3a0e86b..abf4dc4 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml @@ -192,13 +192,13 @@ admin_password = {{ams_grafana_admin_pwd}} #################################### Anonymous Auth ########################## [auth.anonymous] # enable anonymous access -enabled = true +;enabled = true # specify organization name that should be used for unauthenticated users -org_name = Main Org. +;org_name = Main Org. # specify role for unauthenticated users -org_role = Admin +;org_role = Admin #################################### Github Auth ########################## [auth.github]
