This is an automated email from the ASF dual-hosted git repository.
swagle pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 3730c03 AMBARI-22696 Whitelist execute latency from Storm Ambari
metrics
3730c03 is described below
commit 3730c03f5c0ae3a9ac510baf53a5c2666e16012e
Author: Jungtaek Lim <kabh...@gmail.com>
AuthorDate: Tue Jan 23 05:33:21 2018 +0900
AMBARI-22696 Whitelist execute latency from Storm Ambari metrics
---
.../resources/common-services/STORM/1.0.1/configuration/storm-site.xml | 2 +-
.../src/main/resources/stacks/HDP/2.5/services/stack_advisor.py | 1 +
ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git
a/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/storm-site.xml
b/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/storm-site.xml
index 558beaf..71e217e 100644
---
a/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/storm-site.xml
+++
b/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/storm-site.xml
@@ -128,7 +128,7 @@
</property>
<property>
<name>topology.metrics.consumer.register</name>
- <value>[{"class":
"org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsSink",
"parallelism.hint": 1, "whitelist": ["kafkaOffset\\..+/", "__complete-latency",
"__process-latency", "__receive\\.population$", "__sendqueue\\.population$",
"__execute-count", "__emit-count", "__ack-count", "__fail-count",
"memory/heap\\.usedBytes$", "memory/nonHeap\\.usedBytes$", "GC/.+\\.count$",
"GC/.+\\.timeMs$"]}]</value>
+ <value>[{"class":
"org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsSink",
"parallelism.hint": 1, "whitelist": ["kafkaOffset\\..+/", "__complete-latency",
"__process-latency", "__execute-latency", "__receive\\.population$",
"__sendqueue\\.population$", "__execute-count", "__emit-count", "__ack-count",
"__fail-count", "memory/heap\\.usedBytes$", "memory/nonHeap\\.usedBytes$",
"GC/.+\\.count$", "GC/.+\\.timeMs$"]}]</value>
<description></description>
<value-attributes>
<overridable>false</overridable>
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 4187dc9..bf87be2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -542,6 +542,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
'[{"class":
"org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsSink", '
'"parallelism.hint": 1, '
'"whitelist": ["kafkaOffset\\\..+/",
"__complete-latency", "__process-latency", '
+ '"__execute-latency", '
'"__receive\\\.population$",
"__sendqueue\\\.population$", "__execute-count", "__emit-count", '
'"__ack-count", "__fail-count",
"memory/heap\\\.usedBytes$", "memory/nonHeap\\\.usedBytes$", '
'"GC/.+\\\.count$", "GC/.+\\\.timeMs$"]}]')
diff --git
a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index 8f27d79..7bdfcae 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -6040,6 +6040,7 @@ class TestHDP25StackAdvisor(TestCase):
self.assertEquals(configurations['storm-site']['properties']['topology.metrics.consumer.register'],
'[{"class": "org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsSink", '
'"parallelism.hint": 1, '
'"whitelist": ["kafkaOffset\\\..+/",
"__complete-latency", "__process-latency", '
+
'"__execute-latency", '
'"__receive\\\.population$",
"__sendqueue\\\.population$", "__execute-count", "__emit-count", '
'"__ack-count", "__fail-count",
"memory/heap\\\.usedBytes$", "memory/nonHeap\\\.usedBytes$", '
'"GC/.+\\\.count$", "GC/.+\\\.timeMs$"]}]')
--
To stop receiving notification emails like this one, please contact
swa...@apache.org.
