Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21105 b1f4e870b -> 2129b3963
http://git-wip-us.apache.org/repos/asf/ambari/blob/2129b396/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-admanager-config.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-admanager-config.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-admanager-config.xml index 9862f10..9250e7b 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-admanager-config.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-admanager-config.xml @@ -105,7 +105,17 @@ spark: mode: {{admanager_spark_op_mode}} - masterHostPort: {{admanager_spark_hostport}} + master: {{admanager_spark_master}} + sparkHome: {{ams_admanager_lib_dir}}/spark + jarfile: {{ams_admanager_lib_dir}}/ambari-metrics-anomaly-detection-service.jar + + detection + trend: false + kafkaServers: localhost:6667 + kafkaTopic: ambari-metrics-ad + kafkaConsumerGroup: ambari-metrics-ad-group + ema-w: 0.9 + ema-n: 3 </value> <value-attributes> <type>content</type> http://git-wip-us.apache.org/repos/asf/ambari/blob/2129b396/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py index a18b8f6..d3da000 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py @@ -215,10 +215,10 @@ spark_worker_webui_port = default("/configurations/ams-admanager-spark-env/spark spark_daemon_memory = default("/configurations/ams-admanager-spark-env/spark_daemon_memory", 1024) if admanager_spark_op_mode == 'spark-on-yarn': - admanager_spark_hostport = hostname + ":" + spark_master_port #TODO : Fix for spark on yarn mode. + admanager_spark_master = "spark://" + hostname + ":" + spark_master_port #TODO : Fix for spark on yarn mode. ams_ad_standalone_spark_enabled = False else: - admanager_spark_hostport = hostname + ":" + spark_master_port + admanager_spark_master = "spark://" + hostname + ":" + spark_master_port ams_ad_standalone_spark_enabled = True if (('ams-admanager-log4j' in config['configurations']) and ('content' in config['configurations']['ams-admanager-log4j'])):
