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 2017/04/05 17:57:13 UTC
ambari git commit: AMBARI-20667 : Storm metrics sink can't connect
Ambari metrics collector. (Jungtaek Lim via avijayan)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 c924df606 -> 4bb66330c
AMBARI-20667 : Storm metrics sink can't connect Ambari metrics collector. (Jungtaek Lim via avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4bb66330
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4bb66330
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4bb66330
Branch: refs/heads/branch-2.5
Commit: 4bb66330cd494813d2fd32e5df3afca1ff5da2a0
Parents: c924df6
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Wed Apr 5 10:55:45 2017 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Wed Apr 5 10:55:45 2017 -0700
----------------------------------------------------------------------
.../hadoop/metrics2/sink/storm/StormTimelineMetricsSink.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4bb66330/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 c70fff7..f58f549 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
@@ -71,7 +71,7 @@ public class StormTimelineMetricsSink extends AbstractTimelineMetricsSink implem
@Override
protected String getCollectorUri(String host) {
- return collectorUri;
+ return constructTimelineMetricUri(protocol, host, port);
}
@Override
@@ -137,7 +137,7 @@ public class StormTimelineMetricsSink extends AbstractTimelineMetricsSink implem
// Initialize the collector write strategy
super.init();
- if (protocol.toLowerCase().startsWith("https://")) {
+ if (protocol.contains("https")) {
String trustStorePath = configuration.getProperty(SSL_KEYSTORE_PATH_PROPERTY).trim();
String trustStoreType = configuration.getProperty(SSL_KEYSTORE_TYPE_PROPERTY).trim();
String trustStorePwd = configuration.getProperty(SSL_KEYSTORE_PASSWORD_PROPERTY).trim();
@@ -328,7 +328,7 @@ public class StormTimelineMetricsSink extends AbstractTimelineMetricsSink implem
}
private TimelineMetric createTimelineMetric(long currentTimeMillis, String hostName,
- String attributeName, Double attributeValue) {
+ String attributeName, Double attributeValue) {
TimelineMetric timelineMetric = new TimelineMetric();
timelineMetric.setMetricName(attributeName);
timelineMetric.setHostName(hostName);