Remove CPU-specific info from cpuidle dimensions (#12898)
Vladimir Kobal committed
May 13, 2022 at 17:24 UTC
44b9fd0e13f861886ac3e428582c5f9de2c5104c
1 file changed
+5
-4
collectors/proc.plugin/proc_stat.c
+5
-4
@@ -1029,7 +1029,7 @@ int do_proc_stat(int update_every, usec_t dt) {
1029
, cpuidle_chart_id
1030
, NULL
1031
, "cpuidle"
1032
- , "cpuidle.cpuidle"
1032
+ , "cpuidle.cpu_cstate_residency_time"
1033
, "C-state residency time"
1034
, "percentage"
1035
, PLUGIN_PROC_NAME
@@ -1040,10 +1040,11 @@ int do_proc_stat(int update_every, usec_t dt) {
1040
);
1041
1042
char cpuidle_dim_id[RRD_ID_LENGTH_MAX + 1];
1043
- snprintfz(cpuidle_dim_id, RRD_ID_LENGTH_MAX, "cpu%zu_active_time", core);
1044
- cpuidle_charts[core].active_time_rd = rrddim_add(cpuidle_charts[core].st, cpuidle_dim_id, "C0 (active)", 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
1043
+ cpuidle_charts[core].active_time_rd = rrddim_add(cpuidle_charts[core].st, "active", "C0 (active)", 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
1044
for(state = 0; state < cpuidle_charts[core].cpuidle_state_len; state++) {
1046
- snprintfz(cpuidle_dim_id, RRD_ID_LENGTH_MAX, "cpu%zu_cpuidle_state%zu_time", core, state);
1045
+ strncpyz(cpuidle_dim_id, cpuidle_charts[core].cpuidle_state[state].name, RRD_ID_LENGTH_MAX);
1046
+ for(int i = 0; cpuidle_dim_id[i]; i++)
1047
+ cpuidle_dim_id[i] = tolower(cpuidle_dim_id[i]);
1048
cpuidle_charts[core].cpuidle_state[state].rd = rrddim_add(cpuidle_charts[core].st, cpuidle_dim_id,
1049
cpuidle_charts[core].cpuidle_state[state].name,
1050
1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);