[ambari] 09/36: AMBARI-21244 Add https support to local metrics aggregator application (dsen)

[avijayan]

This is an automated email from the ASF dual-hosted git repository.

avijayan pushed a commit to branch branch-feature-AMBARI-23212
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 7e0e520f7af31cde6d0de0e92416226e30c03806
Author: Dmytro Sen 
AuthorDate: Wed Jun 21 15:49:27 2017 +0300

AMBARI-21244 Add https support to local metrics aggregator application 
(dsen)
---
 .../logfeeder/metrics/LogFeederAMSClient.java  |   5 +
 .../sink/timeline/AbstractTimelineMetricsSink.java |  13 +-
 .../AbstractTimelineMetricSinkTest.java|   5 +
 .../availability/MetricCollectorHATest.java|   5 +
 .../timeline/cache/HandleConnectExceptionTest.java |   5 +
 .../src/main/conf/flume-metrics2.properties.j2 |   8 +-
 .../sink/flume/FlumeTimelineMetricsSink.java   |  13 +-
 .../sink/timeline/HadoopTimelineMetricsSink.java   |  13 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java|   4 +
 .../ambari-metrics-host-aggregator/pom.xml |  10 ++
 .../host/aggregator/AggregatorApplication.java |  51 +++-
 .../sink/timeline/AbstractMetricPublisher.java |  12 +-
 .../sink/timeline/AggregatedMetricsPublisher.java  |   5 +
 .../sink/timeline/RawMetricsPublisher.java |   5 +
 .../src/main/python/core/aggregator.py |   6 +-
 .../src/main/python/core/config_reader.py  |   9 +-
 .../src/main/python/core/emitter.py|  42 +++---
 .../src/main/python/core/host_info.py  |   1 -
 .../src/main/python/core/stop_handler.py   |   4 +-
 .../sink/kafka/KafkaTimelineMetricsReporter.java   |  10 +-
 .../sink/storm/StormTimelineMetricsReporter.java   |  16 ++-
 .../sink/storm/StormTimelineMetricsSink.java   |  13 +-
 .../sink/storm/StormTimelineMetricsReporter.java   |  13 +-
 .../sink/storm/StormTimelineMetricsSink.java   |  13 +-
 .../metrics/system/impl/AmbariMetricSinkImpl.java  |   5 +
 .../ACCUMULO/1.6.1.2.2.0/package/scripts/params.py |   6 +
 .../hadoop-metrics2-accumulo.properties.j2 |   3 +
 .../0.1.0/configuration/ams-site.xml   |   4 +
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py|  42 --
 .../AMBARI_METRICS/0.1.0/package/scripts/params.py |   8 +-
 .../templates/hadoop-metrics2-hbase.properties.j2  | 100 ++-
 .../0.1.0/package/templates/metric_monitor.ini.j2  |   3 +
 .../FLUME/1.4.0.2.0/package/scripts/params.py  |   6 +
 .../package/templates/flume-metrics2.properties.j2 |   3 +
 .../0.96.0.2.0/package/scripts/params_linux.py |   6 +
 ...oop-metrics2-hbase.properties-GANGLIA-MASTER.j2 |   3 +
 .../hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 |   3 +
 .../0.12.0.2.0/package/scripts/params_linux.py |   6 +
 .../hadoop-metrics2-hivemetastore.properties.j2|   4 +-
 .../hadoop-metrics2-hiveserver2.properties.j2  |   3 +
 .../templates/hadoop-metrics2-llapdaemon.j2|   3 +
 .../templates/hadoop-metrics2-llaptaskscheduler.j2 |   3 +
 .../KAFKA/0.8.1/configuration/kafka-broker.xml |   5 +
 .../KAFKA/0.8.1/package/scripts/params.py  |   6 +
 .../STORM/0.9.1/package/scripts/params_linux.py|   6 +
 .../STORM/0.9.1/package/templates/config.yaml.j2   |   7 +-
 .../package/templates/storm-metrics2.properties.j2 |   3 +
 .../stack-hooks/before-START/scripts/params.py |   6 +
 .../templates/hadoop-metrics2.properties.j2|   3 +
 .../STORM/package/templates/config.yaml.j2 |  48 ---
 .../configuration/hadoop-metrics2.properties.xml   |   3 +
 .../configuration/hadoop-metrics2.properties.xml   |   5 +
 .../system/impl/TestAmbariMetricsSinkImpl.java |   5 +
 .../2.0.6/AMBARI_METRICS/test_metrics_monitor.py   | 142 +
 .../stacks/2.0.6/configs/default_ams_embedded.json |   1 +
 .../HDF/2.0/hooks/before-START/scripts/params.py   |   6 +
 .../templates/hadoop-metrics2.properties.j2|  10 +-
 .../ODPi/2.0/hooks/before-START/scripts/params.py  |  19 +++
 .../services/HIVE/package/scripts/params_linux.py  |   9 ++
 .../hadoop-metrics2-hivemetastore.properties.j2|  10 +-
 .../hadoop-metrics2-hiveserver2.properties.j2  |  10 +-
 .../templates/hadoop-metrics2-llapdaemon.j2|  11 +-
 .../templates/hadoop-metrics2-llaptaskscheduler.j2 |   9 +-
 63 files changed, 656 insertions(+), 160 deletions(-)

diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java
index ba986c7..0ccdff3 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java
@@ -100,6 +100,11 @@ public class LogFeederAMSClient extends 
AbstractTimelineMetricsSink {
   }
 
   @Override
+  protected String 

