[39/51] [abbrv] ambari git commit: AMBARI-19825 : Metrics data is not getting collected for different services when AMS HTTPS is enabled. (avijayan)

2017-02-17 Thread rzang 
AMBARI-19825 : Metrics data is not getting collected for different services 
when AMS HTTPS is enabled. (avijayan)

(cherry picked from commit d2837f7864ddd0a961c1213761580576a772cedd)

Change-Id: I94b6416ce791cefb2345a99a0609536242a9c6c3


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fcd422c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fcd422c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fcd422c3

Branch: refs/heads/branch-feature-BUG-74026
Commit: fcd422c3b63c89444fb33ba646f8524ca71c9e1c
Parents: 6999527
Author: Aravindan Vijayan 
Authored: Thu Feb 2 10:19:52 2017 -0800
Committer: Zuul 
Committed: Tue Feb 7 07:11:05 2017 -0800

--
 .../metrics2/sink/flume/FlumeTimelineMetricsSink.java |  3 ++-
 .../metrics2/sink/timeline/HadoopTimelineMetricsSink.java |  6 +++---
 .../metrics2/sink/storm/StormTimelineMetricsReporter.java |  5 +
 .../server/metrics/system/impl/AmbariMetricSinkImpl.java  | 10 ++
 4 files changed, 16 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fcd422c3/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
index c1b684b..86e092a 100644
--- 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
@@ -107,13 +107,14 @@ public class FlumeTimelineMetricsSink extends 
AbstractTimelineMetricsSink implem
 // Initialize the collector write strategy
 super.init();
 
-collectorUri = constructTimelineMetricUri(protocol, 
findPreferredCollectHost(), port);
 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();
   loadTruststore(trustStorePath, trustStoreType, trustStorePwd);
 }
+collectorUri = constructTimelineMetricUri(protocol, 
findPreferredCollectHost(), port);
+
 pollFrequency = 
Long.parseLong(configuration.getProperty("collectionFrequency"));
 
 String[] metrics = 
configuration.getProperty(COUNTER_METRICS_PROPERTY).trim().split(",");

