diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml b/extensions-contrib/ambari-metrics-emitter/pom.xml index 27b4b673c5a..7e48addabdf 100644 --- a/extensions-contrib/ambari-metrics-emitter/pom.xml +++ b/extensions-contrib/ambari-metrics-emitter/pom.xml @@ -51,7 +51,7 @@ org.apache.ambari ambari-metrics-common - 2.6.1.0.0 + 2.7.0.0.0 org.codehaus.jackson diff --git a/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java index 6b4bbd5e5be..905b6cffc01 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java +++ b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java @@ -185,6 +185,24 @@ public class AmbariMetricsEmitter extends AbstractTimelineMetricsSink implements return config.getHostname(); } + @Override + protected boolean isHostInMemoryAggregationEnabled() + { + return false; + } + + @Override + protected int getHostInMemoryAggregationPort() + { + return 0; // since host in-memory aggregation is disabled, this return value is unimportant + } + + @Override + protected String getHostInMemoryAggregationProtocol() + { + return ""; // since host in-memory aggregation is disabled, this return value is unimportant + } + private class ConsumerRunnable implements Runnable { @Override diff --git a/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterTest.java b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterTest.java index 99035544690..9a01413b67c 100644 --- a/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterTest.java +++ b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterTest.java @@ -66,5 +66,9 @@ public class AmbariMetricsEmitterTest Assert.assertEquals("hostname", emitter.getHostname()); Assert.assertNull(emitter.getZookeeperQuorum()); Assert.assertEquals(Collections.singleton("hostname"), emitter.getConfiguredCollectorHosts()); + + Assert.assertFalse(emitter.isHostInMemoryAggregationEnabled()); + Assert.assertEquals(0, emitter.getHostInMemoryAggregationPort()); + Assert.assertEquals("", emitter.getHostInMemoryAggregationProtocol()); } } diff --git a/owasp-dependency-check-suppressions.xml b/owasp-dependency-check-suppressions.xml index 304606e6d27..998e5c6f85a 100644 --- a/owasp-dependency-check-suppressions.xml +++ b/owasp-dependency-check-suppressions.xml @@ -147,7 +147,7 @@ CVE-2019-17195 - + @@ -156,6 +156,28 @@ CVE-2018-1320 CVE-2019-0205 + + + + ^pkg:maven/org\.yaml/snakeyaml@1.6$ + CVE-2017-18640 + + + + ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-annotations@2.4.0$ + 10 + + + + ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core@2.4.0$ + 10 + - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@2.9.10$ - 10 + ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-.*@2.9.10$ + 10 ^pkg:maven/log4j/log4j@1.2.17$ CVE-2019-17571 + + + + ^pkg:maven/io\.netty/netty@3.10.5.Final$ + CVE-2019-16869 + CVE-2019-20444 + CVE-2019-20445 + + + + + ^pkg:maven/org\.apache\.hadoop/hadoop\-annotations@.*$ + CVE-2015-1776 + CVE-2016-3086 + CVE-2016-5393 + CVE-2016-6811 + CVE-2017-3162 + CVE-2018-11768 + CVE-2018-1296 + CVE-2018-8009 + CVE-2018-8029 +