[ambari] 09/36: AMBARI-21244 Add https support to local metrics aggregator application (dsen)

[avijayan]

This is an automated email from the ASF dual-hosted git repository.

avijayan pushed a commit to branch branch-feature-AMBARI-23100
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 4561ba21b9b5b1164402d6f1e173c07862413616
Author: Dmytro Sen 
AuthorDate: Wed Jun 21 15:49:27 2017 +0300

AMBARI-21244 Add https support to local metrics aggregator application 
(dsen)
---
 .../logfeeder/metrics/LogFeederAMSClient.java  |   5 +
 .../sink/timeline/AbstractTimelineMetricsSink.java |  13 +-
 .../AbstractTimelineMetricSinkTest.java|   5 +
 .../availability/MetricCollectorHATest.java|   5 +
 .../timeline/cache/HandleConnectExceptionTest.java |   5 +
 .../src/main/conf/flume-metrics2.properties.j2 |   8 +-
 .../sink/flume/FlumeTimelineMetricsSink.java   |  13 +-
 .../sink/timeline/HadoopTimelineMetricsSink.java   |  13 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java|   4 +
 .../ambari-metrics-host-aggregator/pom.xml |  10 ++
 .../host/aggregator/AggregatorApplication.java |  51 +++-
 .../sink/timeline/AbstractMetricPublisher.java |  12 +-
 .../sink/timeline/AggregatedMetricsPublisher.java  |   5 +
 .../sink/timeline/RawMetricsPublisher.java |   5 +
 .../src/main/python/core/aggregator.py |   6 +-
 .../src/main/python/core/config_reader.py  |   9 +-
 .../src/main/python/core/emitter.py|  42 +++---
 .../src/main/python/core/host_info.py  |   1 -
 .../src/main/python/core/stop_handler.py   |   4 +-
 .../sink/kafka/KafkaTimelineMetricsReporter.java   |  10 +-
 .../sink/storm/StormTimelineMetricsReporter.java   |  16 ++-
 .../sink/storm/StormTimelineMetricsSink.java   |  13 +-
 .../sink/storm/StormTimelineMetricsReporter.java   |  13 +-
 .../sink/storm/StormTimelineMetricsSink.java   |  13 +-
 .../metrics/system/impl/AmbariMetricSinkImpl.java  |   5 +
 .../ACCUMULO/1.6.1.2.2.0/package/scripts/params.py |   6 +
 .../hadoop-metrics2-accumulo.properties.j2 |   3 +
 .../0.1.0/configuration/ams-site.xml   |   4 +
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py|  42 --
 .../AMBARI_METRICS/0.1.0/package/scripts/params.py |   8 +-
 .../templates/hadoop-metrics2-hbase.properties.j2  | 100 ++-
 .../0.1.0/package/templates/metric_monitor.ini.j2  |   3 +
 .../FLUME/1.4.0.2.0/package/scripts/params.py  |   6 +
 .../package/templates/flume-metrics2.properties.j2 |   3 +
 .../0.96.0.2.0/package/scripts/params_linux.py |   6 +
 ...oop-metrics2-hbase.properties-GANGLIA-MASTER.j2 |   3 +
 .../hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 |   3 +
 .../0.12.0.2.0/package/scripts/params_linux.py |   6 +
 .../hadoop-metrics2-hivemetastore.properties.j2|   4 +-
 .../hadoop-metrics2-hiveserver2.properties.j2  |   3 +
 .../templates/hadoop-metrics2-llapdaemon.j2|   3 +
 .../templates/hadoop-metrics2-llaptaskscheduler.j2 |   3 +
 .../KAFKA/0.8.1/configuration/kafka-broker.xml |   5 +
 .../KAFKA/0.8.1/package/scripts/params.py  |   6 +
 .../STORM/0.9.1/package/scripts/params_linux.py|   6 +
 .../STORM/0.9.1/package/templates/config.yaml.j2   |   7 +-
 .../package/templates/storm-metrics2.properties.j2 |   3 +
 .../stack-hooks/before-START/scripts/params.py |   6 +
 .../templates/hadoop-metrics2.properties.j2|   3 +
 .../STORM/package/templates/config.yaml.j2 |  48 ---
 .../configuration/hadoop-metrics2.properties.xml   |   3 +
 .../configuration/hadoop-metrics2.properties.xml   |   5 +
 .../system/impl/TestAmbariMetricsSinkImpl.java |   5 +
 .../2.0.6/AMBARI_METRICS/test_metrics_monitor.py   | 142 +
 .../stacks/2.0.6/configs/default_ams_embedded.json |   1 +
 .../HDF/2.0/hooks/before-START/scripts/params.py   |   6 +
 .../templates/hadoop-metrics2.properties.j2|  10 +-
 .../ODPi/2.0/hooks/before-START/scripts/params.py  |  19 +++
 .../services/HIVE/package/scripts/params_linux.py  |   9 ++
 .../hadoop-metrics2-hivemetastore.properties.j2|  10 +-
 .../hadoop-metrics2-hiveserver2.properties.j2  |  10 +-
 .../templates/hadoop-metrics2-llapdaemon.j2|  11 +-
 .../templates/hadoop-metrics2-llaptaskscheduler.j2 |   9 +-
 63 files changed, 656 insertions(+), 160 deletions(-)

diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java
index ba986c7..0ccdff3 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java
@@ -100,6 +100,11 @@ public class LogFeederAMSClient extends 
AbstractTimelineMetricsSink {
   }
 
   @Override
+  protected String