Return-Path: 
 <commits-return-25653-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-commits-archive@www.apache.org
Delivered-To: apmail-ambari-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 00CD718533
	for <apmail-ambari-commits-archive@www.apache.org>;
 Mon,  7 Mar 2016 19:13:31 +0000 (UTC)
Received: (qmail 44803 invoked by uid 500); 7 Mar 2016 19:13:30 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 44767 invoked by uid 500); 7 Mar 2016 19:13:30 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 44758 invoked by uid 99); 7 Mar 2016 19:13:30 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Mar 2016 19:13:30 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id AF7C2DFBAD; Mon,  7 Mar 2016 19:13:30 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: avijayan@apache.org
To: commits@ambari.apache.org
Message-Id: <30b95c417d0f4336a941716766521d55@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-15320 : Prompt the user to enter Grafana
 admin credentials (avijayan)
Date: Mon,  7 Mar 2016 19:13:30 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 d40c4d93d -> 768e93666


AMBARI-15320 : Prompt the user to enter Grafana admin credentials (avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/768e9366
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/768e9366
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/768e9366

Branch: refs/heads/branch-2.2
Commit: 768e936664bd8a5e6e985456a8f1feafda202fc6
Parents: d40c4d9
Author: Aravindan Vijayan <avijayan@hortonworks.com>
Authored: Mon Mar 7 11:13:12 2016 -0800
Committer: Aravindan Vijayan <avijayan@hortonworks.com>
Committed: Mon Mar 7 11:13:12 2016 -0800

----------------------------------------------------------------------
 .../AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml       | 3 ++-
 .../AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/768e9366/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 be4c0ae..f400da2 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>admin</value>
+    <value></value>
     <property-type>PASSWORD</property-type>
     <display-name>Metrics Grafana Admin Password</display-name>
     <description>
@@ -63,6 +63,7 @@
     </description>
     <value-attributes>
       <overridable>false</overridable>
+      <type>password</type>
     </value-attributes>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/768e9366/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 abf4dc4..ac167c4 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,10 +192,10 @@ 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