rename test script, fix multi disk smoke test

Author: maltesander

tests/templates/kuttl/smoke/51-assert.yaml.j2

@@ -12,4 +12,4 @@ commands:
       kubectl exec --namespace=$NAMESPACE test-runner-0 -- \
       python /tmp/test_jmx_metrics.py $NAMESPACE $PRODUCT_VERSION
       kubectl exec --namespace=$NAMESPACE test-runner-0 -- \
-      python /tmp/test_native_metrics.py $NAMESPACE
+      python /tmp/test_prometheus_metrics.py $NAMESPACE {{ test_scenario['values']['datanode-pvcs'] }}

tests/templates/kuttl/smoke/51-copy-metrics-test-script.yaml

@@ -3,4 +3,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
   - script: kubectl cp -n $NAMESPACE ./test_jmx_metrics.py test-runner-0:/tmp
-  - script: kubectl cp -n $NAMESPACE ./test_native_metrics.py test-runner-0:/tmp
+  - script: kubectl cp -n $NAMESPACE ./test_prometheus_metrics.py test-runner-0:/tmp

tests/templates/kuttl/smoke/test_native_metrics.py renamed to tests/templates/kuttl/smoke/test_prometheus_metrics.py

@@ -38,16 +38,27 @@ def check_namenode_metrics(namespace: str) -> None:
 
 def check_datanode_metrics(
     namespace: str,
+    datanode_pvc_arg: str
 ) -> None:
     expected_metrics: list[str] = [
         r'metrics_system_num_active_sources\{context="metricssystem",hostname="hdfs-datanode-default-\d+',
-        r'org_apache_hadoop_hdfs_server_datanode_fsdataset_impl_fs_dataset_impl_capacity\{context="FSDatasetState",storageinfo="FSDataset\{dirpath=\'\[/stackable/data/data/datanode]\'\}",hostname="hdfs-datanode-default-\d+"\}',
-        r'org_apache_hadoop_hdfs_server_datanode_fsdataset_impl_fs_dataset_impl_estimated_capacity_lost_total\{context="FSDatasetState",storageinfo="FSDataset\{dirpath=\'\[/stackable/data/data/datanode]\'\}",hostname="hdfs-datanode-default-\d+"\}',
         r'datanode_blocks_get_local_path_info\{sessionid="null",context="dfs",hostname="hdfs-datanode-default-\d+"\}',
         r'datanode_blocks_read\{sessionid="null",context="dfs",hostname="hdfs-datanode-default-\d+"\}',
         r'jvm_metrics_gc_count\{context="jvm",processname="DataNode",sessionid="null",hostname="hdfs-datanode-default-\d+"\}',
     ]
 
+    # metrics change depending on datanode pvcs 
+    if datanode_pvc_arg == "default":
+        expected_metrics.extend([
+            r'org_apache_hadoop_hdfs_server_datanode_fsdataset_impl_fs_dataset_impl_capacity\{context="FSDatasetState",storageinfo="FSDataset\{dirpath=\'\[/stackable/data/data/datanode]\'\}",hostname="hdfs-datanode-default-\d+"\}',
+            r'org_apache_hadoop_hdfs_server_datanode_fsdataset_impl_fs_dataset_impl_estimated_capacity_lost_total\{context="FSDatasetState",storageinfo="FSDataset\{dirpath=\'\[/stackable/data/data/datanode]\'\}",hostname="hdfs-datanode-default-\d+"\}',
+        ])
+    else:
+        expected_metrics.extend([
+            r'org_apache_hadoop_hdfs_server_datanode_fsdataset_impl_fs_dataset_impl_capacity\{context="FSDatasetState",storageinfo="FSDataset\{dirpath=\'\[/stackable/data/hdd/datanode, /stackable/data/hdd-1/datanode, /stackable/data/ssd/datanode]\'\}",hostname="hdfs-datanode-default-\d+"\}',
+            r'org_apache_hadoop_hdfs_server_datanode_fsdataset_impl_fs_dataset_impl_estimated_capacity_lost_total\{context="FSDatasetState",storageinfo="FSDataset\{dirpath=\'\[/stackable/data/hdd/datanode, /stackable/data/hdd-1/datanode, /stackable/data/ssd/datanode]\'\}",hostname="hdfs-datanode-default-\d+"\}',
+        ])        
+
     check_metrics(namespace, "datanode", 9864, expected_metrics)
 
 
@@ -64,6 +75,7 @@ def check_journalnode_metrics(
 
 if __name__ == "__main__":
     namespace_arg: str = sys.argv[1]
+    datanode_pvc_arg: str = sys.argv[2]
 
     logging.basicConfig(
         level="DEBUG",
@@ -72,7 +84,7 @@ def check_journalnode_metrics(
     )
 
     check_namenode_metrics(namespace_arg)
-    check_datanode_metrics(namespace_arg)
+    check_datanode_metrics(namespace_arg, datanode_pvc_arg)
     check_journalnode_metrics(namespace_arg)
 
     print("All expected native metrics found")