appset metric fix (DataDog#18018)

* appset metric fix

* changelogs

Author: steveny91

argocd/changelog.d/18018.fixed

@@ -0,0 +1 @@
+Fix collection of 2 appset counters

argocd/datadog_checks/argocd/metrics.py

@@ -64,9 +64,9 @@
 APPSET_CONTROLLER = {
     'controller_runtime_active_workers': 'active.workers',
     'controller_runtime_max_concurrent_reconciles': 'max.concurrent.reconciles',
-    'controller_runtime_reconcile_errors_total': 'reconcile.errors.total',
+    'controller_runtime_reconcile_errors': 'reconcile.errors',
     'controller_runtime_reconcile_time_seconds': 'reconcile.time_seconds',
-    'controller_runtime_reconcile_total': 'runtime.reconcile.total',
+    'controller_runtime_reconcile': 'runtime.reconcile',
 }
 
 API_SERVER = {

argocd/metadata.csv

@@ -143,11 +143,11 @@ argocd.appset_controller.process.resident_memory.bytes,gauge,,byte,,The resident
 argocd.appset_controller.process.start_time.seconds,gauge,,second,,The start time of the process since unix epoch in seconds in the ApplicationSet controller,0,argocd,appset_controller process start_time seconds,
 argocd.appset_controller.process.virtual_memory.bytes,gauge,,byte,,The virtual memory size in bytes in the ApplicationSet controller,0,argocd,appset_controller process virtual_memory bytes,
 argocd.appset_controller.process.virtual_memory.max_bytes,gauge,,byte,,The maximum amount of virtual memory available in bytes in the ApplicationSet controller,0,argocd,appset_controller process virtual_memory max_byte,
-argocd.appset_controller.reconcile.errors.total,gauge,,,,Total number of reconciliation errors per controller,0,argocd,appset_controller runtime reconcile errors count,
+argocd.appset_controller.reconcile.errors.count,count,,,,The count of reconciliation errors per controller,0,argocd,appset_controller runtime reconcile errors count,
 argocd.appset_controller.reconcile.time_seconds.bucket,count,,,,The histogram bucket for length of time per reconciliation per controller,0,argocd,appset_controller runtime reconcile buckets,
 argocd.appset_controller.reconcile.time_seconds.count,count,,,,The count aggregation of length of time per reconciliation per controller,0,argocd,appset_controller runtime reconcile count,
 argocd.appset_controller.reconcile.time_seconds.sum,count,,,,The sum aggregation of length of time per reconciliation per controller,0,argocd,appset_controller runtime reconcile sum,
-argocd.appset_controller.runtime.reconcile.total,count,,,,Total number of reconciliations per controller,0,argocd,appset_controller runtime total reconcile count,
+argocd.appset_controller.runtime.reconcile.count,count,,,,The count of reconciliations per controller,0,argocd,appset_controller runtime total reconcile count,
 argocd.notifications_controller.go.gc.duration.seconds.count,count,,second,,The summary count of garbage collection cycles in the API Server,0,argocd,notifications_controller go gc duration seconds count,
 argocd.notifications_controller.go.gc.duration.seconds.quantile,gauge,,second,,A summary of the pause duration of garbage collection cycles in the API Server,0,argocd,notifications_controller go gc duration seconds,
 argocd.notifications_controller.go.gc.duration.seconds.sum,count,,second,,The sum of the pause duration of garbage collection cycles in the API Server,0,argocd,notifications_controller go gc duration seconds sum,

argocd/tests/common.py

@@ -108,7 +108,7 @@
     'redis.request.duration.sum',
 ]
 
-appset_controller_counters = ['reconcile.errors.total', 'runtime.reconcile.total']
+appset_controller_counters = ['reconcile.errors.count', 'runtime.reconcile.count']
 
 appset_controller_gauges = [
     'active.workers',
@@ -163,8 +163,6 @@
     'argocd.app_controller.cluster.api.resources',
     'argocd.app_controller.cluster.cache.age.seconds',
     'argocd.app_controller.redis.request.duration',
-    'argocd.appset_controller.reconcile.errors.total',
-    'argocd.appset_controller.runtime.reconcile.total',
 ]
 
 # Additional metrics that aren't exposed in the E2E environment