diff --git a/CHANGELOG.md b/CHANGELOG.md index 361776821..0fda2afb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -75,6 +75,7 @@ All notable changes to this project will be documented in this file. - airflow: Pin Cython version ([#1116]). - druid: reduce docker image size by removing the recursive chown/chmods in the final image ([#1039]). - hadoop: reduce docker image size by removing the recursive chown/chmods in the final image ([#1029]). +- hadoop: adapt the JMX exporter configuration to also export boolean metrics ([#1140]). - hbase: reduce docker image size by removing the recursive chown/chmods in the final image ([#1028]). - hive: reduce docker image size by removing the recursive chown/chmods in the final image ([#1040]). - kafka: reduce docker image size by removing the recursive chown/chmods in the final image ([#1041]). diff --git a/hadoop/stackable/jmx/datanode.yaml b/hadoop/stackable/jmx/datanode.yaml index 690105997..fb732ead8 100644 --- a/hadoop/stackable/jmx/datanode.yaml +++ b/hadoop/stackable/jmx/datanode.yaml @@ -12,10 +12,9 @@ blacklistObjectNames: - 'Hadoop:service=DataNode,name=UgiMetrics' rules: # MetricsSystem - - pattern: 'Hadoop<>(.*): (\d+)' + - pattern: 'Hadoop<>(.*):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 @@ -24,10 +23,9 @@ rules: type: GAUGE # FSDatasetState with _total suffix (also extracts the FSDataset ID), # e.g. Hadoop:name=FSDatasetState,attribute=EstimatedCapacityLostTotal - - pattern: 'Hadoop<>(.*_total): (\d+)' + - pattern: 'Hadoop<>(.*_total):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 @@ -35,10 +33,9 @@ rules: kind: 'FSDatasetState' type: COUNTER # FSDatasetState (also extracts the FSDataset ID) - - pattern: 'Hadoop<>(.*): (\d+)' + - pattern: 'Hadoop<>(.*):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 @@ -47,10 +44,9 @@ rules: type: GAUGE # DataNodeActivity with _info suffix (also extracts hostname and port), # e.g. Hadoop:name=DataNodeActivity-hdfs-datanode-default-0-9866,attribute=BlocksGetLocalPathInfo - - pattern: 'Hadoop<>(.*_info): (\d+)' + - pattern: 'Hadoop<>(.*_info):' attrNameSnakeCase: true name: hadoop_$1_$4_ - value: $5 labels: service: HDFS role: $1 @@ -58,10 +54,9 @@ rules: port: $3 kind: 'DataNodeActivity' type: GAUGE - - pattern: 'Hadoop<>(.*): (\d+)' + - pattern: 'Hadoop<>(.*):' attrNameSnakeCase: true name: hadoop_$1_$4 - value: $5 labels: service: HDFS role: $1 @@ -70,10 +65,9 @@ rules: kind: 'DataNodeActivity' type: GAUGE # Generic counter, e.g. Hadoop:name=FSDatasetState,attribute=EstimatedCapacityLostTotal - - pattern: 'Hadoop<>(.*_total): (\d+)' + - pattern: 'Hadoop<>(.*_total):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 @@ -81,20 +75,18 @@ rules: type: COUNTER # Metrics suffixed with _info, e.g. Hadoop:name=JvmMetrics,attribute=LogInfo # The suffix _info is reserved for static information, therefore an underscore is appended. - - pattern: 'Hadoop<>(.*_info): (.*)' + - pattern: 'Hadoop<>(.*_info):' attrNameSnakeCase: true name: hadoop_$1_$3_ - value: $4 labels: service: HDFS role: $1 kind: $2 type: GAUGE # All other Hadoop metrics - - pattern: 'Hadoop<>(.*): (.*)' + - pattern: 'Hadoop<>(.*):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 diff --git a/hadoop/stackable/jmx/journalnode.yaml b/hadoop/stackable/jmx/journalnode.yaml index 8cfcada96..a3b4c19c6 100644 --- a/hadoop/stackable/jmx/journalnode.yaml +++ b/hadoop/stackable/jmx/journalnode.yaml @@ -13,10 +13,9 @@ blacklistObjectNames: - 'Hadoop:service=JournalNode,name=UgiMetrics' rules: # MetricsSystem - - pattern: 'Hadoop<>(.*): (\d+)' + - pattern: 'Hadoop<>(.*):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 @@ -25,20 +24,18 @@ rules: type: GAUGE # Metrics suffixed with _info, e.g. Hadoop:name=JvmMetrics,attribute=LogInfo # The suffix _info is reserved for static information, therefore an underscore is appended. - - pattern: 'Hadoop<>(.*_info): (.*)' + - pattern: 'Hadoop<>(.*_info):' attrNameSnakeCase: true name: hadoop_$1_$3_ - value: $4 labels: service: HDFS role: $1 kind: $2 type: GAUGE # All other Hadoop metrics - - pattern: 'Hadoop<>(.*): (.*)' + - pattern: 'Hadoop<>(.*):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 diff --git a/hadoop/stackable/jmx/namenode.yaml b/hadoop/stackable/jmx/namenode.yaml index b2ddbd6d5..17ca52bc6 100644 --- a/hadoop/stackable/jmx/namenode.yaml +++ b/hadoop/stackable/jmx/namenode.yaml @@ -13,10 +13,9 @@ blacklistObjectNames: - 'Hadoop:service=NameNode,name=UgiMetrics' rules: # MetricsSystem - - pattern: 'Hadoop<>(.*): (\d+)' + - pattern: 'Hadoop<>(.*):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 @@ -24,20 +23,18 @@ rules: sub: $2 type: GAUGE # Total raw capacity in bytes, e.g. Hadoop:name=NameNodeInfo,attribute=Total - - pattern: 'Hadoop<>(total): (\d+)' + - pattern: 'Hadoop<>(total):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 kind: $2 type: COUNTER # Generic counter, e.g. Hadoop:name=FSNamesystem,attribute=FilesTotal - - pattern: 'Hadoop<>(.*_total): (\d+)' + - pattern: 'Hadoop<>(.*_total):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1 @@ -45,10 +42,9 @@ rules: type: COUNTER # Metrics suffixed with _created, e.g. Hadoop:name=NameNodeActivity,attribute=FilesCreated # The suffix _created is reserved for timestamps, therefore an underscore is appended. - - pattern: 'Hadoop<>(.*_created): (.*)' + - pattern: 'Hadoop<>(.*_created):' attrNameSnakeCase: true name: hadoop_$1_$3_ - value: $4 labels: service: HDFS role: $1 @@ -56,20 +52,18 @@ rules: type: GAUGE # Metrics suffixed with _info, e.g. Hadoop:name=JvmMetrics,attribute=LogInfo # The suffix _info is reserved for static information, therefore an underscore is appended. - - pattern: 'Hadoop<>(.*_info): (.*)' + - pattern: 'Hadoop<>(.*_info):' attrNameSnakeCase: true name: hadoop_$1_$3_ - value: $4 labels: service: HDFS role: $1 kind: $2 type: GAUGE # All other Hadoop metrics - - pattern: 'Hadoop<>(.*): (.*)' + - pattern: 'Hadoop<>(.*):' attrNameSnakeCase: true name: hadoop_$1_$3 - value: $4 labels: service: HDFS role: $1