couple fixes, adding node_cpu_second_total to plugin

slorello89 · slorello89 · commit a8db7ed93ff6 · 2025-07-08T13:08:19.000-04:00
diff --git a/redis_enterprise_prometheus/assets/dashboards/redis_enterprise-prometheus_node.json b/redis_enterprise_prometheus/assets/dashboards/redis_enterprise-prometheus_node.json
@@ -330,7 +330,7 @@
                     {
                       "data_source": "metrics",
                       "name": "query1",
-                      "query": "avg:rdse.redis_process_cpu_usage_percent{$cluster, $node} by {redis}"
+                      "query": "avg:rdse2.namedprocess_namegroup_cpu_seconds.count{(mode:system or mode:user) AND $cluster AND $node}.as_count()"
                     }
                   ],
                   "response_format": "timeseries",
diff --git a/redis_enterprise_prometheus/assets/dashboards/redis_enterprise-prometheus_shard.json b/redis_enterprise_prometheus/assets/dashboards/redis_enterprise-prometheus_shard.json
@@ -925,12 +925,12 @@
                     {
                       "data_source": "metrics",
                       "name": "query1",
-                      "query": "avg:rdse.redis_process_cpu_system_seconds_total{$cluster,$db} by {bdb,redis}"
+                      "query": "avg:rdse2.namedprocess_namegroup_cpu_seconds.count{cluster:$cluster,db:$db,mode:system} by {db,redis}"
                     },
                     {
                       "data_source": "metrics",
                       "name": "query2",
-                      "query": "avg:rdse.redis_process_main_thread_cpu_user_seconds_total{$cluster,$db} by {bdb,redis}"
+                      "query": "avg:rdse2.namedprocess_namegroup_cpu_seconds.count{cluster:$cluster,db:$db,mode:user} by {db,redis}"
                     }
                   ],
                   "response_format": "timeseries",
diff --git a/redis_enterprise_prometheus/datadog_checks/redis_enterprise_prometheus/metrics.py b/redis_enterprise_prometheus/datadog_checks/redis_enterprise_prometheus/metrics.py
@@ -125,6 +125,7 @@
     'node_available_memory_bytes': 'node_available_memory_bytes',
     'node_available_memory_no_overbooking_bytes': 'node_available_memory_no_overbooking_bytes',
     'node_bigstore_free_bytes': 'node_bigstore_free_bytes',
+    'node_cpu_seconds_total':'node_cpu_seconds_total',
     'x509_cert_expires_in_seconds': 'x509_cert_expires_in_seconds',
     'x509_exporter_build_info': 'x509_exporter_build_info',
     'x509_read_errors': 'x509_read_errors',

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@`
`330`	`330`	`{`
`331`	`331`	`"data_source": "metrics",`
`332`	`332`	`"name": "query1",`
`333`		`- "query": "avg:rdse.redis_process_cpu_usage_percent{$cluster, $node} by {redis}"`
	`333`	`+ "query": "avg:rdse2.namedprocess_namegroup_cpu_seconds.count{(mode:system or mode:user) AND $cluster AND $node}.as_count()"`
`334`	`334`	`}`
`335`	`335`	`],`
`336`	`336`	`"response_format": "timeseries",`
Original file line number	Diff line number	Diff line change
`@@ -925,12 +925,12 @@`
`925`	`925`	`{`
`926`	`926`	`"data_source": "metrics",`
`927`	`927`	`"name": "query1",`
`928`		`- "query": "avg:rdse.redis_process_cpu_system_seconds_total{$cluster,$db} by {bdb,redis}"`
	`928`	`+ "query": "avg:rdse2.namedprocess_namegroup_cpu_seconds.count{cluster:$cluster,db:$db,mode:system} by {db,redis}"`
`929`	`929`	`},`
`930`	`930`	`{`
`931`	`931`	`"data_source": "metrics",`
`932`	`932`	`"name": "query2",`
`933`		`- "query": "avg:rdse.redis_process_main_thread_cpu_user_seconds_total{$cluster,$db} by {bdb,redis}"`
	`933`	`+ "query": "avg:rdse2.namedprocess_namegroup_cpu_seconds.count{cluster:$cluster,db:$db,mode:user} by {db,redis}"`
`934`	`934`	`}`
`935`	`935`	`],`
`936`	`936`	`"response_format": "timeseries",`