From b5c7adb3c4f8fbe0956c4c25fd85d533af2292be Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Mon, 2 Jun 2025 15:20:15 +0200 Subject: [PATCH 1/2] test(smoke): Test boolean metrics --- tests/templates/kuttl/smoke/test_metrics.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/templates/kuttl/smoke/test_metrics.py b/tests/templates/kuttl/smoke/test_metrics.py index 5129e2dd..57ef5e30 100755 --- a/tests/templates/kuttl/smoke/test_metrics.py +++ b/tests/templates/kuttl/smoke/test_metrics.py @@ -35,6 +35,8 @@ def check_namenode_metrics( 'hadoop_namenode_files_total{kind="FSNamesystem",role="NameNode",service="HDFS"}', # Metric suffixed with "_created" 'hadoop_namenode_files_created_{kind="NameNodeActivity",role="NameNode",service="HDFS"}', + # Boolean metric + 'hadoop_namenode_security_enabled{kind="NameNodeStatus",role="NameNode",service="HDFS"}', # Non-special metric 'hadoop_namenode_files_deleted{kind="NameNodeActivity",role="NameNode",service="HDFS"}', ] @@ -68,6 +70,8 @@ def check_datanode_metrics( 'hadoop_datanode_blocks_read{host="hdfs-datanode-default-0\\.hdfs-datanode-default\\..+\\.svc\\.cluster\\.local",kind="DataNodeActivity",port="9866",role="DataNode",service="HDFS"}', # Counter suffixed with "_total" 'hadoop_datanode_estimated_capacity_lost_total{kind="FSDatasetState",role="DataNode",service="HDFS"}', + # Boolean metric + 'hadoop_datanode_security_enabled{kind="DataNodeInfo",role="DataNode",service="HDFS"}', # Non-special metric 'hadoop_datanode_gc_count{kind="JvmMetrics",role="DataNode",service="HDFS"}', ] @@ -93,6 +97,8 @@ def check_journalnode_metrics( 'hadoop_journalnode_num_active_sources{kind="MetricsSystem",role="JournalNode",service="HDFS",sub="Stats"}', # Non-special metric 'hadoop_journalnode_bytes_written{kind="Journal-hdfs",role="JournalNode",service="HDFS"}', + + # There is no boolean metric in JournalNode. ] if product_version in ["3.3.4", "3.3.6"]: From 5195a4781738ed751a9c31588e2a409c64807f43 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Mon, 2 Jun 2025 15:38:14 +0200 Subject: [PATCH 2/2] Format Python file --- tests/templates/kuttl/smoke/test_metrics.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/templates/kuttl/smoke/test_metrics.py b/tests/templates/kuttl/smoke/test_metrics.py index 57ef5e30..066c3e11 100755 --- a/tests/templates/kuttl/smoke/test_metrics.py +++ b/tests/templates/kuttl/smoke/test_metrics.py @@ -17,9 +17,9 @@ def check_metrics( assert response.ok, "Requesting metrics failed" for metric in expected_metrics: - assert ( - re.search(f"^{metric}", response.text, re.MULTILINE) is not None - ), f"Metric '{metric}' not found for {role}" + assert re.search(f"^{metric}", response.text, re.MULTILINE) is not None, ( + f"Metric '{metric}' not found for {role}" + ) def check_namenode_metrics( @@ -97,7 +97,6 @@ def check_journalnode_metrics( 'hadoop_journalnode_num_active_sources{kind="MetricsSystem",role="JournalNode",service="HDFS",sub="Stats"}', # Non-special metric 'hadoop_journalnode_bytes_written{kind="Journal-hdfs",role="JournalNode",service="HDFS"}', - # There is no boolean metric in JournalNode. ]