aerospike-agent-and-dashboards

Author: mphanias

aerospike/datadog_checks/aerospike/check.py

@@ -99,6 +99,7 @@ def transform(metric, sample_data, runtime_data):
                     new_metric_name = new_metric_name[:-6]
 
                 match = cached_patterns[metric_pattern].match(new_metric_name)
+
                 if match:
                     new_metric_name = f"{match.groups(1)[0]}.{match.groups(1)[1]}"
                     method(new_metric_name, sample.value, tags=tags, hostname=hostname)

aerospike/datadog_checks/aerospike/metrics.py

@@ -82,4 +82,10 @@
     r'^aerospike_(latencies)_(.*)$': {
         'metric_type': 'gauge',
     },
+    r'^aerospike_(node)_(up)$': {
+        'metric_type': 'gauge',
+    },
+    r'^aerospike_(node)_(ticks)$': {
+        'metric_type': 'gauge',
+    },
 }

aerospike/metadata.csv

@@ -699,6 +699,8 @@ aerospike.namespace.xdr_write_error,gauge,,request,,[Legacy] The number of write
 aerospike.namespace.xdr_write_success,gauge,,request,,[Legacy] The number of write requests initiated by XDR that succeeded on the namespace on this node. Deprecated.,0,aerospike,,,
 aerospike.namespace.xdr_write_timeout,gauge,,request,,[Legacy] The number of write requests initiated by XDR that timed out on the namespace on this node,0,aerospike,,,
 aerospike.namespace.xmem_id,gauge,,,,[OpenMetricsV2 ] The extended memory id of the namespace,0,aerospike,,,
+aerospike.node.ticks,gauge,,,,Represents how many times exporter is called to fetch metrics,0,aerospike,,,
+aerospike.node.up,gauge,,,,Represents if exporter is up and running,0,aerospike,,,
 aerospike.node_stats.advertise_ipv6,gauge,,,,[OpenMetricsV2 ] config- Requires heartbeat v3. Set to true in order enable IPv6,0,aerospike,,,
 aerospike.node_stats.batch_index_complete,gauge,,,,[OpenMetricsV2 and Aerospike v5.0+]  ,0,aerospike,,,
 aerospike.node_stats.batch_index_created_buffers,gauge,,,,[OpenMetricsV2 and Aerospike v5.0+]  ,0,aerospike,,,

aerospike/tests/common.py

@@ -799,4 +799,6 @@
     'aerospike.sysinfo.netstat_tcp_retranssegs',
     'aerospike.sysinfo.network_receive_bytes',
     'aerospike.sysinfo.network_transfer_bytes',
+    'aerospike.node.ticks',
+    'aerospike.node.up',
 ]

aerospike/tests/test_unit_openmetricsv2.py

@@ -10,6 +10,7 @@
 from datadog_checks.dev.utils import get_metadata_metrics
 
 from .common import (
+    AEROSPIKE_V7,
     EXPECTED_PROMETHEUS_METRICS,
     EXPECTED_PROMETHEUS_METRICS_5_6,
     EXPECTED_PROMETHEUS_METRICS_7,
@@ -31,7 +32,7 @@ def test_openmetricsv2_check(aggregator, dd_run_check, instance_openmetrics_v2,
 
     version_parts = [int(p) for p in VERSION.split('.')]
 
-    if version_parts[0] >= 7:
+    if version_parts[0] >= AEROSPIKE_V7:
         metrics_to_check = EXPECTED_PROMETHEUS_METRICS_7
         _test_check_from_v7(aggregator, dd_run_check, instance_openmetrics_v2, mock_http_response, metrics_to_check)
 
@@ -76,7 +77,7 @@ def _test_check_from_v7(aggregator, dd_run_check, instance_openmetrics_v2, mock_
 
         # no need to validate node-ticks for labels, as its a counter to check how many times exporter url is called
         #    node-ticks wiill not have any labels associated
-        if metric_name != "aerospike.aerospike_node_ticks":
+        if metric_name not in ("aerospike.node.ticks", "aerospike.node.up"):
             aggregator.assert_metric_has_tag(
                 metric_name, 'endpoint:{}'.format(instance_openmetrics_v2.get('openmetrics_endpoint'))
             )