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

Change subject: profile::hadoop::monitoring: add explicit jmx whitelist
......................................................................


profile::hadoop::monitoring: add explicit jmx whitelist

Bug: T177458
Change-Id: Id96c27e7d3ce582052645a14d9413591dd67ab1c
---
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
8 files changed, 61 insertions(+), 10 deletions(-)

Approvals:
  Elukey: Looks good to me, approved
  jenkins-bot: Verified



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 2408036..f60acbe 100644
--- a/modules/profile/files/hadoop/prometheus_hdfs_datanode_jmx_exporter.yaml
+++ b/modules/profile/files/hadoop/prometheus_hdfs_datanode_jmx_exporter.yaml
@@ -1,5 +1,11 @@
 ---
 lowercaseOutputLabelNames: true
 lowercaseOutputName: false
-blacklistObjectNames:
-  - 'Hadoop:service=DataNode,name=DataNodeInfo'
\ No newline at end of file
+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
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 73530b2..1063174 100644
--- a/modules/profile/files/hadoop/prometheus_hdfs_namenode_jmx_exporter.yaml
+++ b/modules/profile/files/hadoop/prometheus_hdfs_namenode_jmx_exporter.yaml
@@ -1,3 +1,11 @@
 ---
 lowercaseOutputLabelNames: true
-lowercaseOutputName: false
\ No newline at end of file
+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
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 73530b2..5532f5e 100644
--- 
a/modules/profile/files/hadoop/prometheus_mapreduce_history_jmx_exporter.yaml
+++ 
b/modules/profile/files/hadoop/prometheus_mapreduce_history_jmx_exporter.yaml
@@ -1,3 +1,9 @@
 ---
 lowercaseOutputLabelNames: true
-lowercaseOutputName: false
\ No newline at end of file
+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
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 42bef1c..f1a7ace 100644
--- a/modules/profile/files/hadoop/prometheus_yarn_nodemanager_jmx_exporter.yaml
+++ b/modules/profile/files/hadoop/prometheus_yarn_nodemanager_jmx_exporter.yaml
@@ -1,5 +1,11 @@
 ---
 lowercaseOutputLabelNames: true
 lowercaseOutputName: false
-blacklistObjectNames:
-  - 'Hadoop:service=NodeManager,name=ContainerResource_container_*'
\ No newline at end of file
+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
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 73530b2..c7ea9f6 100644
--- 
a/modules/profile/files/hadoop/prometheus_yarn_resourcemanager_jmx_exporter.yaml
+++ 
b/modules/profile/files/hadoop/prometheus_yarn_resourcemanager_jmx_exporter.yaml
@@ -1,3 +1,10 @@
 ---
 lowercaseOutputLabelNames: true
-lowercaseOutputName: false
\ No newline at end of file
+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
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 73530b2..5532f5e 100644
--- a/modules/profile/files/hive/prometheus_hive_metastore_jmx_exporter.yaml
+++ b/modules/profile/files/hive/prometheus_hive_metastore_jmx_exporter.yaml
@@ -1,3 +1,9 @@
 ---
 lowercaseOutputLabelNames: true
-lowercaseOutputName: false
\ No newline at end of file
+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
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 73530b2..5532f5e 100644
--- a/modules/profile/files/hive/prometheus_hive_server_jmx_exporter.yaml
+++ b/modules/profile/files/hive/prometheus_hive_server_jmx_exporter.yaml
@@ -1,3 +1,9 @@
 ---
 lowercaseOutputLabelNames: true
-lowercaseOutputName: false
\ No newline at end of file
+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
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 73530b2..5532f5e 100644
--- a/modules/profile/files/oozie/prometheus_oozie_server_jmx_exporter.yaml
+++ b/modules/profile/files/oozie/prometheus_oozie_server_jmx_exporter.yaml
@@ -1,3 +1,9 @@
 ---
 lowercaseOutputLabelNames: true
-lowercaseOutputName: false
\ No newline at end of file
+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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id96c27e7d3ce582052645a14d9413591dd67ab1c
Gerrit-PatchSet: 1
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: jenkins-bot <>

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

Reply via email to