You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by av...@apache.org on 2016/08/17 17:57:42 UTC
[1/3] ambari git commit: AMBARI-18012 : Metrics Sink unable to
connect to zookeeper to locate collector host. (avijayan)
Repository: ambari
Updated Branches:
refs/heads/trunk 793adfe46 -> ad2da2908
AMBARI-18012 : Metrics Sink unable to connect to zookeeper to locate collector host. (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d47d382
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d47d382
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d47d382
Branch: refs/heads/trunk
Commit: 8d47d3825489e63d5e16e537257b02f8075dceab
Parents: 793adfe
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Wed Aug 17 10:55:03 2016 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Wed Aug 17 10:55:03 2016 -0700
----------------------------------------------------------------------
.../availability/MetricCollectorHAHelper.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8d47d382/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java
index 7b13362..4d0ec14 100644
--- a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java
+++ b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java
@@ -22,13 +22,12 @@ import org.apache.commons.logging.LogFactory;
import org.apache.curator.CuratorZookeeperClient;
import org.apache.curator.RetryLoop;
import org.apache.curator.RetryPolicy;
-import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.retry.RetryUntilElapsed;
import org.apache.zookeeper.ZooKeeper;
-import java.net.HttpURLConnection;
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import java.util.concurrent.Callable;
@@ -43,7 +42,7 @@ public class MetricCollectorHAHelper {
private final int sleepMsBetweenRetries;
private static final int CONNECTION_TIMEOUT = 2000;
- private static final int SESSION_TIMEOUT = 5000;
+ private static final int SESSION_TIMEOUT = 10000;
private static final String ZK_PATH = "/ambari-metrics-cluster/LIVEINSTANCES";
private static final String INSTANCE_NAME_DELIMITER = "_";
@@ -68,15 +67,15 @@ public class MetricCollectorHAHelper {
final CuratorZookeeperClient client = new CuratorZookeeperClient(zookeeperQuorum,
SESSION_TIMEOUT, CONNECTION_TIMEOUT, null, retryPolicy);
- String liveInstances = null;
+ List<String> liveInstances = null;
try {
- liveInstances = RetryLoop.callWithRetry(client, new Callable<String>() {
+ client.start();
+ liveInstances = RetryLoop.callWithRetry(client, new Callable<List<String>>() {
@Override
- public String call() throws Exception {
+ public List<String> call() throws Exception {
ZooKeeper zookeeper = client.getZooKeeper();
- byte[] data = zookeeper.getData(ZK_PATH, null, null);
- return data != null ? new String(data) : null;
+ return zookeeper.getChildren(ZK_PATH, false);
}
});
} catch (Exception e) {
@@ -86,7 +85,7 @@ public class MetricCollectorHAHelper {
// [ambari-sid-3.c.pramod-thangali.internal_12001]
if (liveInstances != null && !liveInstances.isEmpty()) {
- for (String instanceStr : liveInstances.split(",")) {
+ for (String instanceStr : liveInstances) {
collectors.add(instanceStr.substring(0, instanceStr.indexOf(INSTANCE_NAME_DELIMITER)));
}
}
[3/3] ambari git commit: AMBARI-18170 : Kafka Metrics do not show up
in AMS HA enabled cluster. (avijayan)
Posted by av...@apache.org.
AMBARI-18170 : Kafka Metrics do not show up in AMS HA enabled cluster. (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ad2da290
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ad2da290
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ad2da290
Branch: refs/heads/trunk
Commit: ad2da2908585dd094cd10782e368634bef339390
Parents: b45c535
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Wed Aug 17 10:57:02 2016 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Wed Aug 17 10:57:02 2016 -0700
----------------------------------------------------------------------
.../sink/kafka/KafkaTimelineMetricsReporter.java | 13 +++----------
.../sink/kafka/KafkaTimelineMetricsReporterTest.java | 2 +-
.../KAFKA/0.8.1/configuration/kafka-broker.xml | 4 ++--
.../KAFKA/0.8.1/package/scripts/kafka.py | 2 +-
.../KAFKA/0.8.1/package/scripts/params.py | 8 ++++++++
.../stacks/2.2/configs/ranger-admin-upgrade.json | 2 +-
.../stacks/2.2/configs/ranger-usersync-upgrade.json | 2 +-
.../app/assets/data/stacks/HDP-2.2/configurations.json | 6 +++---
8 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad2da290/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 11a1c75..9c16564 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
@@ -61,7 +61,7 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink
private static final String TIMELINE_METRICS_SEND_INTERVAL_PROPERTY = "kafka.timeline.metrics.sendInterval";
private static final String TIMELINE_METRICS_MAX_ROW_CACHE_SIZE_PROPERTY = "kafka.timeline.metrics.maxRowCacheSize";
- private static final String TIMELINE_HOST_PROPERTY = "kafka.timeline.metrics.host";
+ private static final String TIMELINE_HOSTS_PROPERTY = "kafka.timeline.metrics.hosts";
private static final String TIMELINE_PORT_PROPERTY = "kafka.timeline.metrics.port";
private static final String TIMELINE_PROTOCOL_PROPERTY = "kafka.timeline.metrics.protocol";
private static final String TIMELINE_REPORTER_ENABLED_PROPERTY = "kafka.timeline.metrics.reporter.enabled";
@@ -74,7 +74,6 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink
private volatile boolean initialized = false;
private boolean running = false;
private final Object lock = new Object();
- private String collectorUri;
private String hostname;
private String metricCollectorPort;
private String collectors;
@@ -147,17 +146,12 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink
int maxRowCacheSize = props.getInt(TIMELINE_METRICS_MAX_ROW_CACHE_SIZE_PROPERTY, MAX_RECS_PER_NAME_DEFAULT);
zookeeperQuorum = props.getString("zookeeper.connect");
- collectors = props.getString(TIMELINE_HOST_PROPERTY, TIMELINE_DEFAULT_HOST);
- metricCollectorProtocol = props.getString(TIMELINE_PROTOCOL_PROPERTY, TIMELINE_DEFAULT_PROTOCOL);
-
- String metricCollectorHost = props.getString(TIMELINE_HOST_PROPERTY, TIMELINE_DEFAULT_HOST);
metricCollectorPort = props.getString(TIMELINE_PORT_PROPERTY, TIMELINE_DEFAULT_PORT);
+ collectors = props.getString(TIMELINE_HOSTS_PROPERTY, TIMELINE_DEFAULT_HOST + ":" + metricCollectorPort);
+ metricCollectorProtocol = props.getString(TIMELINE_PROTOCOL_PROPERTY, TIMELINE_DEFAULT_PROTOCOL);
setMetricsCache(new TimelineMetricsCache(maxRowCacheSize, metricsSendInterval));
- collectorUri = constructTimelineMetricUri(metricCollectorProtocol,
- metricCollectorHost, metricCollectorPort);
-
if (metricCollectorProtocol.contains("https")) {
String trustStorePath = props.getString(SSL_KEYSTORE_PATH_PROPERTY).trim();
String trustStoreType = props.getString(SSL_KEYSTORE_TYPE_PROPERTY).trim();
@@ -181,7 +175,6 @@ public class KafkaTimelineMetricsReporter extends AbstractTimelineMetricsSink
startReporter(metricsConfig.pollingIntervalSecs());
}
if (LOG.isDebugEnabled()) {
- LOG.debug("CollectorUri = " + collectorUri);
LOG.debug("MetricsSendInterval = " + metricsSendInterval);
LOG.debug("MaxRowCacheSize = " + maxRowCacheSize);
LOG.debug("Excluded metrics prefixes = " + excludedMetricsStr);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad2da290/ambari-metrics/ambari-metrics-kafka-sink/src/test/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterTest.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-kafka-sink/src/test/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterTest.java b/ambari-metrics/ambari-metrics-kafka-sink/src/test/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterTest.java
index 9027716..c569d88 100644
--- a/ambari-metrics/ambari-metrics-kafka-sink/src/test/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterTest.java
+++ b/ambari-metrics/ambari-metrics-kafka-sink/src/test/java/org/apache/hadoop/metrics2/sink/kafka/KafkaTimelineMetricsReporterTest.java
@@ -79,7 +79,7 @@ public class KafkaTimelineMetricsReporterTest {
properties.setProperty("zookeeper.connect", "localhost:2181");
properties.setProperty("kafka.timeline.metrics.sendInterval", "5900");
properties.setProperty("kafka.timeline.metrics.maxRowCacheSize", "10000");
- properties.setProperty("kafka.timeline.metrics.host", "localhost");
+ properties.setProperty("kafka.timeline.metrics.hosts", "localhost:6188");
properties.setProperty("kafka.timeline.metrics.port", "6188");
properties.setProperty("kafka.timeline.metrics.reporter.enabled", "true");
properties.setProperty("external.kafka.metrics.exclude.prefix", "a.b.c");
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad2da290/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 f7da62c..ab4d701 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
@@ -357,8 +357,8 @@
<on-ambari-upgrade add="true"/>
</property>
<property>
- <name>kafka.timeline.metrics.host</name>
- <value>{{metric_collector_host}}</value>
+ <name>kafka.timeline.metrics.hosts</name>
+ <value>{{metric_collector_hosts}}</value>
<description>Timeline host</description>
<on-ambari-upgrade add="true"/>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad2da290/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
index ac7b0ae..9066ab5 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
@@ -99,7 +99,7 @@ def kafka(upgrade_type=None):
kafka_server_config['host.name'] = params.hostname
if params.has_metric_collector:
- kafka_server_config['kafka.timeline.metrics.host'] = params.metric_collector_host
+ kafka_server_config['kafka.timeline.metrics.hosts'] = params.metric_collector_hosts
kafka_server_config['kafka.timeline.metrics.port'] = params.metric_collector_port
kafka_server_config['kafka.timeline.metrics.protocol'] = params.metric_collector_protocol
kafka_server_config['kafka.timeline.metrics.truststore.path'] = params.metric_truststore_path
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad2da290/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
index 19f8e0f..d5451b2 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
@@ -143,6 +143,14 @@ if has_metric_collector:
else:
metric_collector_protocol = 'http'
pass
+
+ # Collector hosts
+ metric_collector_hosts = ""
+ if ams_collector_hosts:
+ for host in ams_collector_hosts:
+ metric_collector_hosts += host + ':' + metric_collector_port + ','
+ metric_collector_hosts = metric_collector_hosts[:-1]
+
# Security-related params
security_enabled = config['configurations']['cluster-env']['security_enabled']
kafka_kerberos_enabled = (('security.inter.broker.protocol' in config['configurations']['kafka-broker']) and
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad2da290/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
index cfff7df..6874db5 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
@@ -455,7 +455,7 @@
"replica.high.watermark.checkpoint.interval.ms": "5000",
"zookeeper.connect": "c6407.ambari.apache.org:2181,c6408.ambari.apache.org:2181,c6409.ambari.apache.org:2181",
"controlled.shutdown.retry.backoff.ms": "5000",
- "kafka.timeline.metrics.host": "{{metric_collector_host}}",
+ "kafka.timeline.metrics.host": "{{metric_collector_hosts}}",
"kafka.timeline.metrics.reporter.sendInterval": "5900",
"num.partitions": "1",
"log.flush.interval.messages": "10000",
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad2da290/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
index 4cda2a4..0f5d647 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
@@ -450,7 +450,7 @@
"replica.high.watermark.checkpoint.interval.ms": "5000",
"zookeeper.connect": "c6407.ambari.apache.org:2181,c6408.ambari.apache.org:2181,c6409.ambari.apache.org:2181",
"controlled.shutdown.retry.backoff.ms": "5000",
- "kafka.timeline.metrics.host": "{{metric_collector_host}}",
+ "kafka.timeline.metrics.host": "{{metric_collector_hosts}}",
"kafka.timeline.metrics.reporter.sendInterval": "5900",
"num.partitions": "1",
"log.flush.interval.messages": "10000",
http://git-wip-us.apache.org/repos/asf/ambari/blob/ad2da290/ambari-web/app/assets/data/stacks/HDP-2.2/configurations.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/stacks/HDP-2.2/configurations.json b/ambari-web/app/assets/data/stacks/HDP-2.2/configurations.json
index 85d4a9f..e0aa9eb 100644
--- a/ambari-web/app/assets/data/stacks/HDP-2.2/configurations.json
+++ b/ambari-web/app/assets/data/stacks/HDP-2.2/configurations.json
@@ -8800,13 +8800,13 @@
}
},
{
- "href" : "http://c6401:8080/api/v1/stacks/HDP/versions/2.2/services/KAFKA/configurations/kafka.timeline.metrics.host",
+ "href" : "http://c6401:8080/api/v1/stacks/HDP/versions/2.2/services/KAFKA/configurations/kafka.timeline.metrics.hosts",
"StackConfigurations" : {
"final" : "false",
"property_description" : "Timeline host",
- "property_name" : "kafka.timeline.metrics.host",
+ "property_name" : "kafka.timeline.metrics.hosts",
"property_type" : [ ],
- "property_value" : "{{metric_collector_host}}",
+ "property_value" : "{{metric_collector_hosts}}",
"service_name" : "KAFKA",
"stack_name" : "HDP",
"stack_version" : "2.2",
[2/3] ambari git commit: AMBARI-18171 : AMS, Accumulo,
Hive metrics do not show up in AMS HA clusters (avijayan)
Posted by av...@apache.org.
AMBARI-18171 : AMS, Accumulo, Hive metrics do not show up in AMS HA clusters (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b45c5359
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b45c5359
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b45c5359
Branch: refs/heads/trunk
Commit: b45c5359ebdd6d2738a84f0ead2bad4224401a3b
Parents: 8d47d38
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Wed Aug 17 10:55:13 2016 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Wed Aug 17 10:55:13 2016 -0700
----------------------------------------------------------------------
.../package/templates/hadoop-metrics2-accumulo.properties.j2 | 2 +-
.../0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 | 2 +-
.../package/templates/hadoop-metrics2-hivemetastore.properties.j2 | 2 +-
.../package/templates/hadoop-metrics2-hiveserver2.properties.j2 | 2 +-
.../0.12.0.2.0/package/templates/hadoop-metrics2-llapdaemon.j2 | 2 +-
.../package/templates/hadoop-metrics2-llaptaskscheduler.j2 | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b45c5359/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 c2c12a5..3cd535e 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
@@ -35,7 +35,7 @@ rpc.collector={{metric_collector_host}}:{{metric_collector_port}}
accumulo.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
accumulo.sink.timeline.period={{metrics_collection_period}}
accumulo.sink.timeline.sendInterval={{metrics_report_interval}}000
-accumulo.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}}
+accumulo.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}
# HTTPS properties
accumulo.sink.timeline.truststore.path = {{metric_truststore_path}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b45c5359/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 8d4a806..586cd47 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
@@ -55,7 +55,7 @@ rpc.collector={{metric_collector_host}}:{{metric_collector_port}}
hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
hbase.sink.timeline.period={{metrics_collection_period}}
hbase.sink.timeline.sendInterval={{metrics_report_interval}}000
-hbase.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}}
+hbase.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}
hbase.sink.timeline.serviceName-prefix=ams
# HTTPS properties
http://git-wip-us.apache.org/repos/asf/ambari/blob/b45c5359/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 e4d88bc..88be81b 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
@@ -48,7 +48,7 @@
*.sink.timeline.truststore.type = {{metric_truststore_type}}
*.sink.timeline.truststore.password = {{metric_truststore_password}}
- hivemetastore.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}}
+ hivemetastore.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}
{% endif %}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b45c5359/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 b5c4891..3d71867 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
@@ -48,7 +48,7 @@
*.sink.timeline.truststore.type = {{metric_truststore_type}}
*.sink.timeline.truststore.password = {{metric_truststore_password}}
- hiveserver2.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}}
+ hiveserver2.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}
{% endif %}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b45c5359/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 1d75ccf..ba44af5 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
@@ -47,6 +47,6 @@
*.sink.timeline.truststore.type = {{metric_truststore_type}}
*.sink.timeline.truststore.password = {{metric_truststore_password}}
- llapdaemon.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}}
+ llapdaemon.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}
{% endif %}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/b45c5359/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 5ab787c..77f128b 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
@@ -47,6 +47,6 @@
*.sink.timeline.truststore.type = {{metric_truststore_type}}
*.sink.timeline.truststore.password = {{metric_truststore_password}}
- llaptaskscheduler.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}}
+ llaptaskscheduler.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}
{% endif %}
\ No newline at end of file