AMBARI-21068 : Kafka broker goes down after Ambari upgrade from 2.5.0 to 2.5.1 due to missing 'kafka.timeline.metrics.instanceId' property. (Addendum Patch) (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d740384e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d740384e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d740384e Branch: refs/heads/trunk Commit: d740384e8059d9d7b12d7ae99e7423a92c4df4bf Parents: c9f705d Author: Aravindan Vijayan <[email protected]> Authored: Fri May 19 16:40:30 2017 -0700 Committer: Aravindan Vijayan <[email protected]> Committed: Fri May 19 16:40:30 2017 -0700 ---------------------------------------------------------------------- .../metrics2/sink/timeline/HadoopTimelineMetricsSink.java | 2 +- .../sink/timeline/HadoopTimelineMetricsSinkTest.java | 2 +- .../metrics2/sink/kafka/KafkaTimelineMetricsReporter.java | 4 ++-- .../metrics2/sink/storm/StormTimelineMetricsReporter.java | 6 ++++-- .../metrics2/sink/storm/StormTimelineMetricsSink.java | 2 +- .../metrics2/sink/storm/StormTimelineMetricsSink.java | 2 +- .../templates/hadoop-metrics2-accumulo.properties.j2 | 2 -- .../package/templates/hadoop-metrics2-hbase.properties.j2 | 2 -- .../package/templates/flume-metrics2.properties.j2 | 3 --- .../hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 2 -- .../hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 | 2 -- .../configuration/hadoop-metrics2.properties.xml | 2 -- .../templates/hadoop-metrics2-hivemetastore.properties.j2 | 2 -- .../templates/hadoop-metrics2-hiveserver2.properties.j2 | 2 -- .../package/templates/hadoop-metrics2-llapdaemon.j2 | 2 -- .../templates/hadoop-metrics2-llaptaskscheduler.j2 | 2 -- .../templates/hadoop-metrics2-hivemetastore.properties.j2 | 2 -- .../templates/hadoop-metrics2-hiveserver2.properties.j2 | 2 -- .../package/templates/hadoop-metrics2-llapdaemon.j2 | 2 -- .../templates/hadoop-metrics2-llaptaskscheduler.j2 | 2 -- .../KAFKA/0.10.0.3.0/configuration/kafka-broker.xml | 10 ---------- .../KAFKA/0.8.1/configuration/kafka-broker.xml | 10 ---------- .../STORM/0.9.1/package/templates/config.yaml.j2 | 3 --- .../0.9.1/package/templates/storm-metrics2.properties.j2 | 2 -- .../STORM/1.0.1.3.0/package/templates/config.yaml.j2 | 3 --- .../package/templates/storm-metrics2.properties.j2 | 2 -- .../before-START/templates/hadoop-metrics2.properties.j2 | 2 -- .../HDFS/configuration/hadoop-metrics2.properties.xml | 2 -- .../before-START/templates/hadoop-metrics2.properties.j2 | 2 -- 29 files changed, 10 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java index c235c7c..a290ced 100644 --- a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java @@ -98,7 +98,7 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple } serviceName = getServiceName(conf); - instanceId = conf.getString(INSTANCE_ID_PROPERTY); + instanceId = conf.getString(INSTANCE_ID_PROPERTY, null); setInstanceId = conf.getBoolean(SET_INSTANCE_ID_PROPERTY, false); LOG.info("Identified hostname = " + hostName + ", serviceName = " + serviceName); http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java b/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java index 4a009dc..30c5c23 100644 --- a/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java +++ b/ambari-metrics/ambari-metrics-hadoop-sink/src/test/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSinkTest.java @@ -114,7 +114,7 @@ public class HadoopTimelineMetricsSinkTest { expect(conf.getInt(eq(MAX_METRIC_ROW_CACHE_SIZE), anyInt())).andReturn(10).anyTimes(); expect(conf.getInt(eq(METRICS_SEND_INTERVAL), anyInt())).andReturn(1000).anyTimes(); expect(conf.getBoolean(eq(SET_INSTANCE_ID_PROPERTY), eq(false))).andReturn(true).anyTimes(); - expect(conf.getString(eq(INSTANCE_ID_PROPERTY))).andReturn("instanceId").anyTimes(); + expect(conf.getString(eq(INSTANCE_ID_PROPERTY), anyString())).andReturn("instanceId").anyTimes(); conf.setListDelimiter(eq(',')); expectLastCall().anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java b/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java index 76b1c15..6f5e9e0 100644 --- a/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java +++ b/ambari-metrics/ambari-metrics-kafka-sink/src/main/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporter.java @@ -181,8 +181,8 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink collectorHosts = parseHostsStringIntoCollection(props.getString(TIMELINE_HOSTS_PROPERTY, TIMELINE_DEFAULT_HOST)); metricCollectorProtocol = props.getString(TIMELINE_PROTOCOL_PROPERTY, TIMELINE_DEFAULT_PROTOCOL); - instanceId = props.getString(TIMELINE_METRICS_KAFKA_INSTANCE_ID_PROPERTY); - setInstanceId = props.getBoolean(TIMELINE_METRICS_KAFKA_SET_INSTANCE_ID_PROPERTY); + instanceId = props.getString(TIMELINE_METRICS_KAFKA_INSTANCE_ID_PROPERTY, null); + setInstanceId = props.getBoolean(TIMELINE_METRICS_KAFKA_SET_INSTANCE_ID_PROPERTY, false); hostInMemoryAggregationEnabled = props.getBoolean(TIMELINE_METRICS_KAFKA_HOST_IN_MEMORY_AGGREGATION_ENABLED_PROPERTY, false); hostInMemoryAggregationPort = props.getInt(TIMELINE_METRICS_KAFKA_HOST_IN_MEMORY_AGGREGATION_PORT_PROPERTY, 61888); http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java index 24b2c8b..d408e1a 100644 --- a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java +++ b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java @@ -140,8 +140,10 @@ public class StormTimelineMetricsReporter extends AbstractTimelineMetricsSink Integer.parseInt(cf.get(METRICS_POST_TIMEOUT_SECONDS).toString()) : DEFAULT_POST_TIMEOUT_SECONDS; applicationId = cf.get(APP_ID).toString(); - setInstanceId = Boolean.getBoolean(cf.get(SET_INSTANCE_ID_PROPERTY).toString()); - instanceId = cf.get(INSTANCE_ID_PROPERTY).toString(); + if (cf.containsKey(SET_INSTANCE_ID_PROPERTY)) { + setInstanceId = Boolean.getBoolean(cf.get(SET_INSTANCE_ID_PROPERTY).toString()); + instanceId = cf.get(INSTANCE_ID_PROPERTY).toString(); + } hostInMemoryAggregationEnabled = Boolean.valueOf(cf.get(HOST_IN_MEMORY_AGGREGATION_ENABLED_PROPERTY).toString()); hostInMemoryAggregationPort = Integer.valueOf(cf.get(HOST_IN_MEMORY_AGGREGATION_PORT_PROPERTY).toString()); http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java index c9c0538..ff72f24 100644 --- a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java @@ -136,7 +136,7 @@ public class StormTimelineMetricsSink extends AbstractTimelineMetricsSink implem protocol = configuration.getProperty(COLLECTOR_PROTOCOL, "http"); port = configuration.getProperty(COLLECTOR_PORT, "6188"); - instanceId = configuration.getProperty(INSTANCE_ID_PROPERTY); + instanceId = configuration.getProperty(INSTANCE_ID_PROPERTY, null); setInstanceId = Boolean.valueOf(configuration.getProperty(SET_INSTANCE_ID_PROPERTY, "false")); hostInMemoryAggregationEnabled = Boolean.valueOf(configuration.getProperty(HOST_IN_MEMORY_AGGREGATION_ENABLED_PROPERTY)); hostInMemoryAggregationPort = Integer.valueOf(configuration.getProperty(HOST_IN_MEMORY_AGGREGATION_PORT_PROPERTY)); http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java index 320e177..4d5a229 100644 --- a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java @@ -147,7 +147,7 @@ public class StormTimelineMetricsSink extends AbstractTimelineMetricsSink implem protocol = configuration.getProperty(COLLECTOR_PROTOCOL, "http"); port = configuration.getProperty(COLLECTOR_PORT, "6188"); - instanceId = configuration.getProperty(INSTANCE_ID_PROPERTY); + instanceId = configuration.getProperty(INSTANCE_ID_PROPERTY, null); setInstanceId = Boolean.valueOf(configuration.getProperty(SET_INSTANCE_ID_PROPERTY, "false")); hostInMemoryAggregationEnabled = Boolean.valueOf(configuration.getProperty(HOST_IN_MEMORY_AGGREGATION_ENABLED_PROPERTY)); http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/templates/hadoop-metrics2-accumulo.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/templates/hadoop-metrics2-accumulo.properties.j2 b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/templates/hadoop-metrics2-accumulo.properties.j2 index 742ea3c..e59ba11 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/templates/hadoop-metrics2-accumulo.properties.j2 +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/templates/hadoop-metrics2-accumulo.properties.j2 @@ -43,8 +43,6 @@ accumulo.sink.timeline.period={{metrics_collection_period}} accumulo.sink.timeline.sendInterval={{metrics_report_interval}}000 accumulo.sink.timeline.collector.hosts={{ams_collector_hosts}} accumulo.sink.timeline.port={{metric_collector_port}} -accumulo.sink.timeline.instanceId={{cluster_name}} -accumulo.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties accumulo.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 index bb0db4f..978b795 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 @@ -68,8 +68,6 @@ hbase.sink.timeline.collector.hosts={{ams_collector_hosts}} hbase.sink.timeline.port={{metric_collector_port}} hbase.sink.timeline.protocol={{metric_collector_protocol}} hbase.sink.timeline.serviceName-prefix=ams -hbase.sink.timeline.instanceId={{cluster_name}} -hbase.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties hbase.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2 b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2 index 28944ca..c476019 100644 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2 +++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2 @@ -26,9 +26,6 @@ sendInterval={{metrics_report_interval}}000 host_in_memory_aggregation = {{host_in_memory_aggregation}} host_in_memory_aggregation_port = {{host_in_memory_aggregation_port}} -instanceId={{cluster_name}} -set.instanceId={{set_instanceId}} - # HTTPS properties truststore.path = {{metric_truststore_path}} truststore.type = {{metric_truststore_type}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 index c8f2f13..7368ffe 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 @@ -76,8 +76,6 @@ hbase.sink.timeline.sendInterval={{metrics_report_interval}}000 hbase.sink.timeline.collector.hosts={{ams_collector_hosts}} hbase.sink.timeline.protocol={{metric_collector_protocol}} hbase.sink.timeline.port={{metric_collector_port}} -hbase.sink.timeline.instanceId={{cluster_name}} -hbase.sink.timeline.set.instanceId={{set_instanceId}} hbase.sink.timeline.host_in_memory_aggregation = {{host_in_memory_aggregation}} hbase.sink.timeline.host_in_memory_aggregation_port = {{host_in_memory_aggregation_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 index f4e25e1..f245365 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 @@ -74,8 +74,6 @@ hbase.sink.timeline.sendInterval={{metrics_report_interval}}000 hbase.sink.timeline.collector.hosts={{ams_collector_hosts}} hbase.sink.timeline.protocol={{metric_collector_protocol}} hbase.sink.timeline.port={{metric_collector_port}} -hbase.sink.timeline.instanceId={{cluster_name}} -hbase.sink.timeline.set.instanceId={{set_instanceId}} hbase.sink.timeline.host_in_memory_aggregation = {{host_in_memory_aggregation}} hbase.sink.timeline.host_in_memory_aggregation_port = {{host_in_memory_aggregation_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hadoop-metrics2.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hadoop-metrics2.properties.xml b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hadoop-metrics2.properties.xml index 4b03880..84ea231 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hadoop-metrics2.properties.xml +++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/configuration/hadoop-metrics2.properties.xml @@ -86,8 +86,6 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue *.sink.timeline.zookeeper.quorum={{zookeeper_quorum}} *.sink.timeline.protocol={{metric_collector_protocol}} *.sink.timeline.port={{metric_collector_port}} -*.sink.timeline.instanceId={{cluster_name}} -*.sink.timeline.set.instanceId={{set_instanceId}} *.sink.timeline.host_in_memory_aggregation = {{host_in_memory_aggregation}} *.sink.timeline.host_in_memory_aggregation_port = {{host_in_memory_aggregation_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 index d78a342..3093e56 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 @@ -42,8 +42,6 @@ *.sink.timeline.period={{metrics_collection_period}} *.sink.timeline.sendInterval={{metrics_report_interval}}000 *.sink.timeline.slave.host.name = {{hostname}} - *.sink.timeline.instanceId={{cluster_name}} - *.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties *.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 index 1f496ef..59a7c1b 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 @@ -42,8 +42,6 @@ *.sink.timeline.period={{metrics_collection_period}} *.sink.timeline.sendInterval={{metrics_report_interval}}000 *.sink.timeline.slave.host.name = {{hostname}} - *.sink.timeline.instanceId={{cluster_name}} - *.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties *.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2 b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2 index 01869c0..69f6071 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2 +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2 @@ -41,8 +41,6 @@ *.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink *.sink.timeline.period={{metrics_collection_period}} *.sink.timeline.sendInterval={{metrics_report_interval}}000 - *.sink.timeline.instanceId={{cluster_name}} - *.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties *.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 index 2e25c4a..c08a498 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 @@ -41,8 +41,6 @@ *.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink *.sink.timeline.period={{metrics_collection_period}} *.sink.timeline.sendInterval={{metrics_report_interval}}000 - *.sink.timeline.instanceId={{cluster_name}} - *.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties *.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 index d78a342..3093e56 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hivemetastore.properties.j2 @@ -42,8 +42,6 @@ *.sink.timeline.period={{metrics_collection_period}} *.sink.timeline.sendInterval={{metrics_report_interval}}000 *.sink.timeline.slave.host.name = {{hostname}} - *.sink.timeline.instanceId={{cluster_name}} - *.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties *.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 index 1f496ef..59a7c1b 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-hiveserver2.properties.j2 @@ -42,8 +42,6 @@ *.sink.timeline.period={{metrics_collection_period}} *.sink.timeline.sendInterval={{metrics_report_interval}}000 *.sink.timeline.slave.host.name = {{hostname}} - *.sink.timeline.instanceId={{cluster_name}} - *.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties *.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llapdaemon.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llapdaemon.j2 b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llapdaemon.j2 index 01869c0..69f6071 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llapdaemon.j2 +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llapdaemon.j2 @@ -41,8 +41,6 @@ *.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink *.sink.timeline.period={{metrics_collection_period}} *.sink.timeline.sendInterval={{metrics_report_interval}}000 - *.sink.timeline.instanceId={{cluster_name}} - *.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties *.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 index 2e25c4a..c08a498 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/templates/hadoop-metrics2-llaptaskscheduler.j2 @@ -41,8 +41,6 @@ *.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink *.sink.timeline.period={{metrics_collection_period}} *.sink.timeline.sendInterval={{metrics_report_interval}}000 - *.sink.timeline.instanceId={{cluster_name}} - *.sink.timeline.set.instanceId={{set_instanceId}} # HTTPS properties *.sink.timeline.truststore.path = {{metric_truststore_path}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/configuration/kafka-broker.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/configuration/kafka-broker.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/configuration/kafka-broker.xml index 46c14c0..1cddb89 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/configuration/kafka-broker.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/configuration/kafka-broker.xml @@ -401,16 +401,6 @@ <on-ambari-upgrade add="false"/> </property> <property> - <name>kafka.timeline.metrics.instanceId</name> - <value>{{cluster_name}}</value> - <on-ambari-upgrade add="false"/> - </property> - <property> - <name>kafka.timeline.metrics.set.instanceId</name> - <value>{{set_instanceId}}</value> - <on-ambari-upgrade add="false"/> - </property> - <property> <name>kafka.timeline.metrics.maxRowCacheSize</name> <value>10000</value> <description>Timeline metrics reporter send interval</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml index 26e7a77..39dfeba 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml @@ -407,16 +407,6 @@ <on-ambari-upgrade add="true"/> </property> <property> - <name>kafka.timeline.metrics.instanceId</name> - <value>{{cluster_name}}</value> - <on-ambari-upgrade add="true"/> - </property> - <property> - <name>kafka.timeline.metrics.set.instanceId</name> - <value>{{set_instanceId}}</value> - <on-ambari-upgrade add="true"/> - </property> - <property> <name>kafka.timeline.metrics.maxRowCacheSize</name> <value>10000</value> <description>Timeline metrics reporter send interval</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/config.yaml.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/config.yaml.j2 b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/config.yaml.j2 index 67b89c4..b2dd3c8 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/config.yaml.j2 +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/config.yaml.j2 @@ -69,7 +69,4 @@ metrics_collector: truststore.type : "{{metric_truststore_type}}" truststore.password : "{{metric_truststore_password}}" - instanceId={{cluster_name}} - set.instanceId={{set_instanceId}} - {% endif %} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm-metrics2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm-metrics2.properties.j2 b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm-metrics2.properties.j2 index 1dedffc..e7db91e 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm-metrics2.properties.j2 +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/templates/storm-metrics2.properties.j2 @@ -23,8 +23,6 @@ zookeeper.quorum={{zookeeper_quorum}} maxRowCacheSize=10000 sendInterval={{metrics_report_interval}}000 clusterReporterAppId=nimbus -instanceId={{cluster_name}} -set.instanceId={{set_instanceId}} host_in_memory_aggregation = {{host_in_memory_aggregation}} host_in_memory_aggregation_port = {{host_in_memory_aggregation_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/config.yaml.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/config.yaml.j2 b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/config.yaml.j2 index 67b89c4..b2dd3c8 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/config.yaml.j2 +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/config.yaml.j2 @@ -69,7 +69,4 @@ metrics_collector: truststore.type : "{{metric_truststore_type}}" truststore.password : "{{metric_truststore_password}}" - instanceId={{cluster_name}} - set.instanceId={{set_instanceId}} - {% endif %} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/storm-metrics2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/storm-metrics2.properties.j2 b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/storm-metrics2.properties.j2 index 1dedffc..e7db91e 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/storm-metrics2.properties.j2 +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/templates/storm-metrics2.properties.j2 @@ -23,8 +23,6 @@ zookeeper.quorum={{zookeeper_quorum}} maxRowCacheSize=10000 sendInterval={{metrics_report_interval}}000 clusterReporterAppId=nimbus -instanceId={{cluster_name}} -set.instanceId={{set_instanceId}} host_in_memory_aggregation = {{host_in_memory_aggregation}} host_in_memory_aggregation_port = {{host_in_memory_aggregation_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 index 1f8499f..2cd9aa8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 @@ -75,8 +75,6 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue *.sink.timeline.zookeeper.quorum={{zookeeper_quorum}} *.sink.timeline.protocol={{metric_collector_protocol}} *.sink.timeline.port={{metric_collector_port}} -*.sink.timeline.instanceId={{cluster_name}} -*.sink.timeline.set.instanceId={{set_instanceId}} *.sink.timeline.host_in_memory_aggregation = {{host_in_memory_aggregation}} *.sink.timeline.host_in_memory_aggregation_port = {{host_in_memory_aggregation_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/stacks/HDP/2.6/services/HDFS/configuration/hadoop-metrics2.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HDFS/configuration/hadoop-metrics2.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HDFS/configuration/hadoop-metrics2.properties.xml index 4b03880..84ea231 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HDFS/configuration/hadoop-metrics2.properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HDFS/configuration/hadoop-metrics2.properties.xml @@ -86,8 +86,6 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue *.sink.timeline.zookeeper.quorum={{zookeeper_quorum}} *.sink.timeline.protocol={{metric_collector_protocol}} *.sink.timeline.port={{metric_collector_port}} -*.sink.timeline.instanceId={{cluster_name}} -*.sink.timeline.set.instanceId={{set_instanceId}} *.sink.timeline.host_in_memory_aggregation = {{host_in_memory_aggregation}} *.sink.timeline.host_in_memory_aggregation_port = {{host_in_memory_aggregation_port}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d740384e/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/templates/hadoop-metrics2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/templates/hadoop-metrics2.properties.j2 b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/templates/hadoop-metrics2.properties.j2 index 1f8499f..2cd9aa8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/templates/hadoop-metrics2.properties.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/templates/hadoop-metrics2.properties.j2 @@ -75,8 +75,6 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue *.sink.timeline.zookeeper.quorum={{zookeeper_quorum}} *.sink.timeline.protocol={{metric_collector_protocol}} *.sink.timeline.port={{metric_collector_port}} -*.sink.timeline.instanceId={{cluster_name}} -*.sink.timeline.set.instanceId={{set_instanceId}} *.sink.timeline.host_in_memory_aggregation = {{host_in_memory_aggregation}} *.sink.timeline.host_in_memory_aggregation_port = {{host_in_memory_aggregation_port}}
