Elukey has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403123 )

Change subject: Standardize Analytics jmx agent's configurations
......................................................................


Standardize Analytics jmx agent's configurations

Gehel recently discovered that a set of default JVM metrics is
returned by default by the jmx exporter via DefaultExports.java.

Bug: T177458
Change-Id: I7f3fb7e865d8e4b33d271e8e6132af1716f0c091
---
M modules/profile/files/druid/jvm_prometheus_jmx_exporter.yaml
M modules/profile/files/hadoop/prometheus_hdfs_datanode_jmx_exporter.yaml
M modules/profile/files/hadoop/prometheus_hdfs_namenode_jmx_exporter.yaml
M modules/profile/files/hadoop/prometheus_mapreduce_history_jmx_exporter.yaml
M modules/profile/files/hadoop/prometheus_yarn_nodemanager_jmx_exporter.yaml
M modules/profile/files/hadoop/prometheus_yarn_resourcemanager_jmx_exporter.yaml
M modules/profile/files/hive/prometheus_hive_metastore_jmx_exporter.yaml
M modules/profile/files/hive/prometheus_hive_server_jmx_exporter.yaml
M modules/profile/files/oozie/prometheus_oozie_server_jmx_exporter.yaml
9 files changed, 14 insertions(+), 54 deletions(-)

Approvals:
  Elukey: Looks good to me, approved
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, but someone else must approve



diff --git a/modules/profile/files/druid/jvm_prometheus_jmx_exporter.yaml 
b/modules/profile/files/druid/jvm_prometheus_jmx_exporter.yaml
index 5532f5e..72e67cf 100644
--- a/modules/profile/files/druid/jvm_prometheus_jmx_exporter.yaml
+++ b/modules/profile/files/druid/jvm_prometheus_jmx_exporter.yaml
@@ -1,9 +1,5 @@
 ---
 lowercaseOutputLabelNames: true
 lowercaseOutputName: false
-whitelistObjectNames:
-  - 'java.lang:type=ClassLoading'
-  - 'java.lang:type=Compilation'
-  - 'java.lang:type=GarbageCollector*'
-  - 'java.lang:type=Memory'
-  - 'java.lang:type=MemoryPool*'
\ No newline at end of file
+blacklistObjectNames:
+  - '*:*'
\ No newline at end of file
diff --git 
a/modules/profile/files/hadoop/prometheus_hdfs_datanode_jmx_exporter.yaml 
b/modules/profile/files/hadoop/prometheus_hdfs_datanode_jmx_exporter.yaml
index f60acbe..3816217 100644
--- a/modules/profile/files/hadoop/prometheus_hdfs_datanode_jmx_exporter.yaml
+++ b/modules/profile/files/hadoop/prometheus_hdfs_datanode_jmx_exporter.yaml
@@ -3,9 +3,4 @@
 lowercaseOutputName: false
 whitelistObjectNames:
   - 'Hadoop:service=DataNode,name=DataNodeActivity*'
-  - 'Hadoop:service=DataNode,name=FSDatasetState*'
-  - 'java.lang:type=ClassLoading'
-  - 'java.lang:type=Compilation'
-  - 'java.lang:type=GarbageCollector*'
-  - 'java.lang:type=Memory'
-  - 'java.lang:type=MemoryPool*'
\ No newline at end of file
+  - 'Hadoop:service=DataNode,name=FSDatasetState*'
\ No newline at end of file
diff --git 
a/modules/profile/files/hadoop/prometheus_hdfs_namenode_jmx_exporter.yaml 
b/modules/profile/files/hadoop/prometheus_hdfs_namenode_jmx_exporter.yaml
index 1063174..b10fab6 100644
--- a/modules/profile/files/hadoop/prometheus_hdfs_namenode_jmx_exporter.yaml
+++ b/modules/profile/files/hadoop/prometheus_hdfs_namenode_jmx_exporter.yaml
@@ -3,9 +3,4 @@
 lowercaseOutputName: false
 whitelistObjectNames:
   - 'Hadoop:service=NameNode,name=FSNamesystem'
-  - 'Hadoop:service=NameNode,name=NameNodeActivity'
-  - 'java.lang:type=ClassLoading'
-  - 'java.lang:type=Compilation'
-  - 'java.lang:type=GarbageCollector*'
-  - 'java.lang:type=Memory'
-  - 'java.lang:type=MemoryPool*'
\ No newline at end of file
+  - 'Hadoop:service=NameNode,name=NameNodeActivity'
\ No newline at end of file
diff --git 
a/modules/profile/files/hadoop/prometheus_mapreduce_history_jmx_exporter.yaml 
b/modules/profile/files/hadoop/prometheus_mapreduce_history_jmx_exporter.yaml
index 5532f5e..72e67cf 100644
--- 
a/modules/profile/files/hadoop/prometheus_mapreduce_history_jmx_exporter.yaml
+++ 
b/modules/profile/files/hadoop/prometheus_mapreduce_history_jmx_exporter.yaml
@@ -1,9 +1,5 @@
 ---
 lowercaseOutputLabelNames: true
 lowercaseOutputName: false
