http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml index 66286b3..1970113 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml @@ -64,6 +64,7 @@ <config-type>ranger-kafka-security</config-type> <config-type>zookeeper-env</config-type> <config-type>zoo.cfg</config-type> + <config-type>ams-ssl-client</config-type> </configuration-dependencies> <restartRequiredAfterChange>true</restartRequiredAfterChange> </service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py index 1c01174..830d0ce 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py @@ -74,6 +74,10 @@ def kafka(upgrade_type=None): if params.has_metric_collector: kafka_server_config['kafka.timeline.metrics.host'] = params.metric_collector_host 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 + kafka_server_config['kafka.timeline.metrics.truststore.type'] = params.metric_truststore_type + kafka_server_config['kafka.timeline.metrics.truststore.password'] = params.metric_truststore_password kafka_data_dir = kafka_server_config['log.dirs'] kafka_data_dirs = filter(None, kafka_data_dir.split(",")) http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py index da76952..47af240 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py @@ -106,6 +106,10 @@ else: metric_collector_host = "" metric_collector_port = "" +metric_collector_protocol = "" +metric_truststore_path= default("/configurations/ams-ssl-client/ssl.client.truststore.location", "") +metric_truststore_type= default("/configurations/ams-ssl-client/ssl.client.truststore.type", "") +metric_truststore_password= default("/configurations/ams-ssl-client/ssl.client.truststore.password", "") ams_collector_hosts = default("/clusterHostInfo/metrics_collector_hosts", []) has_metric_collector = not len(ams_collector_hosts) == 0 @@ -125,6 +129,10 @@ if has_metric_collector: metric_collector_port = metric_collector_web_address.split(':')[1] else: metric_collector_port = '6188' + if default("/configurations/ams-site/timeline.metrics.service.http.policy", "HTTP_ONLY") == "HTTPS_ONLY": + metric_collector_protocol = 'https' + else: + metric_collector_protocol = 'http' pass # Security-related params security_enabled = config['configurations']['cluster-env']['security_enabled'] @@ -274,4 +282,4 @@ HdfsResource = functools.partial( principal_name = hdfs_principal_name, hdfs_site = hdfs_site, default_fs = default_fs -) \ No newline at end of file +) http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml index 1468a2f..804374a 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metainfo.xml @@ -134,6 +134,7 @@ <config-type>ranger-admin-site</config-type> <config-type>zookeeper-env</config-type> <config-type>zoo.cfg</config-type> + <config-type>ams-ssl-client</config-type> </configuration-dependencies> <quickLinksConfigurations> <quickLinksConfiguration> http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py index 38d1951..25da2a1 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py @@ -165,7 +165,14 @@ if has_metric_collector: metric_collector_report_interval = 60 metric_collector_app_id = "nimbus" - + if default("/configurations/ams-site/timeline.metrics.service.http.policy", "HTTP_ONLY") == "HTTPS_ONLY": + metric_collector_protocol = 'https' + else: + metric_collector_protocol = 'http' + metric_truststore_path= default("/configurations/ams-ssl-client/ssl.client.truststore.location", "") + metric_truststore_type= default("/configurations/ams-ssl-client/ssl.client.truststore.type", "") + metric_truststore_password= default("/configurations/ams-ssl-client/ssl.client.truststore.password", "") + pass metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60) metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10) metric_collector_sink_jar = "/usr/lib/storm/lib/ambari-metrics-storm-sink*.jar" @@ -296,4 +303,4 @@ HdfsResource = functools.partial( principal_name = hdfs_principal_name, hdfs_site = hdfs_site, default_fs = default_fs -) \ No newline at end of file +) http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2 b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2 index 01c61bf..2c09bc3 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2 +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/config.yaml.j2 @@ -57,8 +57,12 @@ enableMetricsSink: True metrics_collector: reportInterval: {{metric_collector_report_interval}} - host: "{{metric_collector_host}}" - port: {{metric_collector_port}} + collector: "{{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}}" appId: "{{metric_collector_app_id}}" + # HTTPS settings + truststore.path : "{{metric_truststore_path}}" + truststore.type : "{{metric_truststore_type}}" + truststore.password : "{{metric_truststore_password}}" + {% endif %} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2 b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2 index a5ee7a9..9acf173 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2 +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2 @@ -16,7 +16,11 @@ # limitations under the License. #} -collector={{metric_collector_host}} -port={{metric_collector_port}} +collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} maxRowCacheSize=10000 -sendInterval={{metrics_report_interval}}000 \ No newline at end of file +sendInterval={{metrics_report_interval}}000 + +# HTTPS properties +truststore.path = {{metric_truststore_path}} +truststore.type = {{metric_truststore_type}} +truststore.password = {{metric_truststore_password}} http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml index 969c2a7..41e19a3 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml @@ -150,6 +150,7 @@ <config-type>core-site</config-type> <config-type>mapred-site</config-type> <config-type>yarn-log4j</config-type> + <config-type>ams-ssl-client</config-type> </configuration-dependencies> <widgetsFileName>YARN_widgets.json</widgetsFileName> <metricsFileName>YARN_metrics.json</metricsFileName> @@ -259,6 +260,7 @@ <config-type>ranger-yarn-audit</config-type> <config-type>ranger-yarn-policymgr-ssl</config-type> <config-type>ranger-yarn-security</config-type> + <config-type>ams-ssl-client</config-type> </configuration-dependencies> <restartRequiredAfterRackChange>true</restartRequiredAfterRackChange> <widgetsFileName>MAPREDUCE2_widgets.json</widgetsFileName> http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py index b588f86..2a9d7c5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py @@ -118,6 +118,14 @@ if has_metric_collector: metric_collector_port = metric_collector_web_address.split(':')[1] else: metric_collector_port = '6188' + if default("/configurations/ams-site/timeline.metrics.service.http.policy", "HTTP_ONLY") == "HTTPS_ONLY": + metric_collector_protocol = 'https' + else: + metric_collector_protocol = 'http' + metric_truststore_path= default("/configurations/ams-ssl-client/ssl.client.truststore.location", "") + metric_truststore_type= default("/configurations/ams-ssl-client/ssl.client.truststore.type", "") + metric_truststore_password= default("/configurations/ams-ssl-client/ssl.client.truststore.password", "") + pass metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60) metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10) http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/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 8e729a4..f9c2164 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 @@ -73,16 +73,21 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue *.sink.timeline.sendInterval={{metrics_report_interval}}000 *.sink.timeline.slave.host.name = {{hostname}} -datanode.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -namenode.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -resourcemanager.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -nodemanager.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -historyserver.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -journalnode.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -nimbus.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -supervisor.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -maptask.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -reducetask.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} +# HTTPS properties +*.sink.timeline.truststore.path = {{metric_truststore_path}} +*.sink.timeline.truststore.type = {{metric_truststore_type}} +*.sink.timeline.truststore.password = {{metric_truststore_password}} + +datanode.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +namenode.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +resourcemanager.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +nodemanager.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +historyserver.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +journalnode.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +nimbus.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +supervisor.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +maptask.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +reducetask.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} resourcemanager.sink.timeline.tagsForPrefix.yarn=Queue http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java index 58bc47e..92a7ef5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java @@ -29,12 +29,12 @@ import org.junit.Test; public class ComponentSSLConfigurationTest { public static ComponentSSLConfiguration getConfiguration(String path, - String pass, String type, boolean gangliaSSL) { + String pass, String type, boolean isSslEnabled) { Properties ambariProperties = new Properties(); ambariProperties.setProperty(Configuration.SSL_TRUSTSTORE_PATH_KEY, path); ambariProperties.setProperty(Configuration.SSL_TRUSTSTORE_PASSWORD_KEY, pass); ambariProperties.setProperty(Configuration.SSL_TRUSTSTORE_TYPE_KEY, type); - ambariProperties.setProperty(Configuration.GANGLIA_HTTPS_KEY, Boolean.toString(gangliaSSL)); + ambariProperties.setProperty(Configuration.AMRABI_METRICS_HTTPS_ENABLED_KEY, Boolean.toString(isSslEnabled)); Configuration configuration = new TestConfiguration(ambariProperties); @@ -70,7 +70,7 @@ public class ComponentSSLConfigurationTest { public void testIsGangliaSSL() throws Exception { ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath", "tspass", "tstype", true); - Assert.assertTrue(sslConfiguration.isGangliaSSL()); + Assert.assertTrue(sslConfiguration.isHttpsEnabled()); } private static class TestConfiguration extends Configuration { http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java index b513ba5..8611e68 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java @@ -220,7 +220,7 @@ public class GangliaPropertyProviderTest { Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); - String expected = (configuration.isGangliaSSL() ? "https" : "http") + + String expected = (configuration.isHttpsEnabled() ? "https" : "http") + "://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPDataNode%2CHDPSlaves&h=domU-12-31-39-0E-34-E1.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1"; Assert.assertEquals(expected, streamProvider.getLastSpec()); @@ -269,7 +269,7 @@ public class GangliaPropertyProviderTest { URIBuilder expectedUri = new URIBuilder(); - expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http")); + expectedUri.setScheme((configuration.isHttpsEnabled() ? "https" : "http")); expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal"); expectedUri.setPath("/cgi-bin/rrd.py"); expectedUri.setParameter("c", "HDPTaskTracker,HDPSlaves"); @@ -418,7 +418,7 @@ public class GangliaPropertyProviderTest { URIBuilder uriBuilder = new URIBuilder(); - uriBuilder.setScheme((configuration.isGangliaSSL() ? "https" : "http")); + uriBuilder.setScheme((configuration.isHttpsEnabled() ? "https" : "http")); uriBuilder.setHost("domU-12-31-39-0E-34-E1.compute-1.internal"); uriBuilder.setPath("/cgi-bin/rrd.py"); uriBuilder.setParameter("c", "HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPFlumeServer,HDPSlaves,HDPHistoryServer,HDPJournalNode,HDPTaskTracker,HDPHBaseRegionServer,HDPNameNode"); @@ -435,7 +435,7 @@ public class GangliaPropertyProviderTest { "HDPSlaves", "HDPHistoryServer", "HDPJournalNode", "HDPTaskTracker", "HDPHBaseRegionServer", "HDPNameNode"}); List<String> hosts = Arrays.asList(new String[]{"domU-12-31-39-0E-34-E3.compute-1.internal", "domU-12-31-39-0E-34-E1.compute-1.internal", "domU-12-31-39-0E-34-E2.compute-1.internal"}); - int httpsVariation = configuration.isGangliaSSL() ? 1 : 0; + int httpsVariation = configuration.isHttpsEnabled() ? 1 : 0; Assert.assertEquals(expected.substring(0, 66 + httpsVariation), streamProvider.getLastSpec().substring(0, 66 + httpsVariation)); Assert.assertTrue(CollectionPresentationUtils.isStringPermutationOfCollection(streamProvider.getLastSpec().substring(66 + httpsVariation, 236 + httpsVariation), components, "%2C", 0, 0)); @@ -487,7 +487,7 @@ public class GangliaPropertyProviderTest { URIBuilder expectedUri = new URIBuilder(); - expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http")); + expectedUri.setScheme((configuration.isHttpsEnabled() ? "https" : "http")); expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal"); expectedUri.setPath("/cgi-bin/rrd.py"); expectedUri.setParameter("c", "HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPFlumeServer,HDPSlaves,HDPHistoryServer,HDPJournalNode,HDPTaskTracker,HDPHBaseRegionServer,HDPNameNode"); @@ -543,7 +543,7 @@ public class GangliaPropertyProviderTest { URIBuilder expectedUri = new URIBuilder(); - expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http")); + expectedUri.setScheme((configuration.isHttpsEnabled() ? "https" : "http")); expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal"); expectedUri.setPath("/cgi-bin/rrd.py"); expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves"); @@ -606,7 +606,7 @@ public class GangliaPropertyProviderTest { URIBuilder expectedUri = new URIBuilder(); - expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http")); + expectedUri.setScheme((configuration.isHttpsEnabled() ? "https" : "http")); expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal"); expectedUri.setPath("/cgi-bin/rrd.py"); expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves"); @@ -653,12 +653,12 @@ public class GangliaPropertyProviderTest { Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); - String expected = (configuration.isGangliaSSL() ? "https" : "http") + + String expected = (configuration.isHttpsEnabled() ? "https" : "http") + "://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPFlumeServer%2CHDPSlaves&h=ip-10-39-113-33.ec2.internal&m="; // Depends on hashing, string representation can be different List<String> components = Arrays.asList(new String[]{"HDPFlumeServer", "HDPSlaves"}); - int httpsVariation = configuration.isGangliaSSL() ? 1 : 0; + int httpsVariation = configuration.isHttpsEnabled() ? 1 : 0; Assert.assertEquals(expected.substring(0, 66 + httpsVariation), streamProvider.getLastSpec().substring(0, 66 + httpsVariation)); Assert.assertTrue(CollectionPresentationUtils.isStringPermutationOfCollection(streamProvider.getLastSpec().substring(66 + httpsVariation, 92 + httpsVariation), components, "%2C", 0, 0)); @@ -704,7 +704,7 @@ public class GangliaPropertyProviderTest { URIBuilder expectedUri = new URIBuilder(); - expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http")); + expectedUri.setScheme((configuration.isHttpsEnabled() ? "https" : "http")); expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal"); expectedUri.setPath("/cgi-bin/rrd.py"); expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves"); @@ -762,7 +762,7 @@ public class GangliaPropertyProviderTest { URIBuilder expectedUri = new URIBuilder(); - expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http")); + expectedUri.setScheme((configuration.isHttpsEnabled() ? "https" : "http")); expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal"); expectedUri.setPath("/cgi-bin/rrd.py"); expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves"); @@ -821,7 +821,7 @@ public class GangliaPropertyProviderTest { URIBuilder expectedUri = new URIBuilder(); - expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http")); + expectedUri.setScheme((configuration.isHttpsEnabled() ? "https" : "http")); expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal"); expectedUri.setPath("/cgi-bin/rrd.py"); expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves"); @@ -880,7 +880,7 @@ public class GangliaPropertyProviderTest { URIBuilder expectedUri = new URIBuilder(); - expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http")); + expectedUri.setScheme((configuration.isHttpsEnabled() ? "https" : "http")); expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal"); expectedUri.setPath("/cgi-bin/rrd.py"); expectedUri.setParameter("c", "HDPFlumeServer,HDPSlaves"); http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProviderTest.java index 0f01b24..2ec9e4f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaReportPropertyProviderTest.java @@ -95,7 +95,7 @@ public class GangliaReportPropertyProviderTest { Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); - String expected = (configuration.isGangliaSSL() ? "https" : "http") + "://domU-12-31-39-0E-34-E1.compute-1.internal/ganglia/graph.php?g=load_report&json=1"; + String expected = (configuration.isHttpsEnabled() ? "https" : "http") + "://domU-12-31-39-0E-34-E1.compute-1.internal/ganglia/graph.php?g=load_report&json=1"; Assert.assertEquals(expected, streamProvider.getLastSpec()); Assert.assertEquals(2, PropertyHelper.getProperties(resource).size()); http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java index 1394081..3adf9f7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java @@ -215,7 +215,7 @@ public class AMSPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "cpu_user"); uriBuilder.addParameter("hostname", "h1"); uriBuilder.addParameter("appId", "HOST"); @@ -264,7 +264,7 @@ public class AMSPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(res); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "cpu_user"); uriBuilder.addParameter("hostname", "h1"); uriBuilder.addParameter("appId", "HOST"); @@ -309,12 +309,12 @@ public class AMSPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "cpu_user,mem_free"); uriBuilder.addParameter("hostname", "h1"); uriBuilder.addParameter("appId", "HOST"); - URIBuilder uriBuilder2 = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder2 = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder2.addParameter("metricNames", "mem_free,cpu_user"); uriBuilder2.addParameter("hostname", "h1"); uriBuilder2.addParameter("appId", "HOST"); @@ -367,14 +367,14 @@ public class AMSPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder1 = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder1 = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder1.addParameter("metricNames", "cpu_user,mem_free"); uriBuilder1.addParameter("hostname", "h1"); uriBuilder1.addParameter("appId", "HOST"); uriBuilder1.addParameter("startTime", "1416445244701"); uriBuilder1.addParameter("endTime", "1416448936564"); - URIBuilder uriBuilder2 = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder2 = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder2.addParameter("metricNames", "mem_free,cpu_user"); uriBuilder2.addParameter("hostname", "h1"); uriBuilder2.addParameter("appId", "HOST"); @@ -435,7 +435,7 @@ public class AMSPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "yarn.QueueMetrics.Queue=root.AvailableMB"); uriBuilder.addParameter("appId", "RESOURCEMANAGER"); uriBuilder.addParameter("startTime", "1416528759233"); @@ -484,7 +484,7 @@ public class AMSPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "rpc.rpc.RpcQueueTimeAvgTime"); uriBuilder.addParameter("appId", "NAMENODE"); uriBuilder.addParameter("startTime", "1416528759233"); @@ -558,7 +558,7 @@ public class AMSPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "regionserver.Server.totalRequestCount"); uriBuilder.addParameter("appId", "AMS-HBASE"); uriBuilder.addParameter("startTime", "1421694000"); @@ -631,7 +631,7 @@ public class AMSPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "rpc.rpc.NumOpenConnections._sum"); uriBuilder.addParameter("appId", "HBASE"); uriBuilder.addParameter("startTime", "1429824611300"); @@ -675,7 +675,7 @@ public class AMSPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "cpu_user"); uriBuilder.addParameter("hostname", "h1"); uriBuilder.addParameter("appId", "HOST"); @@ -771,7 +771,7 @@ public class AMSPropertyProviderTest { Assert.assertNotNull(hostMetricSpec); Assert.assertNotNull(hostComponentMetricsSpec); // Verify calls - URIBuilder uriBuilder1 = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder1 = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder1.addParameter("metricNames", "dfs.datanode.BlocksReplicated"); uriBuilder1.addParameter("hostname", "h1"); uriBuilder1.addParameter("appId", "DATANODE"); @@ -779,7 +779,7 @@ public class AMSPropertyProviderTest { uriBuilder1.addParameter("endTime", "1416448936464"); Assert.assertEquals(uriBuilder1.toString(), hostComponentMetricsSpec); - URIBuilder uriBuilder2 = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder2 = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder2.addParameter("metricNames", "cpu_user"); uriBuilder2.addParameter("hostname", "h1"); uriBuilder2.addParameter("appId", "HOST"); @@ -904,7 +904,7 @@ public class AMSPropertyProviderTest { Set<String> specs = streamProvider.getAllSpecs(); Assert.assertEquals(2, specs.size()); - URIBuilder uriBuilder1 = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder1 = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); Number[][] val; for (String spec : specs) { @@ -958,7 +958,7 @@ public class AMSPropertyProviderTest { @Override public String getCollectorPort(String clusterName, MetricsService service) throws SystemException { - return "8188"; + return "6188"; } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProviderTest.java index 1a3afbc..b96d45a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProviderTest.java @@ -93,7 +93,7 @@ public class AMSReportPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "cpu_user"); uriBuilder.addParameter("appId", "HOST"); uriBuilder.addParameter("startTime", "1416445244800"); @@ -136,7 +136,7 @@ public class AMSReportPropertyProviderTest { Resource res = resources.iterator().next(); Map<String, Object> properties = PropertyHelper.getProperties(resources.iterator().next()); Assert.assertNotNull(properties); - URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 8188); + URIBuilder uriBuilder = AMSPropertyProvider.getAMSUriBuilder("localhost", 6188, false); uriBuilder.addParameter("metricNames", "cpu_user._sum"); uriBuilder.addParameter("appId", "HOST"); uriBuilder.addParameter("startTime", "1432033257812"); http://git-wip-us.apache.org/repos/asf/ambari/blob/7e75e52a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py index 1c83bb7..96e2286 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py +++ b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py @@ -131,6 +131,14 @@ class TestMetricsCollector(RMFTestCase): configurations = self.getConfig()['configurations']['ams-site'], configuration_attributes = self.getConfig()['configuration_attributes']['ams-hbase-site'] ) + + self.assertResourceCalled('XmlConfig', 'ssl-server.xml', + owner = 'ams', + group = 'hadoop', + conf_dir = '/etc/ambari-metrics-collector/conf', + configurations = self.getConfig()['configurations']['ams-ssl-server'], + configuration_attributes = self.getConfig()['configuration_attributes']['ams-ssl-server'] + ) merged_ams_hbase_site = {} merged_ams_hbase_site.update(self.getConfig()['configurations']['ams-hbase-site']) merged_ams_hbase_site['phoenix.query.maxGlobalMemoryPercentage'] = '25'
