AMBARI-21511 : Grafana setup fails if password is too short. (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b290ce06 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b290ce06 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b290ce06 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: b290ce068a14b153449840f00ba809ee256c22e2 Parents: 4bce578 Author: Aravindan Vijayan <avija...@hortonworks.com> Authored: Thu Aug 24 15:28:25 2017 -0700 Committer: Aravindan Vijayan <avija...@hortonworks.com> Committed: Thu Aug 24 15:28:25 2017 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/services/stack_advisor.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b290ce06/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py index 5b8cba5..bd60bed 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py @@ -789,7 +789,8 @@ class HDP206StackAdvisor(DefaultStackAdvisor): "AMBARI_METRICS": {"ams-hbase-site": self.validateAmsHbaseSiteConfigurations, "ams-hbase-env": self.validateAmsHbaseEnvConfigurations, "ams-site": self.validateAmsSiteConfigurations, - "ams-env": self.validateAmsEnvConfigurations} + "ams-env": self.validateAmsEnvConfigurations, + "ams-grafana-env": self.validateGrafanaEnvConfigurations} } def validateMinMax(self, items, recommendedDefaults, configurations): @@ -834,6 +835,17 @@ class HDP206StackAdvisor(DefaultStackAdvisor): validationItems.extend([{"config-name":'timeline.metrics.service.operation.mode', "item": correct_op_mode_item }]) return self.toConfigurationValidationProblems(validationItems, "ams-site") + def validateGrafanaEnvConfigurations(self, properties, recommendedDefaults, configurations, services, hosts): + validationItems = [] + + grafana_pwd = properties.get("metrics_grafana_password") + grafana_pwd_length_item = None + if len(grafana_pwd) < 4: + grafana_pwd_length_item = self.getErrorItem("Grafana password length should be at least 4.") + pass + validationItems.extend([{"config-name":'metrics_grafana_password', "item": grafana_pwd_length_item }]) + return self.toConfigurationValidationProblems(validationItems, "ams-site") + def validateAmsHbaseSiteConfigurations(self, properties, recommendedDefaults, configurations, services, hosts): amsCollectorHosts = self.getComponentHostNames(services, "AMBARI_METRICS", "METRICS_COLLECTOR")
