From dd5aa953eddda6e06f0a726392483e24315b03a2 Mon Sep 17 00:00:00 2001 From: Laura Hampton Date: Tue, 4 Mar 2025 15:59:31 -0800 Subject: [PATCH 1/4] adds gotk_resource_info metric to fluxcd metrics --- fluxcd/datadog_checks/fluxcd/metrics.py | 1 + 1 file changed, 1 insertion(+) diff --git a/fluxcd/datadog_checks/fluxcd/metrics.py b/fluxcd/datadog_checks/fluxcd/metrics.py index 83a98e8893050..8828ee8d86d9b 100644 --- a/fluxcd/datadog_checks/fluxcd/metrics.py +++ b/fluxcd/datadog_checks/fluxcd/metrics.py @@ -29,6 +29,7 @@ "workqueue_longest_running_processor_seconds": "workqueue.longest_running_processor", "workqueue_retries": "workqueue.retries", "workqueue_unfinished_work_seconds": "workqueue.unfinished_work", + "gotk_resource_info": "gotk.resource.info" } assert sorted(FLUX_V2_METRICS) == list(FLUX_V2_METRICS) METRIC_MAP = {**FLUX_V1_METRICS, **FLUX_V2_METRICS} From 5baf1b125d523b61e3da5d6f966eea49624ebd2e Mon Sep 17 00:00:00 2001 From: Laura Hampton Date: Tue, 4 Mar 2025 16:16:06 -0800 Subject: [PATCH 2/4] metrics.py --- fluxcd/datadog_checks/fluxcd/metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluxcd/datadog_checks/fluxcd/metrics.py b/fluxcd/datadog_checks/fluxcd/metrics.py index 8828ee8d86d9b..c1727f174139c 100644 --- a/fluxcd/datadog_checks/fluxcd/metrics.py +++ b/fluxcd/datadog_checks/fluxcd/metrics.py @@ -29,7 +29,7 @@ "workqueue_longest_running_processor_seconds": "workqueue.longest_running_processor", "workqueue_retries": "workqueue.retries", "workqueue_unfinished_work_seconds": "workqueue.unfinished_work", - "gotk_resource_info": "gotk.resource.info" + "gotk_resource_info": "gotk.resource.info", } assert sorted(FLUX_V2_METRICS) == list(FLUX_V2_METRICS) METRIC_MAP = {**FLUX_V1_METRICS, **FLUX_V2_METRICS} From 8537ace854c08363f900859a5ac8d1ae70b5d728 Mon Sep 17 00:00:00 2001 From: Laura Hampton Date: Wed, 5 Mar 2025 13:43:41 -0800 Subject: [PATCH 3/4] updated to fix failing test --- fluxcd/datadog_checks/fluxcd/metrics.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fluxcd/datadog_checks/fluxcd/metrics.py b/fluxcd/datadog_checks/fluxcd/metrics.py index c1727f174139c..b5db7d68aa31d 100644 --- a/fluxcd/datadog_checks/fluxcd/metrics.py +++ b/fluxcd/datadog_checks/fluxcd/metrics.py @@ -16,6 +16,7 @@ assert sorted(FLUX_V1_METRICS) == list(FLUX_V1_METRICS) FLUX_V2_METRICS = { + "gotk_resource_info": "gotk.resource.info", "leader_election_master_status": "leader_election_master_status", "process_cpu_seconds": "process.cpu_seconds", "process_max_fds": "process.max_fds", @@ -29,7 +30,7 @@ "workqueue_longest_running_processor_seconds": "workqueue.longest_running_processor", "workqueue_retries": "workqueue.retries", "workqueue_unfinished_work_seconds": "workqueue.unfinished_work", - "gotk_resource_info": "gotk.resource.info", + } assert sorted(FLUX_V2_METRICS) == list(FLUX_V2_METRICS) METRIC_MAP = {**FLUX_V1_METRICS, **FLUX_V2_METRICS} From 7174880111a58a222389ae586b2eec21fa1706b3 Mon Sep 17 00:00:00 2001 From: Laura Hampton Date: Wed, 5 Mar 2025 13:49:09 -0800 Subject: [PATCH 4/4] linted --- fluxcd/datadog_checks/fluxcd/metrics.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fluxcd/datadog_checks/fluxcd/metrics.py b/fluxcd/datadog_checks/fluxcd/metrics.py index b5db7d68aa31d..6287db895f079 100644 --- a/fluxcd/datadog_checks/fluxcd/metrics.py +++ b/fluxcd/datadog_checks/fluxcd/metrics.py @@ -30,7 +30,6 @@ "workqueue_longest_running_processor_seconds": "workqueue.longest_running_processor", "workqueue_retries": "workqueue.retries", "workqueue_unfinished_work_seconds": "workqueue.unfinished_work", - } assert sorted(FLUX_V2_METRICS) == list(FLUX_V2_METRICS) METRIC_MAP = {**FLUX_V1_METRICS, **FLUX_V2_METRICS}