aerospike-agent-and-dashboards

updated the expected metric names used in testing

Author: mphanias

aerospike/tests/common.py

@@ -22,56 +22,56 @@
 }
 
 EXPECTED_PROMETHEUS_METRICS = [
-    'aerospike.namespace.client_delete_error.count',
-    'aerospike.namespace.client_read_error.count',
-    'aerospike.namespace.client_read_success.count',
-    'aerospike.namespace.client_read_not_found.count',
-    'aerospike.namespace.client_read_timeout.count',
-    'aerospike.namespace.client_read_filtered_out.count',
-    'aerospike.namespace.client_udf_error.count',
-    'aerospike.namespace.client_write_error.count',
-    'aerospike.namespace.client_write_success.count',
-    'aerospike.namespace.client_write_timeout.count',
-    'aerospike.namespace.client_write_filtered_out.count',
-    'aerospike.namespace.clock_skew_stop_writes',
-    'aerospike.namespace.dead_partitions',
-    'aerospike.namespace.device_available_pct',
-    'aerospike.namespace.hwm_breached',
-    'aerospike.namespace.memory_free_pct',
-    'aerospike.namespace.memory_used_bytes',
-    'aerospike.namespace.scan_aggr_error.count',
-    'aerospike.namespace.scan_basic_error.count',
-    'aerospike.namespace.scan_ops_bg_error.count',
-    'aerospike.namespace.scan_udf_bg_error.count',
-    'aerospike.namespace.stop_writes',
-    'aerospike.namespace.storage_engine_file_write_q',
-    'aerospike.namespace.unavailable_partitions',
-    'aerospike.node_stats.batch_index_error.count',
-    'aerospike.node_stats.client_connections',
-    'aerospike.node_stats.cluster_size',
-    'aerospike.node_stats.heap_efficiency_pct',
-    'aerospike.node_stats.rw_in_progress',
-    'aerospike.node_stats.system_free_mem_pct',
-    'aerospike.namespace.storage_engine_file_defrag_q',
+    'aerospike.aerospike_namespace_client_delete_error',
+    'aerospike.aerospike_namespace_client_read_error',
+    'aerospike.aerospike_namespace_client_read_success',
+    'aerospike.aerospike_namespace_client_read_not_found',
+    'aerospike.aerospike_namespace_client_read_timeout',
+    'aerospike.aerospike_namespace_client_read_filtered_out',
+    'aerospike.aerospike_namespace_client_udf_error',
+    'aerospike.aerospike_namespace_client_write_error',
+    'aerospike.aerospike_namespace_client_write_success',
+    'aerospike.aerospike_namespace_client_write_success',
+    'aerospike.aerospike_namespace_client_write_filtered_out',
+    'aerospike.aerospike_namespace_clock_skew_stop_writes',
+    'aerospike.aerospike_namespace_dead_partitions',
+    'aerospike.aerospike_namespace_device_available_pct',
+    'aerospike.aerospike_namespace_hwm_breached',
+    'aerospike.aerospike_namespace_memory_free_pct',
+    'aerospike.aerospike_namespace_memory_used_bytes',
+    'aerospike.aerospike_namespace_scan_aggr_error',
+    'aerospike.aerospike_namespace_scan_basic_error',
+    'aerospike.aerospike_namespace_scan_ops_bg_error',
+    'aerospike.aerospike_namespace_scan_udf_bg_error',
+    'aerospike.aerospike_namespace_stop_writes',
+    'aerospike.aerospike_namespace_storage_engine_file_write_q',
+    'aerospike.aerospike_namespace_unavailable_partitions',
+    'aerospike.aerospike_node_stats_batch_index_error',
+    'aerospike.aerospike_node_stats_client_connections',
+    'aerospike.aerospike_node_stats_cluster_size',
+    'aerospike.aerospike_node_stats_heap_efficiency_pct',
+    'aerospike.aerospike_node_stats_rw_in_progress',
+    'aerospike.aerospike_node_stats_system_free_mem_pct',
+    'aerospike.aerospike_namespace_storage_engine_file_defrag_q',
 ]
 
 EXPECTED_PROMETHEUS_METRICS_5_6 = [
-    'aerospike.node_stats.client_connections_opened.count',
-    'aerospike.node_stats.fabric_connections_opened.count',
-    'aerospike.node_stats.heartbeat_connections_opened.count',
+    'aerospike.aerospike_node_stats_client_connections_opened',
+    'aerospike.aerospike_node_stats_fabric_connections_opened',
+    'aerospike.aerospike_node_stats_heartbeat_connections_opened',
 ]
 
 PROMETHEUS_XDR_METRICS = [
-    'aerospike.xdr.abandoned.count',
-    'aerospike.xdr.lag',
-    'aerospike.xdr.lap_us',
-    'aerospike.xdr.latency_ms',
-    'aerospike.xdr.recoveries.count',
-    'aerospike.xdr.recoveries_pending',
-    'aerospike.xdr.retry_conn_reset.count',
-    'aerospike.xdr.retry_dest.count',
-    'aerospike.xdr.retry_no_node.count',
-    'aerospike.xdr.success.count',
+    'aerospike.aerospike_xdr_abandoned',
+    'aerospike.aerospike_xdr_lag',
+    'aerospike.aerospike_xdr_lap_us',
+    'aerospike.aerospike_xdr_latency_ms',
+    'aerospike.aerospike_xdr_recoveries',
+    'aerospike.aerospike_xdr_recoveries_pending',
+    'aerospike.aerospike_xdr_retry_conn_reset',
+    'aerospike.aerospike_xdr_retry_dest',
+    'aerospike.aerospike_xdr_retry_no_node',
+    'aerospike.aerospike_xdr_success',
 ]
 
 NAMESPACE_METRICS = [