This is an automated email from the ASF dual-hosted git repository.
jluniya pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 2a15107b96df135bd1499a6b3715870f96381f27
Merge: b1f8afd eb5e074
Author: Jayush Luniya <jluniya@HW11039.local>
AuthorDate: Mon Jul 9 09:44:29 2018 -0700
Merge remote-tracking branch 'origin/trunk' into branch-feature-AMBARI-14714
.../ambari_commons/credential_store_helper.py | 4 +-
.../libraries/functions/constants.py | 1 +
ambari-infra/ambari-infra-solr-client/README.md | 3 +-
.../src/main/package/deb/logfeeder/postinst | 11 +-
.../src/main/package/rpm/logfeeder/postinstall.sh | 11 +-
ambari-metrics/ambari-metrics-assembly/pom.xml | 5 +-
.../src/main/package/deb/control/preinst | 45 +++++++
.../src/main/package/rpm/sink/preinstall.sh | 45 +++++++
.../server/agent/stomp/dto/AlertCluster.java | 20 +++-
.../ambari/server/upgrade/UpgradeCatalog270.java | 27 +++++
.../ACCUMULO/1.6.1.2.2.0/package/scripts/params.py | 1 +
.../hadoop-metrics2-accumulo.properties.j2 | 4 +
.../0.1.0/package/scripts/hbase_service.py | 3 -
.../templates/hadoop-metrics2-hbase.properties.j2 | 2 +-
.../0.96.0.2.0/package/scripts/hbase_service.py | 3 -
.../0.96.0.2.0/package/scripts/params_linux.py | 1 +
...oop-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 4 +
.../hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 | 4 +
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 3 -
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 2 +-
.../0.12.0.2.0/package/scripts/hive_service.py | 3 -
.../0.12.0.2.0/package/scripts/params_linux.py | 1 +
.../hadoop-metrics2-hivemetastore.properties.j2 | 4 +
.../hadoop-metrics2-hiveserver2.properties.j2 | 4 +
.../templates/hadoop-metrics2-llapdaemon.j2 | 4 +
.../templates/hadoop-metrics2-llaptaskscheduler.j2 | 4 +
.../configuration/logfeeder-ambari-config.xml | 2 +-
...onfig.xml => logfeeder-kafka-output-config.xml} | 31 ++++-
.../0.5.0/configuration/logfeeder-properties.xml | 2 +-
.../LOGSEARCH/0.5.0/package/scripts/params.py | 13 ++-
.../0.5.0/package/scripts/setup_logfeeder.py | 5 +
.../0.5.0/properties/kafka-output.json.j2 | 34 ++++++
.../YARN/2.1.0.2.0/package/scripts/service.py | 3 -
.../stack-hooks/before-START/scripts/params.py | 6 +-
.../templates/hadoop-metrics2.properties.j2 | 4 +
.../HDP/2.0.6/properties/stack_features.json | 5 +
.../configuration/hadoop-metrics2.properties.xml | 5 +
.../server/agent/stomp/dto/AlertClusterTest.java | 129 +++++++++++++++++++++
.../server/upgrade/UpgradeCatalog270Test.java | 58 +++++++++
.../oozie/ambari/view/OozieProxyImpersonator.java | 12 +-
.../main/resources/ui/app/services/user-info.js | 5 +-
.../wfmanager/src/main/resources/ui/package.json | 2 +-
.../wfmanager/src/main/resources/ui/yarn.lock | 8 +-
43 files changed, 497 insertions(+), 46 deletions(-)
diff --cc
ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py
index 78f57a3,0f29e24..db7eca9
---
a/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py
+++
b/ambari-server/src/main/resources/stack-hooks/before-START/scripts/params.py
@@@ -150,18 -159,20 +150,20 @@@ if has_metric_collector
metric_collector_protocol = 'https'
else:
metric_collector_protocol = 'http'
- metric_truststore_path= module_configs.get_property_value(module_name,
'ams-ssl-client', 'ams-ssl-client/ssl.client.truststore.location', '')
- metric_truststore_type= module_configs.get_property_value(module_name,
'ams-ssl-client', 'ams-ssl-client/ssl.client.truststore.type', '')
- metric_truststore_path=
default("/configurations/ams-ssl-client/ssl.client.truststore.location", "")
- metric_truststore_type=
default("/configurations/ams-ssl-client/ssl.client.truststore.type", "")
- metric_truststore_password=
default("/configurations/ams-ssl-client/ssl.client.truststore.password", "")
++ metric_truststore_path= module_configs.get_property_value(module_name,
'ams-ssl-client', 'ssl.client.truststore.location', '')
++ metric_truststore_type= module_configs.get_property_value(module_name,
'ams-ssl-client', 'ssl.client.truststore.type', '')
+ metric_truststore_password= module_configs.get_property_value(module_name,
'ams-ssl-client', 'ssl.client.truststore.password', '')
+ metric_legacy_hadoop_sink =
check_stack_feature(StackFeature.AMS_LEGACY_HADOOP_SINK,
version_for_stack_feature_checks)
pass
+
-metrics_report_interval =
default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
-metrics_collection_period =
default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10)
+metrics_report_interval = module_configs.get_property_value(module_name,
'ams-site', 'timeline.metrics.sink.report.interval', 60)
+metrics_collection_period = module_configs.get_property_value(module_name,
'ams-site', 'timeline.metrics.sink.collection.period', 10)
-host_in_memory_aggregation =
default("/configurations/ams-site/timeline.metrics.host.inmemory.aggregation",
True)
-host_in_memory_aggregation_port =
default("/configurations/ams-site/timeline.metrics.host.inmemory.aggregation.port",
61888)
+host_in_memory_aggregation = module_configs.get_property_value(module_name,
'ams-site', 'timeline.metrics.host.inmemory.aggregation', True)
+host_in_memory_aggregation_port =
module_configs.get_property_value(module_name, 'ams-site',
'timeline.metrics.host.inmemory.aggregation.port', 61888)
is_aggregation_https_enabled = False
-if
default("/configurations/ams-site/timeline.metrics.host.inmemory.aggregation.http.policy",
"HTTP_ONLY") == "HTTPS_ONLY":
+if module_configs.get_property_value(module_name, 'ams-site',
'timeline.metrics.host.inmemory.aggregation.http.policy', "HTTP_ONLY") ==
"HTTPS_ONLY":
host_in_memory_aggregation_protocol = 'https'
is_aggregation_https_enabled = True
else:
