make io charts "write" negative in apps and cgroups (systemd) (#16152)
Ilya Mashchenko committed
Oct 9, 2023 at 12:26 UTC
81425d057afe13a8e96dcb2839ef3bf3eea58321
2 files changed
+16
-20
collectors/apps.plugin/apps_plugin.c
+3
-3
@@ -3927,19 +3927,19 @@ static void send_charts_updates_to_netdata(struct target *root, const char *type
3927
fprintf(stdout, "CLABEL '%s' '%s' 0\n", lbl_name, w->name);
3928
fprintf(stdout, "CLABEL_COMMIT\n");
3929
fprintf(stdout, "DIMENSION reads '' absolute 1 %llu\n", 1024LLU * RATES_DETAIL);
3930
- fprintf(stdout, "DIMENSION writes '' absolute 1 %llu\n", 1024LLU * RATES_DETAIL);
3930
+ fprintf(stdout, "DIMENSION writes '' absolute -1 %llu\n", 1024LLU * RATES_DETAIL);
3931
3932
fprintf(stdout, "CHART %s.%s_disk_logical_io '' '%s disk logical IO' 'KiB/s' disk %s.disk_logical_io area 20105 %d\n", type, w->clean_name, title, type, update_every);
3933
fprintf(stdout, "CLABEL '%s' '%s' 0\n", lbl_name, w->name);
3934
fprintf(stdout, "CLABEL_COMMIT\n");
3935
fprintf(stdout, "DIMENSION reads '' absolute 1 %llu\n", 1024LLU * RATES_DETAIL);
3936
- fprintf(stdout, "DIMENSION writes '' absolute 1 %llu\n", 1024LLU * RATES_DETAIL);
3936
+ fprintf(stdout, "DIMENSION writes '' absolute -1 %llu\n", 1024LLU * RATES_DETAIL);
3937
#else
3938
fprintf(stdout, "CHART %s.%s_disk_physical_io '' '%s disk physical IO' 'blocks/s' disk %s.disk_physical_block_io area 20100 %d\n", type, w->clean_name, title, type, update_every);
3939
fprintf(stdout, "CLABEL '%s' '%s' 0\n", lbl_name, w->name);
3940
fprintf(stdout, "CLABEL_COMMIT\n");
3941
fprintf(stdout, "DIMENSION reads '' absolute 1 %llu\n", RATES_DETAIL);
3942
- fprintf(stdout, "DIMENSION writes '' absolute 1 %llu\n", RATES_DETAIL);
3942
+ fprintf(stdout, "DIMENSION writes '' absolute -1 %llu\n", RATES_DETAIL);
3943
#endif
3944
3945
fprintf(stdout, "CHART %s.%s_processes '' '%s processes' 'processes' processes %s.processes line 20150 %d\n", type, w->clean_name, title, type, update_every);
collectors/cgroups.plugin/sys_fs_cgroup.c
+13
-17
@@ -3063,7 +3063,7 @@ void update_systemd_services_charts(
3063
3064
rrdset_update_rrdlabels(cg->st_mem_activity, cg->chart_labels);
3065
rrddim_add(cg->st_mem_activity, "in", NULL, system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
3066
- rrddim_add(cg->st_mem_activity, "out", NULL, system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
3066
+ rrddim_add(cg->st_mem_activity, "out", NULL, -system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
3067
}
3068
3069
rrddim_set(cg->st_mem_activity, "in", cg->memory.total_pgpgin);
@@ -3088,12 +3088,11 @@ void update_systemd_services_charts(
3088
RRDSET_TYPE_AREA);
3089
3090
rrdset_update_rrdlabels(cg->st_io, cg->chart_labels);
3091
- rrddim_add(cg->st_io, "write", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
3091
rrddim_add(cg->st_io, "read", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
3092
+ rrddim_add(cg->st_io, "write", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
3093
}
3094
-
3095
- rrddim_set(cg->st_io, "write", cg->io_service_bytes.Write);
3094
rrddim_set(cg->st_io, "read", cg->io_service_bytes.Read);
3095
+ rrddim_set(cg->st_io, "write", cg->io_service_bytes.Write);
3096
rrdset_done(cg->st_io);
3097
}
3098
@@ -3115,10 +3114,10 @@ void update_systemd_services_charts(
3114
3115
rrdset_update_rrdlabels(cg->st_serviced_ops, cg->chart_labels);
3116
rrddim_add(cg->st_serviced_ops, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3118
- rrddim_add(cg->st_serviced_ops, "write", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3117
+ rrddim_add(cg->st_serviced_ops, "write", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3118
}
3120
- rrddim_set(cg->st_serviced_ops, "write", cg->io_serviced.Write);
3119
rrddim_set(cg->st_serviced_ops, "read", cg->io_serviced.Read);
3120
+ rrddim_set(cg->st_serviced_ops, "write", cg->io_serviced.Write);
3121
rrdset_done(cg->st_serviced_ops);
3122
}
3123
@@ -3140,11 +3139,10 @@ void update_systemd_services_charts(
3139
3140
rrdset_update_rrdlabels(cg->st_throttle_io, cg->chart_labels);
3141
rrddim_add(cg->st_throttle_io, "read", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
3143
- rrddim_add(cg->st_throttle_io, "write", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
3142
+ rrddim_add(cg->st_throttle_io, "write", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
3143
}
3145
-
3146
- rrddim_set(cg->st_throttle_io, "write", cg->throttle_io_service_bytes.Write);
3144
rrddim_set(cg->st_throttle_io, "read", cg->throttle_io_service_bytes.Read);
3145
+ rrddim_set(cg->st_throttle_io, "write", cg->throttle_io_service_bytes.Write);
3146
rrdset_done(cg->st_throttle_io);
3147
}
3148
@@ -3166,11 +3164,10 @@ void update_systemd_services_charts(
3164
3165
rrdset_update_rrdlabels(cg->st_throttle_serviced_ops, cg->chart_labels);
3166
rrddim_add(cg->st_throttle_serviced_ops, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3169
- rrddim_add(cg->st_throttle_serviced_ops, "write", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3167
+ rrddim_add(cg->st_throttle_serviced_ops, "write", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3168
}
3171
-
3172
- rrddim_set(cg->st_throttle_serviced_ops, "write", cg->throttle_io_serviced.Write);
3169
rrddim_set(cg->st_throttle_serviced_ops, "read", cg->throttle_io_serviced.Read);
3170
+ rrddim_set(cg->st_throttle_serviced_ops, "write", cg->throttle_io_serviced.Write);
3171
rrdset_done(cg->st_throttle_serviced_ops);
3172
}
3173
@@ -3192,10 +3189,10 @@ void update_systemd_services_charts(
3189
3190
rrdset_update_rrdlabels(cg->st_queued_ops, cg->chart_labels);
3191
rrddim_add(cg->st_queued_ops, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3195
- rrddim_add(cg->st_queued_ops, "write", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3192
+ rrddim_add(cg->st_queued_ops, "write", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3193
}
3197
- rrddim_set(cg->st_queued_ops, "write", cg->io_queued.Write);
3194
rrddim_set(cg->st_queued_ops, "read", cg->io_queued.Read);
3195
+ rrddim_set(cg->st_queued_ops, "write", cg->io_queued.Write);
3196
rrdset_done(cg->st_queued_ops);
3197
}
3198
@@ -3217,11 +3214,10 @@ void update_systemd_services_charts(
3214
3215
rrdset_update_rrdlabels(cg->st_merged_ops, cg->chart_labels);
3216
rrddim_add(cg->st_merged_ops, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3220
- rrddim_add(cg->st_merged_ops, "write", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
3217
+ rrddim_add(cg->st_merged_ops, "write", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
3218
}
3222
-
3223
- rrddim_set(cg->st_merged_ops, "write", cg->io_merged.Write);
3219
rrddim_set(cg->st_merged_ops, "read", cg->io_merged.Read);
3220
+ rrddim_set(cg->st_merged_ops, "write", cg->io_merged.Write);
3221
rrdset_done(cg->st_merged_ops);
3222
}
3223
}