-whitelistObjectNames:
-  - 'java.lang:type=ClassLoading'
-  - 'java.lang:type=Compilation'
-  - 'java.lang:type=GarbageCollector*'
-  - 'java.lang:type=Memory'
-  - 'java.lang:type=MemoryPool*'
\ No newline at end of file
+blacklistObjectNames:
+  - '*:*'
\ No newline at end of file
diff --git 
a/modules/profile/files/hadoop/prometheus_yarn_nodemanager_jmx_exporter.yaml 
b/modules/profile/files/hadoop/prometheus_yarn_nodemanager_jmx_exporter.yaml
index f1a7ace..d044eae 100644
--- a/modules/profile/files/hadoop/prometheus_yarn_nodemanager_jmx_exporter.yaml
+++ b/modules/profile/files/hadoop/prometheus_yarn_nodemanager_jmx_exporter.yaml
@@ -3,9 +3,4 @@
 lowercaseOutputName: false
 whitelistObjectNames:
   - 'Hadoop:service=NodeManager,name=NodeManagerMetrics'
-  - 'Hadoop:service=NodeManager,name=ShuffleMetrics'
-  - 'java.lang:type=ClassLoading'
-  - 'java.lang:type=Compilation'
-  - 'java.lang:type=GarbageCollector*'
-  - 'java.lang:type=Memory'
-  - 'java.lang:type=MemoryPool*'
\ No newline at end of file
+  - 'Hadoop:service=NodeManager,name=ShuffleMetrics'
\ No newline at end of file
diff --git 
a/modules/profile/files/hadoop/prometheus_yarn_resourcemanager_jmx_exporter.yaml
 
b/modules/profile/files/hadoop/prometheus_yarn_resourcemanager_jmx_exporter.yaml
index c7ea9f6..b3f9875 100644
--- 
a/modules/profile/files/hadoop/prometheus_yarn_resourcemanager_jmx_exporter.yaml
+++ 
b/modules/profile/files/hadoop/prometheus_yarn_resourcemanager_jmx_exporter.yaml
@@ -2,9 +2,4 @@
 lowercaseOutputLabelNames: true
 lowercaseOutputName: false
 whitelistObjectNames:
-  - 'Hadoop:service=ResourceManager,name=ClusterMetrics'
-  - 'java.lang:type=ClassLoading'
-  - 'java.lang:type=Compilation'
-  - 'java.lang:type=GarbageCollector*'
-  - 'java.lang:type=Memory'
-  - 'java.lang:type=MemoryPool*'
\ No newline at end of file
+  - 'Hadoop:service=ResourceManager,name=ClusterMetrics'
\ No newline at end of file
diff --git 
a/modules/profile/files/hive/prometheus_hive_metastore_jmx_exporter.yaml 
b/modules/profile/files/hive/prometheus_hive_metastore_jmx_exporter.yaml
index 5532f5e..72e67cf 100644
--- a/modules/profile/files/hive/prometheus_hive_metastore_jmx_exporter.yaml
+++ b/modules/profile/files/hive/prometheus_hive_metastore_jmx_exporter.yaml
@@ -1,9 +1,5 @@
 ---
 lowercaseOutputLabelNames: true
 lowercaseOutputName: false
-whitelistObjectNames:
-  - 'java.lang:type=ClassLoading'
-  - 'java.lang:type=Compilation'
-  - 'java.lang:type=GarbageCollector*'
-  - 'java.lang:type=Memory'
-  - 'java.lang:type=MemoryPool*'
\ No newline at end of file
+blacklistObjectNames:
+  - '*:*'
\ No newline at end of file
diff --git 
a/modules/profile/files/hive/prometheus_hive_server_jmx_exporter.yaml 
b/modules/profile/files/hive/prometheus_hive_server_jmx_exporter.yaml
index 5532f5e..72e67cf 100644
--- a/modules/profile/files/hive/prometheus_hive_server_jmx_exporter.yaml
+++ b/modules/profile/files/hive/prometheus_hive_server_jmx_exporter.yaml
@@ -1,9 +1,5 @@
 ---
 lowercaseOutputLabelNames: true
 lowercaseOutputName: false
-whitelistObjectNames:
-  - 'java.lang:type=ClassLoading'
-  - 'java.lang:type=Compilation'
-  - 'java.lang:type=GarbageCollector*'
-  - 'java.lang:type=Memory'
-  - 'java.lang:type=MemoryPool*'
\ No newline at end of file
+blacklistObjectNames:
+  - '*:*'
\ No newline at end of file
diff --git 
a/modules/profile/files/oozie/prometheus_oozie_server_jmx_exporter.yaml 
b/modules/profile/files/oozie/prometheus_oozie_server_jmx_exporter.yaml
index 5532f5e..72e67cf 100644
--- a/modules/profile/files/oozie/prometheus_oozie_server_jmx_exporter.yaml
+++ b/modules/profile/files/oozie/prometheus_oozie_server_jmx_exporter.yaml
@@ -1,9 +1,5 @@
 ---
 lowercaseOutputLabelNames: true
 lowercaseOutputName: false
-whitelistObjectNames:
-  - 'java.lang:type=ClassLoading'
-  - 'java.lang:type=Compilation'
-  - 'java.lang:type=GarbageCollector*'
-  - 'java.lang:type=Memory'
-  - 'java.lang:type=MemoryPool*'
\ No newline at end of file
+blacklistObjectNames:
+  - '*:*'
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/403123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f3fb7e865d8e4b33d271e8e6132af1716f0c091
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to