http://git-wip-us.apache.org/repos/asf/ambari/blob/fcd422c3/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 b2ca52e..1936977 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
@@ -107,15 +107,15 @@ public class HadoopTimelineMetricsSink extends 
AbstractTimelineMetricsSink imple
 if (collectorHosts.isEmpty()) {
   LOG.error("No Metric collector configured.");
 } else {
-  String preferredCollectorHost = findPreferredCollectHost();
-  collectorUri = constructTimelineMetricUri(protocol, 
preferredCollectorHost, port);
-  containerMetricsUri = constructContainerMetricUri(protocol, 
preferredCollectorHost, port);
   if (protocol.contains("https")) {
 String trustStorePath = 
conf.getString(SSL_KEYSTORE_PATH_PROPERTY).trim();
 String trustStoreType = 
conf.getString(SSL_KEYSTORE_TYPE_PROPERTY).trim();
 String trustStorePwd = 
conf.getString(SSL_KEYSTORE_PASSWORD_PROPERTY).trim();
 loadTruststore(trustStorePath, trustStoreType, trustStorePwd);
   }
+  String preferredCollectorHost = findPreferredCollectHost();
+  collectorUri = constructTimelineMetricUri(protocol, 
preferredCollectorHost, port);
+  containerMetricsUri = constructContainerMetricUri(protocol, 
preferredCollectorHost, port);
 }
 
 LOG.info("Collector

[39/50] [abbrv] ambari git commit: AMBARI-19825 : Metrics data is not getting collected for different services when AMS HTTPS is enabled. (avijayan)

2017-02-03 Thread ncole 
AMBARI-19825 : Metrics data is not getting collected for different services 
when AMS HTTPS is enabled. (avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c1b153e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c1b153e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c1b153e

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9c1b153e21f04d96f0afa806436c8e4d702be0cc
Parents: 5d4d99e
Author: Aravindan Vijayan 
Authored: Thu Feb 2 10:29:14 2017 -0800
Committer: Aravindan Vijayan 
Committed: Thu Feb 2 10:29:14 2017 -0800

--
 .../metrics2/sink/flume/FlumeTimelineMetricsSink.java |  3 ++-
 .../metrics2/sink/timeline/HadoopTimelineMetricsSink.java |  6 +++---
 .../server/metrics/system/impl/AmbariMetricSinkImpl.java  | 10 ++
 3 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9c1b153e/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
index c1b684b..86e092a 100644
--- 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
@@ -107,13 +107,14 @@ public class FlumeTimelineMetricsSink extends 
AbstractTimelineMetricsSink implem
 // Initialize the collector write strategy
 super.init();
 
-collectorUri = constructTimelineMetricUri(protocol, 
findPreferredCollectHost(), port);
 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();
   loadTruststore(trustStorePath, trustStoreType, trustStorePwd);
 }
+collectorUri = constructTimelineMetricUri(protocol, 
findPreferredCollectHost(), port);
+
 pollFrequency = 
Long.parseLong(configuration.getProperty("collectionFrequency"));
 
 String[] metrics = 
configuration.getProperty(COUNTER_METRICS_PROPERTY).trim().split(",");

http://git-wip-us.apache.org/repos/asf/ambari/blob/9c1b153e/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 7c85171..14df30c 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
@@ -107,15 +107,15 @@ public class HadoopTimelineMetricsSink extends 
AbstractTimelineMetricsSink imple
 if (collectorHosts.isEmpty()) {
   LOG.error("No Metric collector configured.");
 } else {
-  String preferredCollectorHost = findPreferredCollectHost();
-  collectorUri = constructTimelineMetricUri(protocol, 
preferredCollectorHost, port);
-  containerMetricsUri = constructContainerMetricUri(protocol, 
preferredCollectorHost, port);
   if (protocol.contains("https")) {
 String trustStorePath = 
conf.getString(SSL_KEYSTORE_PATH_PROPERTY).trim();
 String trustStoreType = 
conf.getString(SSL_KEYSTORE_TYPE_PROPERTY).trim();
 String trustStorePwd = 
conf.getString(SSL_KEYSTORE_PASSWORD_PROPERTY).trim();
 loadTruststore(trustStorePath, trustStoreType, trustStorePwd);
   }
+  String preferredCollectorHost = findPreferredCollectHost();
+  collectorUri = constructTimelineMetricUri(protocol, 
preferredCollectorHost, port);
+  containerMetricsUri = constructContainerMetricUri(protocol, 
preferredCollectorHost, port);
 }
 
 LOG.info("Collector Uri: " + collectorUri);

ambari git commit: AMBARI-19825 : Metrics data is not getting collected for different services when AMS HTTPS is enabled. (avijayan)

2017-02-02 Thread avijayan 
Repository: ambari
Updated Branches:
  refs/heads/trunk 5d4d99efb -> 9c1b153e2


AMBARI-19825 : Metrics data is not getting collected for different services 
when AMS HTTPS is enabled. (avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c1b153e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c1b153e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c1b153e

Branch: refs/heads/trunk
Commit: 9c1b153e21f04d96f0afa806436c8e4d702be0cc
Parents: 5d4d99e
Author: Aravindan Vijayan 
Authored: Thu Feb 2 10:29:14 2017 -0800
Committer: Aravindan Vijayan 
Committed: Thu Feb 2 10:29:14 2017 -0800

--
 .../metrics2/sink/flume/FlumeTimelineMetricsSink.java |  3 ++-
 .../metrics2/sink/timeline/HadoopTimelineMetricsSink.java |  6 +++---
 .../server/metrics/system/impl/AmbariMetricSinkImpl.java  | 10 ++
 3 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9c1b153e/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
index c1b684b..86e092a 100644
--- 
a/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-flume-sink/src/main/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSink.java
@@ -107,13 +107,14 @@ public class FlumeTimelineMetricsSink extends 
AbstractTimelineMetricsSink implem
 // Initialize the collector write strategy
 super.init();
 
-collectorUri = constructTimelineMetricUri(protocol, 
findPreferredCollectHost(), port);
 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();
   loadTruststore(trustStorePath, trustStoreType, trustStorePwd);
 }
+collectorUri = constructTimelineMetricUri(protocol, 
findPreferredCollectHost(), port);
+
 pollFrequency = 
Long.parseLong(configuration.getProperty("collectionFrequency"));
 
 String[] metrics = 
configuration.getProperty(COUNTER_METRICS_PROPERTY).trim().split(",");

http://git-wip-us.apache.org/repos/asf/ambari/blob/9c1b153e/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 7c85171..14df30c 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
@@ -107,15 +107,15 @@ public class HadoopTimelineMetricsSink extends 
AbstractTimelineMetricsSink imple
 if (collectorHosts.isEmpty()) {
   LOG.error("No Metric collector configured.");
 } else {
-  String preferredCollectorHost = findPreferredCollectHost();
-  collectorUri = constructTimelineMetricUri(protocol, 
preferredCollectorHost, port);
-  containerMetricsUri = constructContainerMetricUri(protocol, 
preferredCollectorHost, port);
   if (protocol.contains("https")) {
 String trustStorePath = 
conf.getString(SSL_KEYSTORE_PATH_PROPERTY).trim();
 String trustStoreType = 
conf.getString(SSL_KEYSTORE_TYPE_PROPERTY).trim();
 String trustStorePwd = 
conf.getString(SSL_KEYSTORE_PASSWORD_PROPERTY).trim();
 loadTruststore(trustStorePath, trustStoreType, trustStorePwd);
   }
+  String preferredCollectorHost = findPreferredCollectHost();
+  collectorUri = constructTimelineMetricUri(protocol, 
preferredCollectorHost, port);
+  containerMetricsUri = constructContainerMetricUri(protocol, 
preferredCollectorHost, port);
 }
 
 LOG.info("Collector Uri: " + collectorUri);