@cryptotaxi247 / netdata-1 / commits / 6ef59cc1a

added systemd services detailed memory charts (disabled by default)

Costa Tsaousis (ktsaou) committed Jan 17, 2017 at 23:54 UTC 6ef59cc1ade3e73c1a7d2c2ce448cedffe5ecfc9
1 file changed +310 -163
src/sys_fs_cgroup.c
+310 -163
@@ -3,6 +3,11 @@
3 // ----------------------------------------------------------------------------
4 // cgroup globals
5
6 +#define CHART_PRIORITY_SYSTEMD_SERVICES 19000
7 +#define CHART_PRIORITY_CONTAINERS 40000
8 +
9 +static long system_page_size = 4096; // system will be queried via sysconf() in configuration()
10 +
11 static int cgroup_enable_cpuacct_stat = CONFIG_ONDEMAND_ONDEMAND;
12 static int cgroup_enable_cpuacct_usage = CONFIG_ONDEMAND_ONDEMAND;
13 static int cgroup_enable_memory = CONFIG_ONDEMAND_ONDEMAND;
@@ -16,6 +21,7 @@ static int cgroup_enable_blkio_throttle_ops = CONFIG_ONDEMAND_ONDEMAND;
21 static int cgroup_enable_blkio_merged_ops = CONFIG_ONDEMAND_ONDEMAND;
22 static int cgroup_enable_blkio_queued_ops = CONFIG_ONDEMAND_ONDEMAND;
23 static int cgroup_enable_systemd_services = CONFIG_ONDEMAND_YES;
24 +static int cgroup_enable_systemd_services_detailed_memory = CONFIG_ONDEMAND_NO;
25
26 static int cgroup_search_in_devices = 1;
27
@@ -36,9 +42,9 @@ static int cgroup_root_count = 0;
42 static int cgroup_root_max = 500;
43 static int cgroup_max_depth = 0;
44
39 -static SIMPLE_PATTERN *disabled_cgroups_patterns = NULL;
40 -static SIMPLE_PATTERN *disabled_cgroup_paths = NULL;
41 -static SIMPLE_PATTERN *disabled_cgroup_renames = NULL;
45 +static SIMPLE_PATTERN *enabled_cgroup_patterns = NULL;
46 +static SIMPLE_PATTERN *enabled_cgroup_paths = NULL;
47 +static SIMPLE_PATTERN *enabled_cgroup_renames = NULL;
48 static SIMPLE_PATTERN *systemd_services_cgroups = NULL;
49
50 static char *cgroups_rename_script = PLUGINS_DIR "/cgroup-name.sh";
@@ -85,6 +91,8 @@ static uint32_t total_active_file_hash = 0;
91 static uint32_t total_unevictable_hash = 0;
92
93 void read_cgroup_plugin_configuration() {
94 + system_page_size = sysconf(_SC_PAGESIZE);
95 +
96 Read_hash = simple_hash("Read");
97 Write_hash = simple_hash("Write");
98 Sync_hash = simple_hash("Sync");
@@ -154,6 +162,7 @@ void read_cgroup_plugin_configuration() {
162 cgroup_recheck_zero_mem_detailed_every_iterations = (int)config_get_number("plugin:cgroups", "recheck zero detailed memory every iterations", cgroup_recheck_zero_mem_detailed_every_iterations);
163
164 cgroup_enable_systemd_services = config_get_boolean("plugin:cgroups", "enable systemd services", cgroup_enable_systemd_services);
165 + cgroup_enable_systemd_services_detailed_memory = config_get_boolean("plugin:cgroups", "enable systemd services detailed memory", cgroup_enable_systemd_services_detailed_memory);
166
167 char filename[FILENAME_MAX + 1], *s;
168 struct mountinfo *mi, *root = mountinfo_read(0);
@@ -203,57 +212,61 @@ void read_cgroup_plugin_configuration() {
212
213 cgroup_enable_new_cgroups_detected_at_runtime = config_get_boolean("plugin:cgroups", "enable new cgroups detected at run time", cgroup_enable_new_cgroups_detected_at_runtime);
214
206 - disabled_cgroups_patterns = simple_pattern_create(
207 - config_get("plugin:cgroups", "disable by default cgroups matching", " *.mount "
208 - " *.partition "
209 - " *.service "
210 - " *.slice "
211 - " *.swap "
212 - " *.user "
213 - " / "
214 - " /docker "
215 - " /init.scope "
216 - " /libvirt "
217 - " /lxc "
218 - " /lxc/*/ns " // #1397
219 - " /machine "
220 - " /machine.slice "
221 - " /qemu "
222 - " /system "
223 - " /system.slice "
224 - " /systemd "
225 - " /user "
226 - " /user.slice "
215 + enabled_cgroup_patterns = simple_pattern_create(
216 + config_get("plugin:cgroups", "enable by default cgroups matching",
217 + " !*.mount "
218 + " !*.partition "
219 + " !*.scope "
220 + " !*.service "
221 + " !*.slice "
222 + " !*.swap "
223 + " !*.user "
224 + " !/ "
225 + " !/docker "
226 + " !/libvirt "
227 + " !/lxc "
228 + " !/lxc/*/ns " // #1397
229 + " !/machine "
230 + " !/qemu "
231 + " !/system "
232 + " !/systemd "
233 + " !/user "
234 + " * " // enable anything else
235 ), SIMPLE_PATTERN_EXACT);
236
229 - disabled_cgroup_paths = simple_pattern_create(
230 - config_get("plugin:cgroups", "do not search for cgroups in paths matching"
231 - , " *-qemu " // #345
232 - " /init.scope "
233 - " /system "
234 - " /systemd "
235 - " /user "
236 - " /user.slice "
237 + enabled_cgroup_paths = simple_pattern_create(
238 + config_get("plugin:cgroups", "search for cgroups in subpaths matching",
239 + " !*-qemu " // #345
240 + " !/init.scope "
241 + " !/system "
242 + " !/systemd "
243 + " !/user "
244 + " !/user.slice "
245 + " * "
246 ), SIMPLE_PATTERN_EXACT);
247
248 cgroups_rename_script = config_get("plugin:cgroups", "script to get cgroup names", cgroups_rename_script);
249
241 - disabled_cgroup_renames = simple_pattern_create(
242 - config_get("plugin:cgroups", "do not run script to rename cgroups matching", " / "
243 - " *.mount "
244 - " *.partition "
245 - " *.scope "
246 - " *.service "
247 - " *.slice "
248 - " *.swap "
249 - " *.user "
250 + enabled_cgroup_renames = simple_pattern_create(
251 + config_get("plugin:cgroups", "run script to rename cgroups matching",
252 + " !/ "
253 + " !*.mount "
254 + " !*.partition "
255 + " !*.scope "
256 + " !*.service "
257 + " !*.slice "
258 + " !*.swap "
259 + " !*.user "
260 + " * "
261 ), SIMPLE_PATTERN_EXACT);
262
252 - if(cgroup_enable_systemd_services)
263 + if(cgroup_enable_systemd_services) {
264 systemd_services_cgroups = simple_pattern_create(
254 - config_get("plugin:cgroups", "cgroups to match as systemd services"
255 - , " !/system.slice/*/*.service /system.slice/*.service "
265 + config_get("plugin:cgroups", "cgroups to match as systemd services",
266 + " !/system.slice/*/*.service "
267 + " /system.slice/*.service "
268 ), SIMPLE_PATTERN_EXACT);
269 + }
270
271 mountinfo_free(root);
272 }
@@ -279,18 +292,27 @@ struct blkio {
292
293 // https://www.kernel.org/doc/Documentation/cgroup-v1/memory.txt
294 struct memory {
282 - int updated;
283 - int enabled_usage; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
284 - int enabled_detailed; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
285 - int enabled_swap; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
286 - int enabled_failcnt; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
295 + int updated_detailed;
296 + int updated_usage_in_bytes;
297 + int updated_msw_usage_in_bytes;
298 + int updated_failcnt;
299
288 - int delay_counter;
300 + int enabled_detailed; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
301 + int enabled_usage_in_bytes; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
302 + int enabled_msw_usage_in_bytes; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
303 + int enabled_failcnt; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
304
290 - char *filename;
305 + int delay_counter_detailed;
306 + int delay_counter_failcnt;
307
292 - int has_dirty_swap;
308 + char *filename_detailed;
309 + char *filename_usage_in_bytes;
310 + char *filename_msw_usage_in_bytes;
311 + char *filename_failcnt;
312
313 + int detailed_has_dirty_swap;
314 +
315 + // detailed metrics
316 unsigned long long cache;
317 unsigned long long rss;
318 unsigned long long rss_huge;
@@ -327,17 +349,9 @@ struct memory {
349 unsigned long long total_unevictable;
350 */
351
330 - int usage_in_bytes_updated;
331 - char *filename_usage_in_bytes;
352 + // single file metrics
353 unsigned long long usage_in_bytes;
333 -
334 - int msw_usage_in_bytes_updated;
335 - char *filename_msw_usage_in_bytes;
354 unsigned long long msw_usage_in_bytes;
337 -
338 - int failcnt_updated;
339 - int failcnt_delay_counter;
340 - char *filename_failcnt;
355 unsigned long long failcnt;
356 };
357
@@ -416,6 +430,17 @@ struct cgroup {
430 RRDDIM *rd_mem_failcnt;
431 RRDDIM *rd_swap_usage;
432
433 + RRDDIM *rd_mem_detailed_cache;
434 + RRDDIM *rd_mem_detailed_rss;
435 + RRDDIM *rd_mem_detailed_mapped;
436 + RRDDIM *rd_mem_detailed_writeback;
437 + RRDDIM *rd_mem_detailed_dirty;
438 + RRDDIM *rd_mem_detailed_swap;
439 + RRDDIM *rd_mem_detailed_pgpgin;
440 + RRDDIM *rd_mem_detailed_pgpgout;
441 + RRDDIM *rd_mem_detailed_pgfault;
442 + RRDDIM *rd_mem_detailed_pgmajfault;
443 +
444 RRDDIM *rd_io_service_bytes_read;
445 RRDDIM *rd_io_serviced_read;
446 RRDDIM *rd_throttle_io_read;
@@ -622,29 +647,29 @@ static inline void cgroup_read_memory(struct memory *mem) {
647 static procfile *ff = NULL;
648
649 // read detailed ram usage
625 - if(likely(mem->filename)) {
626 - if(unlikely(mem->enabled_detailed == CONFIG_ONDEMAND_ONDEMAND && mem->delay_counter > 0)) {
627 - mem->delay_counter--;
650 + if(likely(mem->filename_detailed)) {
651 + if(unlikely(mem->enabled_detailed == CONFIG_ONDEMAND_ONDEMAND && mem->delay_counter_detailed > 0)) {
652 + mem->delay_counter_detailed--;
653 goto memory_next;
654 }
655
631 - ff = procfile_reopen(ff, mem->filename, NULL, PROCFILE_FLAG_DEFAULT);
656 + ff = procfile_reopen(ff, mem->filename_detailed, NULL, PROCFILE_FLAG_DEFAULT);
657 if(unlikely(!ff)) {
633 - mem->updated = 0;
658 + mem->updated_detailed = 0;
659 goto memory_next;
660 }
661
662 ff = procfile_readall(ff);
663 if(unlikely(!ff)) {
639 - mem->updated = 0;
664 + mem->updated_detailed = 0;
665 goto memory_next;
666 }
667
668 unsigned long i, lines = procfile_lines(ff);
669
670 if(unlikely(lines < 1)) {
646 - error("File '%s' should have 1+ lines.", mem->filename);
647 - mem->updated = 0;
671 + error("File '%s' should have 1+ lines.", mem->filename_detailed);
672 + mem->updated_detailed = 0;
673 goto memory_next;
674 }
675
@@ -679,13 +704,13 @@ static inline void cgroup_read_memory(struct memory *mem) {
704
705 if(unlikely(hash == dirty_hash && !strcmp(s, "dirty"))) {
706 mem->dirty = strtoull(procfile_lineword(ff, i, 1), NULL, 10);
682 - mem->has_dirty_swap = 1;
707 + mem->detailed_has_dirty_swap = 1;
708 continue;
709 }
710
711 if(unlikely(hash == swap_hash && !strcmp(s, "swap"))) {
712 mem->swap = strtoull(procfile_lineword(ff, i, 1), NULL, 10);
688 - mem->has_dirty_swap = 1;
713 + mem->detailed_has_dirty_swap = 1;
714 continue;
715 }
716
@@ -824,13 +849,13 @@ static inline void cgroup_read_memory(struct memory *mem) {
849
850 // fprintf(stderr, "READ: '%s', cache: %llu, rss: %llu, rss_huge: %llu, mapped_file: %llu, writeback: %llu, dirty: %llu, swap: %llu, pgpgin: %llu, pgpgout: %llu, pgfault: %llu, pgmajfault: %llu, inactive_anon: %llu, active_anon: %llu, inactive_file: %llu, active_file: %llu, unevictable: %llu, hierarchical_memory_limit: %llu, total_cache: %llu, total_rss: %llu, total_rss_huge: %llu, total_mapped_file: %llu, total_writeback: %llu, total_dirty: %llu, total_swap: %llu, total_pgpgin: %llu, total_pgpgout: %llu, total_pgfault: %llu, total_pgmajfault: %llu, total_inactive_anon: %llu, total_active_anon: %llu, total_inactive_file: %llu, total_active_file: %llu, total_unevictable: %llu\n", mem->filename, mem->cache, mem->rss, mem->rss_huge, mem->mapped_file, mem->writeback, mem->dirty, mem->swap, mem->pgpgin, mem->pgpgout, mem->pgfault, mem->pgmajfault, mem->inactive_anon, mem->active_anon, mem->inactive_file, mem->active_file, mem->unevictable, mem->hierarchical_memory_limit, mem->total_cache, mem->total_rss, mem->total_rss_huge, mem->total_mapped_file, mem->total_writeback, mem->total_dirty, mem->total_swap, mem->total_pgpgin, mem->total_pgpgout, mem->total_pgfault, mem->total_pgmajfault, mem->total_inactive_anon, mem->total_active_anon, mem->total_inactive_file, mem->total_active_file, mem->total_unevictable);
851
827 - mem->updated = 1;
852 + mem->updated_detailed = 1;
853
854 if(unlikely(mem->enabled_detailed == CONFIG_ONDEMAND_ONDEMAND)) {
855 if(mem->cache || mem->dirty || mem->rss || mem->rss_huge || mem->mapped_file || mem->writeback || mem->swap || mem->pgpgin || mem->pgpgout || mem->pgfault || mem->pgmajfault)
856 mem->enabled_detailed = CONFIG_ONDEMAND_YES;
857 else
833 - mem->delay_counter = cgroup_recheck_zero_mem_detailed_every_iterations;
858 + mem->delay_counter_detailed = cgroup_recheck_zero_mem_detailed_every_iterations;
859 }
860 }
861
@@ -839,39 +864,39 @@ memory_next:
864 // read usage_in_bytes
865 if(likely(mem->filename_usage_in_bytes)) {
866 if(likely(!read_single_number_file(mem->filename_usage_in_bytes, &mem->usage_in_bytes))) {
842 - mem->usage_in_bytes_updated = 1;
867 + mem->updated_usage_in_bytes = 1;
868
844 - if(unlikely(mem->enabled_usage == CONFIG_ONDEMAND_ONDEMAND && mem->usage_in_bytes))
845 - mem->enabled_usage = CONFIG_ONDEMAND_YES;
869 + if(unlikely(mem->enabled_usage_in_bytes == CONFIG_ONDEMAND_ONDEMAND && mem->usage_in_bytes))
870 + mem->enabled_usage_in_bytes = CONFIG_ONDEMAND_YES;
871 }
872 else
848 - mem->usage_in_bytes_updated = 0;
873 + mem->updated_usage_in_bytes = 0;
874 }
875
876 // read msw_usage_in_bytes
877 if(likely(mem->filename_msw_usage_in_bytes)) {
878 if(likely(!read_single_number_file(mem->filename_msw_usage_in_bytes, &mem->msw_usage_in_bytes))) {
854 - mem->msw_usage_in_bytes_updated = 1;
879 + mem->updated_msw_usage_in_bytes = 1;
880
856 - if(unlikely(mem->enabled_swap == CONFIG_ONDEMAND_ONDEMAND && mem->msw_usage_in_bytes))
857 - mem->enabled_swap = CONFIG_ONDEMAND_YES;
881 + if(unlikely(mem->enabled_msw_usage_in_bytes == CONFIG_ONDEMAND_ONDEMAND && mem->msw_usage_in_bytes))
882 + mem->enabled_msw_usage_in_bytes = CONFIG_ONDEMAND_YES;
883 }
884 else
860 - mem->msw_usage_in_bytes_updated = 0;
885 + mem->updated_msw_usage_in_bytes = 0;
886 }
887
888 // read failcnt
889 if(likely(mem->filename_failcnt)) {
865 - if(unlikely(mem->enabled_failcnt == CONFIG_ONDEMAND_ONDEMAND && mem->failcnt_delay_counter > 0)) {
866 - mem->failcnt_updated = 0;
867 - mem->failcnt_delay_counter--;
890 + if(unlikely(mem->enabled_failcnt == CONFIG_ONDEMAND_ONDEMAND && mem->delay_counter_failcnt > 0)) {
891 + mem->updated_failcnt = 0;
892 + mem->delay_counter_failcnt--;
893 }
894 else if(likely(!read_single_number_file(mem->filename_failcnt, &mem->failcnt))) {
870 - mem->failcnt_updated = 1;
895 + mem->updated_failcnt = 1;
896
897 if(unlikely(mem->enabled_failcnt == CONFIG_ONDEMAND_ONDEMAND)) {
898 if(unlikely(!mem->failcnt))
874 - mem->failcnt_delay_counter = cgroup_recheck_zero_mem_failcnt_every_iterations;
899 + mem->delay_counter_failcnt = cgroup_recheck_zero_mem_failcnt_every_iterations;
900 else
901 mem->enabled_failcnt = CONFIG_ONDEMAND_YES;
902 }
@@ -973,7 +998,7 @@ static inline struct cgroup *cgroup_add(const char *id) {
998 return NULL;
999 }
1000
976 - int def = simple_pattern_matches(disabled_cgroups_patterns, id)?0:cgroup_enable_new_cgroups_detected_at_runtime;
1001 + int def = simple_pattern_matches(enabled_cgroup_patterns, id)?cgroup_enable_new_cgroups_detected_at_runtime:0;
1002 struct cgroup *cg = callocz(1, sizeof(struct cgroup));
1003
1004 cg->id = strdupz(id);
@@ -996,8 +1021,8 @@ static inline struct cgroup *cgroup_add(const char *id) {
1021 cgroup_root_count++;
1022
1023 // fix the chart_id and title by calling the external script
999 - if(!simple_pattern_matches(disabled_cgroup_renames, cg->id) &&
1000 - !simple_pattern_matches(disabled_cgroup_renames, cg->chart_id)) {
1024 + if(simple_pattern_matches(enabled_cgroup_renames, cg->id) ||
1025 + simple_pattern_matches(enabled_cgroup_renames, cg->chart_id)) {
1026
1027 cgroup_get_chart_name(cg);
1028
@@ -1093,7 +1118,7 @@ static inline void cgroup_free(struct cgroup *cg) {
1118 freez(cg->cpuacct_stat.filename);
1119 freez(cg->cpuacct_usage.filename);
1120
1096 - freez(cg->memory.filename);
1121 + freez(cg->memory.filename_detailed);
1122 freez(cg->memory.filename_failcnt);
1123 freez(cg->memory.filename_usage_in_bytes);
1124 freez(cg->memory.filename_msw_usage_in_bytes);
@@ -1197,9 +1222,7 @@ static inline int find_dir_in_subdirs(const char *base, const char *this, void (
1222 if(*r == '\0') r = "/";
1223
1224 // do not decent in directories we are not interested
1200 - int def = 1;
1201 - if(simple_pattern_matches(disabled_cgroup_paths, r))
1202 - def = 0;
1225 + int def = simple_pattern_matches(enabled_cgroup_paths, r);
1226
1227 // we check for this option here
1228 // so that the config will not have settings
@@ -1354,12 +1377,12 @@ static inline void find_all_cgroups() {
1377 debug(D_CGROUP, "cpuacct.usage_percpu file for cgroup '%s': '%s' does not exist.", cg->id, filename);
1378 }
1379
1357 - if(unlikely(cgroup_enable_detailed_memory && !cg->memory.filename && !(cg->options & CGROUP_OPTIONS_SYSTEM_SLICE_SERVICE))) {
1380 + if(unlikely(cgroup_enable_detailed_memory && !cg->memory.filename_detailed && (cgroup_enable_systemd_services_detailed_memory || !(cg->options & CGROUP_OPTIONS_SYSTEM_SLICE_SERVICE)))) {
1381 snprintfz(filename, FILENAME_MAX, "%s%s/memory.stat", cgroup_memory_base, cg->id);
1382 if(likely(stat(filename, &buf) != -1)) {
1360 - cg->memory.filename = strdupz(filename);
1383 + cg->memory.filename_detailed = strdupz(filename);
1384 cg->memory.enabled_detailed = cgroup_enable_detailed_memory;
1362 - debug(D_CGROUP, "memory.stat filename for cgroup '%s': '%s'", cg->id, cg->memory.filename);
1385 + debug(D_CGROUP, "memory.stat filename for cgroup '%s': '%s'", cg->id, cg->memory.filename_detailed);
1386 }
1387 else
1388 debug(D_CGROUP, "memory.stat file for cgroup '%s': '%s' does not exist.", cg->id, filename);
@@ -1369,7 +1392,7 @@ static inline void find_all_cgroups() {
1392 snprintfz(filename, FILENAME_MAX, "%s%s/memory.usage_in_bytes", cgroup_memory_base, cg->id);
1393 if(likely(stat(filename, &buf) != -1)) {
1394 cg->memory.filename_usage_in_bytes = strdupz(filename);
1372 - cg->memory.enabled_usage = cgroup_enable_memory;
1395 + cg->memory.enabled_usage_in_bytes = cgroup_enable_memory;
1396 debug(D_CGROUP, "memory.usage_in_bytes filename for cgroup '%s': '%s'", cg->id, cg->memory.filename_usage_in_bytes);
1397 }
1398 else
@@ -1380,7 +1403,7 @@ static inline void find_all_cgroups() {
1403 snprintfz(filename, FILENAME_MAX, "%s%s/memory.msw_usage_in_bytes", cgroup_memory_base, cg->id);
1404 if(likely(stat(filename, &buf) != -1)) {
1405 cg->memory.filename_msw_usage_in_bytes = strdupz(filename);
1383 - cg->memory.enabled_swap = cgroup_enable_swap;
1406 + cg->memory.enabled_msw_usage_in_bytes = cgroup_enable_swap;
1407 debug(D_CGROUP, "memory.msw_usage_in_bytes filename for cgroup '%s': '%s'", cg->id, cg->memory.filename_msw_usage_in_bytes);
1408 }
1409 else
@@ -1477,6 +1500,7 @@ static inline void find_all_cgroups() {
1500 void update_services_charts(int update_every,
1501 int do_cpu,
1502 int do_mem_usage,
1503 + int do_mem_detailed,
1504 int do_mem_failcnt,
1505 int do_swap_usage,
1506 int do_io,
@@ -1487,24 +1511,33 @@ void update_services_charts(int update_every,
1511 int do_merged_ops
1512 ) {
1513 static RRDSET
1490 - *st_cpu = NULL,
1491 - *st_mem_usage = NULL,
1492 - *st_mem_failcnt = NULL,
1493 - *st_swap_usage = NULL,
1494 -
1495 - *st_io_read = NULL,
1496 - *st_io_serviced_read = NULL,
1497 - *st_throttle_io_read = NULL,
1498 - *st_throttle_ops_read = NULL,
1499 - *st_queued_ops_read = NULL,
1500 - *st_merged_ops_read = NULL,
1501 -
1502 - *st_io_write = NULL,
1503 - *st_io_serviced_write = NULL,
1504 - *st_throttle_io_write = NULL,
1505 - *st_throttle_ops_write = NULL,
1506 - *st_queued_ops_write = NULL,
1507 - *st_merged_ops_write = NULL;
1514 + *st_cpu = NULL,
1515 + *st_mem_usage = NULL,
1516 + *st_mem_failcnt = NULL,
1517 + *st_swap_usage = NULL,
1518 +
1519 + *st_mem_detailed_cache = NULL,
1520 + *st_mem_detailed_rss = NULL,
1521 + *st_mem_detailed_mapped = NULL,
1522 + *st_mem_detailed_writeback = NULL,
1523 + *st_mem_detailed_pgfault = NULL,
1524 + *st_mem_detailed_pgmajfault = NULL,
1525 + *st_mem_detailed_pgpgin = NULL,
1526 + *st_mem_detailed_pgpgout = NULL,
1527 +
1528 + *st_io_read = NULL,
1529 + *st_io_serviced_read = NULL,
1530 + *st_throttle_io_read = NULL,
1531 + *st_throttle_ops_read = NULL,
1532 + *st_queued_ops_read = NULL,
1533 + *st_merged_ops_read = NULL,
1534 +
1535 + *st_io_write = NULL,
1536 + *st_io_serviced_write = NULL,
1537 + *st_throttle_io_write = NULL,
1538 + *st_throttle_ops_write = NULL,
1539 + *st_queued_ops_write = NULL,
1540 + *st_merged_ops_write = NULL;
1541
1542 // create the charts
1543
@@ -1515,7 +1548,7 @@ void update_services_charts(int update_every,
1548 st_cpu = rrdset_find_bytype("services", "cpu");
1549 if(likely(!st_cpu)) {
1550 snprintfz(title, CHART_TITLE_MAX, "Systemd Services CPU utilization (%d%% = %d core%s)", (processors * 100), processors, (processors > 1) ? "s" : "");
1518 - st_cpu = rrdset_create("services", "cpu", NULL, "cpu", "services.cpu", title, "%", 30000, update_every, RRDSET_TYPE_STACKED);
1551 + st_cpu = rrdset_create("services", "cpu", NULL, "cpu", "services.cpu", title, "%", CHART_PRIORITY_SYSTEMD_SERVICES, update_every, RRDSET_TYPE_STACKED);
1552 }
1553 }
1554 else
@@ -1526,17 +1559,83 @@ void update_services_charts(int update_every,
1559 if(unlikely(!st_mem_usage)) {
1560 st_mem_usage = rrdset_find_bytype("services", "mem_usage");
1561 if(likely(!st_mem_usage))
1529 - st_mem_usage = rrdset_create("services", "mem_usage", NULL, "mem", "services.mem_usage", "Systemd Services Used RAM with Cache", "MB", 30001, update_every, RRDSET_TYPE_STACKED);
1562 + st_mem_usage = rrdset_create("services", "mem_usage", NULL, "mem", "services.mem_usage", "Systemd Services Used Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 10, update_every, RRDSET_TYPE_STACKED);
1563 }
1564 else
1565 rrdset_next(st_mem_usage);
1566 }
1567
1568 + if(likely(do_mem_detailed)) {
1569 + if(unlikely(!st_mem_detailed_rss)) {
1570 + st_mem_detailed_rss = rrdset_find_bytype("services", "mem_rss");
1571 + if(likely(!st_mem_detailed_rss))
1572 + st_mem_detailed_rss = rrdset_create("services", "mem_rss", NULL, "mem", "services.mem_rss", "Systemd Services RSS Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 20, update_every, RRDSET_TYPE_STACKED);
1573 + }
1574 + else
1575 + rrdset_next(st_mem_detailed_rss);
1576 +
1577 + if(unlikely(!st_mem_detailed_mapped)) {
1578 + st_mem_detailed_mapped = rrdset_find_bytype("services", "mem_mapped");
1579 + if(likely(!st_mem_detailed_mapped))
1580 + st_mem_detailed_mapped = rrdset_create("services", "mem_mapped", NULL, "mem", "services.mem_mapped", "Systemd Services Mapped Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 30, update_every, RRDSET_TYPE_STACKED);
1581 + }
1582 + else
1583 + rrdset_next(st_mem_detailed_mapped);
1584 +
1585 + if(unlikely(!st_mem_detailed_cache)) {
1586 + st_mem_detailed_cache = rrdset_find_bytype("services", "mem_cache");
1587 + if(likely(!st_mem_detailed_cache))
1588 + st_mem_detailed_cache = rrdset_create("services", "mem_cache", NULL, "mem", "services.mem_cache", "Systemd Services Cache Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 40, update_every, RRDSET_TYPE_STACKED);
1589 + }
1590 + else
1591 + rrdset_next(st_mem_detailed_cache);
1592 +
1593 + if(unlikely(!st_mem_detailed_writeback)) {
1594 + st_mem_detailed_writeback = rrdset_find_bytype("services", "mem_writeback");
1595 + if(likely(!st_mem_detailed_writeback))
1596 + st_mem_detailed_writeback = rrdset_create("services", "mem_writeback", NULL, "mem", "services.mem_writeback", "Systemd Services Writeback Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 50, update_every, RRDSET_TYPE_STACKED);
1597 + }
1598 + else
1599 + rrdset_next(st_mem_detailed_writeback);
1600 +
1601 + if(unlikely(!st_mem_detailed_pgfault)) {
1602 + st_mem_detailed_pgfault = rrdset_find_bytype("services", "mem_pgfault");
1603 + if(likely(!st_mem_detailed_pgfault))
1604 + st_mem_detailed_pgfault = rrdset_create("services", "mem_pgfault", NULL, "mem", "services.mem_pgfault", "Systemd Services Memory Minor Page Faults", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 60, update_every, RRDSET_TYPE_STACKED);
1605 + }
1606 + else
1607 + rrdset_next(st_mem_detailed_pgfault);
1608 +
1609 + if(unlikely(!st_mem_detailed_pgmajfault)) {
1610 + st_mem_detailed_pgmajfault = rrdset_find_bytype("services", "mem_pgmajfault");
1611 + if(likely(!st_mem_detailed_pgmajfault))
1612 + st_mem_detailed_pgmajfault = rrdset_create("services", "mem_pgmajfault", NULL, "mem", "services.mem_pgmajfault", "Systemd Services Memory Major Page Faults", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 70, update_every, RRDSET_TYPE_STACKED);
1613 + }
1614 + else
1615 + rrdset_next(st_mem_detailed_pgmajfault);
1616 +
1617 + if(unlikely(!st_mem_detailed_pgpgin)) {
1618 + st_mem_detailed_pgpgin = rrdset_find_bytype("services", "mem_pgpgin");
1619 + if(likely(!st_mem_detailed_pgpgin))
1620 + st_mem_detailed_pgpgin = rrdset_create("services", "mem_pgpgin", NULL, "mem", "services.mem_pgpgin", "Systemd Services Memory Charging Activity", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 80, update_every, RRDSET_TYPE_STACKED);
1621 + }
1622 + else
1623 + rrdset_next(st_mem_detailed_pgpgin);
1624 +
1625 + if(unlikely(!st_mem_detailed_pgpgout)) {
1626 + st_mem_detailed_pgpgout = rrdset_find_bytype("services", "mem_pgpgout");
1627 + if(likely(!st_mem_detailed_pgpgout))
1628 + st_mem_detailed_pgpgout = rrdset_create("services", "mem_pgpgout", NULL, "mem", "services.mem_pgpgout", "Systemd Services Memory Uncharging Activity", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 90, update_every, RRDSET_TYPE_STACKED);
1629 + }
1630 + else
1631 + rrdset_next(st_mem_detailed_pgpgout);
1632 + }
1633 +
1634 if(likely(do_mem_failcnt)) {
1635 if(unlikely(!st_mem_failcnt)) {
1636 st_mem_failcnt = rrdset_find_bytype("services", "mem_failcnt");
1637 if(likely(!st_mem_failcnt))
1539 - st_mem_failcnt = rrdset_create("services", "mem_failcnt", NULL, "mem", "services.mem_failcnt", "Systemd Services Memory Limit Failures", "MB", 30003, update_every, RRDSET_TYPE_STACKED);
1638 + st_mem_failcnt = rrdset_create("services", "mem_failcnt", NULL, "mem", "services.mem_failcnt", "Systemd Services Memory Limit Failures", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 110, update_every, RRDSET_TYPE_STACKED);
1639 }
1640 else
1641 rrdset_next(st_mem_failcnt);
@@ -1546,7 +1645,7 @@ void update_services_charts(int update_every,
1645 if(unlikely(!st_swap_usage)) {
1646 st_swap_usage = rrdset_find_bytype("services", "swap_usage");
1647 if(likely(!st_swap_usage))
1549 - st_swap_usage = rrdset_create("services", "swap_usage", NULL, "swap", "services.swap_usage", "Systemd Services Swap Memory Used", "MB", 30002, update_every, RRDSET_TYPE_STACKED);
1648 + st_swap_usage = rrdset_create("services", "swap_usage", NULL, "swap", "services.swap_usage", "Systemd Services Swap Memory Used", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 100, update_every, RRDSET_TYPE_STACKED);
1649 }
1650 else
1651 rrdset_next(st_swap_usage);
@@ -1556,7 +1655,7 @@ void update_services_charts(int update_every,
1655 if(unlikely(!st_io_read)) {
1656 st_io_read = rrdset_find_bytype("services", "io_read");
1657 if(likely(!st_io_read))
1559 - st_io_read = rrdset_create("services", "io_read", NULL, "disk", "services.io_read", "Systemd Services Disk Read Bandwidth", "KB/s", 30012, update_every, RRDSET_TYPE_STACKED);
1658 + st_io_read = rrdset_create("services", "io_read", NULL, "disk", "services.io_read", "Systemd Services Disk Read Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 120, update_every, RRDSET_TYPE_STACKED);
1659 }
1660 else
1661 rrdset_next(st_io_read);
@@ -1564,7 +1663,7 @@ void update_services_charts(int update_every,
1663 if(unlikely(!st_io_write)) {
1664 st_io_write = rrdset_find_bytype("services", "io_write");
1665 if(likely(!st_io_write))
1567 - st_io_write = rrdset_create("services", "io_write", NULL, "disk", "services.io_write", "Systemd Services Disk Write Bandwidth", "KB/s", 30013, update_every, RRDSET_TYPE_STACKED);
1666 + st_io_write = rrdset_create("services", "io_write", NULL, "disk", "services.io_write", "Systemd Services Disk Write Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 130, update_every, RRDSET_TYPE_STACKED);
1667 }
1668 else
1669 rrdset_next(st_io_write);
@@ -1574,7 +1673,7 @@ void update_services_charts(int update_every,
1673 if(unlikely(!st_io_serviced_read)) {
1674 st_io_serviced_read = rrdset_find_bytype("services", "io_ops_read");
1675 if(likely(!st_io_serviced_read))
1577 - st_io_serviced_read = rrdset_create("services", "io_ops_read", NULL, "disk", "services.io_ops_read", "Systemd Services Disk Read Operations", "operations/s", 30014, update_every, RRDSET_TYPE_STACKED);
1676 + st_io_serviced_read = rrdset_create("services", "io_ops_read", NULL, "disk", "services.io_ops_read", "Systemd Services Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 140, update_every, RRDSET_TYPE_STACKED);
1677 }
1678 else
1679 rrdset_next(st_io_serviced_read);
@@ -1582,7 +1681,7 @@ void update_services_charts(int update_every,
1681 if(unlikely(!st_io_serviced_write)) {
1682 st_io_serviced_write = rrdset_find_bytype("services", "io_ops_write");
1683 if(likely(!st_io_serviced_write))
1585 - st_io_serviced_write = rrdset_create("services", "io_ops_write", NULL, "disk", "services.io_ops_write", "Systemd Services Disk Write Operations", "operations/s", 30015, update_every, RRDSET_TYPE_STACKED);
1684 + st_io_serviced_write = rrdset_create("services", "io_ops_write", NULL, "disk", "services.io_ops_write", "Systemd Services Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 150, update_every, RRDSET_TYPE_STACKED);
1685 }
1686 else
1687 rrdset_next(st_io_serviced_write);
@@ -1592,7 +1691,7 @@ void update_services_charts(int update_every,
1691 if(unlikely(!st_throttle_io_read)) {
1692 st_throttle_io_read = rrdset_find_bytype("services", "throttle_io_read");
1693 if(likely(!st_throttle_io_read))
1595 - st_throttle_io_read = rrdset_create("services", "throttle_io_read", NULL, "disk", "services.throttle_io_read", "Systemd Services Throttle Disk Read Bandwidth", "KB/s", 30016, update_every, RRDSET_TYPE_STACKED);
1694 + st_throttle_io_read = rrdset_create("services", "throttle_io_read", NULL, "disk", "services.throttle_io_read", "Systemd Services Throttle Disk Read Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 160, update_every, RRDSET_TYPE_STACKED);
1695 }
1696 else
1697 rrdset_next(st_throttle_io_read);
@@ -1600,7 +1699,7 @@ void update_services_charts(int update_every,
1699 if(unlikely(!st_throttle_io_write)) {
1700 st_throttle_io_write = rrdset_find_bytype("services", "throttle_io_write");
1701 if(likely(!st_throttle_io_write))
1603 - st_throttle_io_write = rrdset_create("services", "throttle_io_write", NULL, "disk", "services.throttle_io_write", "Systemd Services Throttle Disk Write Bandwidth", "KB/s", 30017, update_every, RRDSET_TYPE_STACKED);
1702 + st_throttle_io_write = rrdset_create("services", "throttle_io_write", NULL, "disk", "services.throttle_io_write", "Systemd Services Throttle Disk Write Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 170, update_every, RRDSET_TYPE_STACKED);
1703 }
1704 else
1705 rrdset_next(st_throttle_io_write);
@@ -1610,7 +1709,7 @@ void update_services_charts(int update_every,
1709 if(unlikely(!st_throttle_ops_read)) {
1710 st_throttle_ops_read = rrdset_find_bytype("services", "throttle_io_ops_read");
1711 if(likely(!st_throttle_ops_read))
1613 - st_throttle_ops_read = rrdset_create("services", "throttle_io_ops_read", NULL, "disk", "services.throttle_io_ops_read", "Systemd Services Throttle Disk Read Operations", "operations/s", 30018, update_every, RRDSET_TYPE_STACKED);
1712 + st_throttle_ops_read = rrdset_create("services", "throttle_io_ops_read", NULL, "disk", "services.throttle_io_ops_read", "Systemd Services Throttle Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 180, update_every, RRDSET_TYPE_STACKED);
1713 }
1714 else
1715 rrdset_next(st_throttle_ops_read);
@@ -1618,7 +1717,7 @@ void update_services_charts(int update_every,
1717 if(unlikely(!st_throttle_ops_write)) {
1718 st_throttle_ops_write = rrdset_find_bytype("services", "throttle_io_ops_write");
1719 if(likely(!st_throttle_ops_write))
1621 - st_throttle_ops_write = rrdset_create("services", "throttle_io_ops_write", NULL, "disk", "services.throttle_io_ops_write", "Systemd Services Throttle Disk Write Operations", "operations/s", 30019, update_every, RRDSET_TYPE_STACKED);
1720 + st_throttle_ops_write = rrdset_create("services", "throttle_io_ops_write", NULL, "disk", "services.throttle_io_ops_write", "Systemd Services Throttle Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 190, update_every, RRDSET_TYPE_STACKED);
1721 }
1722 else
1723 rrdset_next(st_throttle_ops_write);
@@ -1628,7 +1727,7 @@ void update_services_charts(int update_every,
1727 if(unlikely(!st_queued_ops_read)) {
1728 st_queued_ops_read = rrdset_find_bytype("services", "queued_io_ops_read");
1729 if(likely(!st_queued_ops_read))
1631 - st_queued_ops_read = rrdset_create("services", "queued_io_ops_read", NULL, "disk", "services.queued_io_ops_read", "Systemd Services Queued Disk Read Operations", "operations/s", 30020, update_every, RRDSET_TYPE_STACKED);
1730 + st_queued_ops_read = rrdset_create("services", "queued_io_ops_read", NULL, "disk", "services.queued_io_ops_read", "Systemd Services Queued Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 200, update_every, RRDSET_TYPE_STACKED);
1731 }
1732 else
1733 rrdset_next(st_queued_ops_read);
@@ -1636,7 +1735,7 @@ void update_services_charts(int update_every,
1735 if(unlikely(!st_queued_ops_write)) {
1736 st_queued_ops_write = rrdset_find_bytype("services", "queued_io_ops_write");
1737 if(likely(!st_queued_ops_write))
1639 - st_queued_ops_write = rrdset_create("services", "queued_io_ops_write", NULL, "disk", "services.queued_io_ops_write", "Systemd Services Queued Disk Write Operations", "operations/s", 30021, update_every, RRDSET_TYPE_STACKED);
1738 + st_queued_ops_write = rrdset_create("services", "queued_io_ops_write", NULL, "disk", "services.queued_io_ops_write", "Systemd Services Queued Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 210, update_every, RRDSET_TYPE_STACKED);
1739 }
1740 else
1741 rrdset_next(st_queued_ops_write);
@@ -1646,7 +1745,7 @@ void update_services_charts(int update_every,
1745 if(unlikely(!st_merged_ops_read)) {
1746 st_merged_ops_read = rrdset_find_bytype("services", "merged_io_ops_read");
1747 if(likely(!st_merged_ops_read))
1649 - st_merged_ops_read = rrdset_create("services", "merged_io_ops_read", NULL, "disk", "services.merged_io_ops_read", "Systemd Services Merged Disk Read Operations", "operations/s", 30022, update_every, RRDSET_TYPE_STACKED);
1748 + st_merged_ops_read = rrdset_create("services", "merged_io_ops_read", NULL, "disk", "services.merged_io_ops_read", "Systemd Services Merged Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 220, update_every, RRDSET_TYPE_STACKED);
1749 }
1750 else
1751 rrdset_next(st_merged_ops_read);
@@ -1654,7 +1753,7 @@ void update_services_charts(int update_every,
1753 if(unlikely(!st_merged_ops_write)) {
1754 st_merged_ops_write = rrdset_find_bytype("services", "merged_io_ops_write");
1755 if(likely(!st_merged_ops_write))
1657 - st_merged_ops_write = rrdset_create("services", "merged_io_ops_write", NULL, "disk", "services.merged_io_ops_write", "Systemd Services Merged Disk Write Operations", "operations/s", 30023, update_every, RRDSET_TYPE_STACKED);
1756 + st_merged_ops_write = rrdset_create("services", "merged_io_ops_write", NULL, "disk", "services.merged_io_ops_write", "Systemd Services Merged Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 230, update_every, RRDSET_TYPE_STACKED);
1757 }
1758 else
1759 rrdset_next(st_merged_ops_write);
@@ -1673,21 +1772,55 @@ void update_services_charts(int update_every,
1772 rrddim_set_by_pointer(st_cpu, cg->rd_cpu, cg->cpuacct_stat.user + cg->cpuacct_stat.system);
1773 }
1774
1676 - if(likely(do_mem_usage && cg->memory.usage_in_bytes_updated)) {
1775 + if(likely(do_mem_usage && cg->memory.updated_usage_in_bytes)) {
1776 if(unlikely(!cg->rd_mem_usage))
1777 cg->rd_mem_usage = rrddim_add(st_mem_usage, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1778
1779 rrddim_set_by_pointer(st_mem_usage, cg->rd_mem_usage, cg->memory.usage_in_bytes);
1780 }
1781
1683 - if(likely(do_mem_failcnt && cg->memory.failcnt_updated)) {
1782 + if(likely(do_mem_detailed && cg->memory.updated_detailed)) {
1783 + if(unlikely(!cg->rd_mem_detailed_rss))
1784 + cg->rd_mem_detailed_rss = rrddim_add(st_mem_detailed_rss, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1785 + rrddim_set_by_pointer(st_mem_detailed_rss, cg->rd_mem_detailed_rss, cg->memory.rss + cg->memory.rss_huge);
1786 +
1787 + if(unlikely(!cg->rd_mem_detailed_mapped))
1788 + cg->rd_mem_detailed_mapped = rrddim_add(st_mem_detailed_mapped, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1789 + rrddim_set_by_pointer(st_mem_detailed_mapped, cg->rd_mem_detailed_mapped, cg->memory.mapped_file);
1790 +
1791 + if(unlikely(!cg->rd_mem_detailed_cache))
1792 + cg->rd_mem_detailed_cache = rrddim_add(st_mem_detailed_cache, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1793 + rrddim_set_by_pointer(st_mem_detailed_cache, cg->rd_mem_detailed_cache, cg->memory.cache);
1794 +
1795 + if(unlikely(!cg->rd_mem_detailed_writeback))
1796 + cg->rd_mem_detailed_writeback = rrddim_add(st_mem_detailed_writeback, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1797 + rrddim_set_by_pointer(st_mem_detailed_writeback, cg->rd_mem_detailed_writeback, cg->memory.writeback);
1798 +
1799 + if(unlikely(!cg->rd_mem_detailed_pgfault))
1800 + cg->rd_mem_detailed_pgfault = rrddim_add(st_mem_detailed_pgfault, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1801 + rrddim_set_by_pointer(st_mem_detailed_pgfault, cg->rd_mem_detailed_pgfault, cg->memory.pgfault);
1802 +
1803 + if(unlikely(!cg->rd_mem_detailed_pgmajfault))
1804 + cg->rd_mem_detailed_pgmajfault = rrddim_add(st_mem_detailed_pgmajfault, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1805 + rrddim_set_by_pointer(st_mem_detailed_pgmajfault, cg->rd_mem_detailed_pgmajfault, cg->memory.pgmajfault);
1806 +
1807 + if(unlikely(!cg->rd_mem_detailed_pgpgin))
1808 + cg->rd_mem_detailed_pgpgin = rrddim_add(st_mem_detailed_pgpgin, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1809 + rrddim_set_by_pointer(st_mem_detailed_pgpgin, cg->rd_mem_detailed_pgpgin, cg->memory.pgpgin);
1810 +
1811 + if(unlikely(!cg->rd_mem_detailed_pgpgout))
1812 + cg->rd_mem_detailed_pgpgout = rrddim_add(st_mem_detailed_pgpgout, cg->chart_id, cg->chart_title, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
1813 + rrddim_set_by_pointer(st_mem_detailed_pgpgout, cg->rd_mem_detailed_pgpgout, cg->memory.pgpgout);
1814 + }
1815 +
1816 + if(likely(do_mem_failcnt && cg->memory.updated_failcnt)) {
1817 if(unlikely(!cg->rd_mem_failcnt))
1818 cg->rd_mem_failcnt = rrddim_add(st_mem_failcnt, cg->chart_id, cg->chart_title, 1, 1, RRDDIM_INCREMENTAL);
1819
1820 rrddim_set_by_pointer(st_mem_failcnt, cg->rd_mem_failcnt, cg->memory.failcnt);
1821 }
1822
1690 - if(likely(do_swap_usage && cg->memory.msw_usage_in_bytes_updated)) {
1823 + if(likely(do_swap_usage && cg->memory.updated_msw_usage_in_bytes)) {
1824 if(unlikely(!cg->rd_swap_usage))
1825 cg->rd_swap_usage = rrddim_add(st_swap_usage, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1826
@@ -1774,6 +1907,17 @@ void update_services_charts(int update_every,
1907 if(likely(do_mem_usage))
1908 rrdset_done(st_mem_usage);
1909
1910 + if(unlikely(do_mem_detailed)) {
1911 + rrdset_done(st_mem_detailed_cache);
1912 + rrdset_done(st_mem_detailed_rss);
1913 + rrdset_done(st_mem_detailed_mapped);
1914 + rrdset_done(st_mem_detailed_writeback);
1915 + rrdset_done(st_mem_detailed_pgfault);
1916 + rrdset_done(st_mem_detailed_pgmajfault);
1917 + rrdset_done(st_mem_detailed_pgpgin);
1918 + rrdset_done(st_mem_detailed_pgpgout);
1919 + }
1920 +
1921 if(likely(do_mem_failcnt))
1922 rrdset_done(st_mem_failcnt);
1923
@@ -1831,6 +1975,7 @@ void update_cgroup_charts(int update_every) {
1975
1976 int services_do_cpu = 0,
1977 services_do_mem_usage = 0,
1978 + services_do_mem_detailed = 0,
1979 services_do_mem_failcnt = 0,
1980 services_do_swap_usage = 0,
1981 services_do_io = 0,
@@ -1848,9 +1993,10 @@ void update_cgroup_charts(int update_every) {
1993 if(likely(cgroup_enable_systemd_services && cg->options & CGROUP_OPTIONS_SYSTEM_SLICE_SERVICE)) {
1994 if(cg->cpuacct_stat.updated && cg->cpuacct_stat.enabled == CONFIG_ONDEMAND_YES) services_do_cpu++;
1995
1851 - if(cg->memory.usage_in_bytes_updated && cg->memory.enabled_usage == CONFIG_ONDEMAND_YES) services_do_mem_usage++;
1852 - if(cg->memory.failcnt_updated && cg->memory.enabled_failcnt == CONFIG_ONDEMAND_YES) services_do_mem_failcnt++;
1853 - if(cg->memory.msw_usage_in_bytes_updated && cg->memory.enabled_swap == CONFIG_ONDEMAND_YES) services_do_swap_usage++;
1996 + if(cg->memory.updated_detailed && cg->memory.enabled_detailed) services_do_mem_detailed++;
1997 + if(cg->memory.updated_usage_in_bytes && cg->memory.enabled_usage_in_bytes == CONFIG_ONDEMAND_YES) services_do_mem_usage++;
1998 + if(cg->memory.updated_failcnt && cg->memory.enabled_failcnt == CONFIG_ONDEMAND_YES) services_do_mem_failcnt++;
1999 + if(cg->memory.updated_msw_usage_in_bytes && cg->memory.enabled_msw_usage_in_bytes == CONFIG_ONDEMAND_YES) services_do_swap_usage++;
2000
2001 if(cg->io_service_bytes.updated && cg->io_service_bytes.enabled == CONFIG_ONDEMAND_YES) services_do_io++;
2002 if(cg->io_serviced.updated && cg->io_serviced.enabled == CONFIG_ONDEMAND_YES) services_do_io_ops++;
@@ -1868,7 +2014,7 @@ void update_cgroup_charts(int update_every) {
2014 cg->st_cpu = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "cpu");
2015 if(likely(!cg->st_cpu)) {
2016 snprintfz(title, CHART_TITLE_MAX, "CPU Usage (%d%% = %d core%s) for cgroup %s", (processors * 100), processors, (processors > 1) ? "s" : "", cg->chart_title);
1871 - cg->st_cpu = rrdset_create(type, "cpu", NULL, "cpu", "cgroup.cpu", title, "%", 40000, update_every, RRDSET_TYPE_STACKED);
2017 + cg->st_cpu = rrdset_create(type, "cpu", NULL, "cpu", "cgroup.cpu", title, "%", CHART_PRIORITY_CONTAINERS, update_every, RRDSET_TYPE_STACKED);
2018 }
2019 rrddim_add(cg->st_cpu, "user", NULL, 100, hz, RRDDIM_INCREMENTAL);
2020 rrddim_add(cg->st_cpu, "system", NULL, 100, hz, RRDDIM_INCREMENTAL);
@@ -1889,7 +2035,7 @@ void update_cgroup_charts(int update_every) {
2035 cg->st_cpu_per_core = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "cpu_per_core");
2036 if(likely(!cg->st_cpu_per_core)) {
2037 snprintfz(title, CHART_TITLE_MAX, "CPU Usage (%d%% = %d core%s) Per Core for cgroup %s", (processors * 100), processors, (processors > 1) ? "s" : "", cg->chart_title);
1892 - cg->st_cpu_per_core = rrdset_create(type, "cpu_per_core", NULL, "cpu", "cgroup.cpu_per_core", title, "%", 40100, update_every, RRDSET_TYPE_STACKED);
2038 + cg->st_cpu_per_core = rrdset_create(type, "cpu_per_core", NULL, "cpu", "cgroup.cpu_per_core", title, "%", CHART_PRIORITY_CONTAINERS + 100, update_every, RRDSET_TYPE_STACKED);
2039 }
2040 for(i = 0; i < cg->cpuacct_usage.cpus; i++) {
2041 snprintfz(id, CHART_TITLE_MAX, "cpu%u", i);
@@ -1906,17 +2052,17 @@ void update_cgroup_charts(int update_every) {
2052 rrdset_done(cg->st_cpu_per_core);
2053 }
2054
1909 - if(likely(cg->memory.updated && cg->memory.enabled_detailed == CONFIG_ONDEMAND_YES)) {
2055 + if(likely(cg->memory.updated_detailed && cg->memory.enabled_detailed == CONFIG_ONDEMAND_YES)) {
2056 if(unlikely(!cg->st_mem)) {
2057 cg->st_mem = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem");
2058 if(likely(!cg->st_mem)) {
2059 snprintfz(title, CHART_TITLE_MAX, "Memory Usage for cgroup %s", cg->chart_title);
1914 - cg->st_mem = rrdset_create(type, "mem", NULL, "mem", "cgroup.mem", title, "MB", 40210, update_every, RRDSET_TYPE_STACKED);
2060 + cg->st_mem = rrdset_create(type, "mem", NULL, "mem", "cgroup.mem", title, "MB", CHART_PRIORITY_CONTAINERS + 210, update_every, RRDSET_TYPE_STACKED);
2061 }
2062
2063 rrddim_add(cg->st_mem, "cache", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
2064 rrddim_add(cg->st_mem, "rss", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1919 - if(cg->memory.has_dirty_swap)
2065 + if(cg->memory.detailed_has_dirty_swap)
2066 rrddim_add(cg->st_mem, "swap", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
2067 rrddim_add(cg->st_mem, "rss_huge", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
2068 rrddim_add(cg->st_mem, "mapped_file", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
@@ -1926,7 +2072,7 @@ void update_cgroup_charts(int update_every) {
2072
2073 rrddim_set(cg->st_mem, "cache", cg->memory.cache);
2074 rrddim_set(cg->st_mem, "rss", cg->memory.rss);
1929 - if(cg->memory.has_dirty_swap)
2075 + if(cg->memory.detailed_has_dirty_swap)
2076 rrddim_set(cg->st_mem, "swap", cg->memory.swap);
2077 rrddim_set(cg->st_mem, "rss_huge", cg->memory.rss_huge);
2078 rrddim_set(cg->st_mem, "mapped_file", cg->memory.mapped_file);
@@ -1936,17 +2082,17 @@ void update_cgroup_charts(int update_every) {
2082 cg->st_writeback = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "writeback");
2083 if(likely(!cg->st_writeback)) {
2084 snprintfz(title, CHART_TITLE_MAX, "Writeback Memory for cgroup %s", cg->chart_title);
1939 - cg->st_writeback = rrdset_create(type, "writeback", NULL, "mem", "cgroup.writeback", title, "MB", 40300, update_every, RRDSET_TYPE_AREA);
2085 + cg->st_writeback = rrdset_create(type, "writeback", NULL, "mem", "cgroup.writeback", title, "MB", CHART_PRIORITY_CONTAINERS + 300, update_every, RRDSET_TYPE_AREA);
2086 }
2087
1942 - if(cg->memory.has_dirty_swap)
2088 + if(cg->memory.detailed_has_dirty_swap)
2089 rrddim_add(cg->st_writeback, "dirty", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
2090 rrddim_add(cg->st_writeback, "writeback", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
2091 }
2092 else
2093 rrdset_next(cg->st_writeback);
2094
1949 - if(cg->memory.has_dirty_swap)
2095 + if(cg->memory.detailed_has_dirty_swap)
2096 rrddim_set(cg->st_writeback, "dirty", cg->memory.dirty);
2097 rrddim_set(cg->st_writeback, "writeback", cg->memory.writeback);
2098 rrdset_done(cg->st_writeback);
@@ -1955,10 +2101,10 @@ void update_cgroup_charts(int update_every) {
2101 cg->st_mem_activity = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_activity");
2102 if(likely(!cg->st_mem_activity)) {
2103 snprintfz(title, CHART_TITLE_MAX, "Memory Activity for cgroup %s", cg->chart_title);
1958 - cg->st_mem_activity = rrdset_create(type, "mem_activity", NULL, "mem", "cgroup.mem_activity", title, "MB/s", 40400, update_every, RRDSET_TYPE_LINE);
2104 + cg->st_mem_activity = rrdset_create(type, "mem_activity", NULL, "mem", "cgroup.mem_activity", title, "MB/s", CHART_PRIORITY_CONTAINERS + 400, update_every, RRDSET_TYPE_LINE);
2105 }
1960 - rrddim_add(cg->st_mem_activity, "pgpgin", "in", sysconf(_SC_PAGESIZE), 1024 * 1024, RRDDIM_INCREMENTAL);
1961 - rrddim_add(cg->st_mem_activity, "pgpgout", "out", -sysconf(_SC_PAGESIZE), 1024 * 1024, RRDDIM_INCREMENTAL);
2106 + rrddim_add(cg->st_mem_activity, "pgpgin", "in", system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
2107 + rrddim_add(cg->st_mem_activity, "pgpgout", "out", -system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
2108 }
2109 else
2110 rrdset_next(cg->st_mem_activity);
@@ -1971,10 +2117,10 @@ void update_cgroup_charts(int update_every) {
2117 cg->st_pgfaults = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "pgfaults");
2118 if(likely(!cg->st_pgfaults)) {
2119 snprintfz(title, CHART_TITLE_MAX, "Memory Page Faults for cgroup %s", cg->chart_title);
1974 - cg->st_pgfaults = rrdset_create(type, "pgfaults", NULL, "mem", "cgroup.pgfaults", title, "MB/s", 40500, update_every, RRDSET_TYPE_LINE);
2120 + cg->st_pgfaults = rrdset_create(type, "pgfaults", NULL, "mem", "cgroup.pgfaults", title, "MB/s", CHART_PRIORITY_CONTAINERS + 500, update_every, RRDSET_TYPE_LINE);
2121 }
1976 - rrddim_add(cg->st_pgfaults, "pgfault", NULL, sysconf(_SC_PAGESIZE), 1024 * 1024, RRDDIM_INCREMENTAL);
1977 - rrddim_add(cg->st_pgfaults, "pgmajfault", "swap", -sysconf(_SC_PAGESIZE), 1024 * 1024, RRDDIM_INCREMENTAL);
2122 + rrddim_add(cg->st_pgfaults, "pgfault", NULL, system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
2123 + rrddim_add(cg->st_pgfaults, "pgmajfault", "swap", -system_page_size, 1024 * 1024, RRDDIM_INCREMENTAL);
2124 }
2125 else
2126 rrdset_next(cg->st_pgfaults);
@@ -1984,12 +2130,12 @@ void update_cgroup_charts(int update_every) {
2130 rrdset_done(cg->st_pgfaults);
2131 }
2132
1987 - if(likely(cg->memory.usage_in_bytes_updated && cg->memory.enabled_usage == CONFIG_ONDEMAND_YES)) {
2133 + if(likely(cg->memory.updated_usage_in_bytes && cg->memory.enabled_usage_in_bytes == CONFIG_ONDEMAND_YES)) {
2134 if(unlikely(!cg->st_mem_usage)) {
2135 cg->st_mem_usage = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_usage");
2136 if(likely(!cg->st_mem_usage)) {
2137 snprintfz(title, CHART_TITLE_MAX, "Total Memory for cgroup %s", cg->chart_title);
1992 - cg->st_mem_usage = rrdset_create(type, "mem_usage", NULL, "mem", "cgroup.mem_usage", title, "MB", 40200, update_every, RRDSET_TYPE_STACKED);
2138 + cg->st_mem_usage = rrdset_create(type, "mem_usage", NULL, "mem", "cgroup.mem_usage", title, "MB", CHART_PRIORITY_CONTAINERS + 200, update_every, RRDSET_TYPE_STACKED);
2139 }
2140 rrddim_add(cg->st_mem_usage, "ram", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
2141 rrddim_add(cg->st_mem_usage, "swap", NULL, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
@@ -2002,12 +2148,12 @@ void update_cgroup_charts(int update_every) {
2148 rrdset_done(cg->st_mem_usage);
2149 }
2150
2005 - if(likely(cg->memory.failcnt_updated && cg->memory.enabled_failcnt == CONFIG_ONDEMAND_YES)) {
2151 + if(likely(cg->memory.updated_failcnt && cg->memory.enabled_failcnt == CONFIG_ONDEMAND_YES)) {
2152 if(unlikely(!cg->st_mem_failcnt)) {
2153 cg->st_mem_failcnt = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_failcnt");
2154 if(likely(!cg->st_mem_failcnt)) {
2155 snprintfz(title, CHART_TITLE_MAX, "Memory Limit Failures for cgroup %s", cg->chart_title);
2010 - cg->st_mem_failcnt = rrdset_create(type, "mem_failcnt", NULL, "mem", "cgroup.mem_failcnt", title, "count", 40250, update_every, RRDSET_TYPE_LINE);
2156 + cg->st_mem_failcnt = rrdset_create(type, "mem_failcnt", NULL, "mem", "cgroup.mem_failcnt", title, "count", CHART_PRIORITY_CONTAINERS + 250, update_every, RRDSET_TYPE_LINE);
2157 }
2158 rrddim_add(cg->st_mem_failcnt, "failures", NULL, 1, 1, RRDDIM_INCREMENTAL);
2159 }
@@ -2023,7 +2169,7 @@ void update_cgroup_charts(int update_every) {
2169 cg->st_io = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "io");
2170 if(likely(!cg->st_io)) {
2171 snprintfz(title, CHART_TITLE_MAX, "I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
2026 - cg->st_io = rrdset_create(type, "io", NULL, "disk", "cgroup.io", title, "KB/s", 41200, update_every, RRDSET_TYPE_AREA);
2172 + cg->st_io = rrdset_create(type, "io", NULL, "disk", "cgroup.io", title, "KB/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_AREA);
2173 }
2174 rrddim_add(cg->st_io, "read", NULL, 1, 1024, RRDDIM_INCREMENTAL);
2175 rrddim_add(cg->st_io, "write", NULL, -1, 1024, RRDDIM_INCREMENTAL);
@@ -2041,7 +2187,7 @@ void update_cgroup_charts(int update_every) {
2187 cg->st_serviced_ops = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "serviced_ops");
2188 if(likely(!cg->st_serviced_ops)) {
2189 snprintfz(title, CHART_TITLE_MAX, "Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
2044 - cg->st_serviced_ops = rrdset_create(type, "serviced_ops", NULL, "disk", "cgroup.serviced_ops", title, "operations/s", 41200, update_every, RRDSET_TYPE_LINE);
2190 + cg->st_serviced_ops = rrdset_create(type, "serviced_ops", NULL, "disk", "cgroup.serviced_ops", title, "operations/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_LINE);
2191 }
2192 rrddim_add(cg->st_serviced_ops, "read", NULL, 1, 1, RRDDIM_INCREMENTAL);
2193 rrddim_add(cg->st_serviced_ops, "write", NULL, -1, 1, RRDDIM_INCREMENTAL);
@@ -2059,7 +2205,7 @@ void update_cgroup_charts(int update_every) {
2205 cg->st_throttle_io = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_io");
2206 if(likely(!cg->st_throttle_io)) {
2207 snprintfz(title, CHART_TITLE_MAX, "Throttle I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
2062 - cg->st_throttle_io = rrdset_create(type, "throttle_io", NULL, "disk", "cgroup.throttle_io", title, "KB/s", 41200, update_every, RRDSET_TYPE_AREA);
2208 + cg->st_throttle_io = rrdset_create(type, "throttle_io", NULL, "disk", "cgroup.throttle_io", title, "KB/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_AREA);
2209 }
2210 rrddim_add(cg->st_throttle_io, "read", NULL, 1, 1024, RRDDIM_INCREMENTAL);
2211 rrddim_add(cg->st_throttle_io, "write", NULL, -1, 1024, RRDDIM_INCREMENTAL);
@@ -2077,7 +2223,7 @@ void update_cgroup_charts(int update_every) {
2223 cg->st_throttle_serviced_ops = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_serviced_ops");
2224 if(likely(!cg->st_throttle_serviced_ops)) {
2225 snprintfz(title, CHART_TITLE_MAX, "Throttle Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
2080 - cg->st_throttle_serviced_ops = rrdset_create(type, "throttle_serviced_ops", NULL, "disk", "cgroup.throttle_serviced_ops", title, "operations/s", 41200, update_every, RRDSET_TYPE_LINE);
2226 + cg->st_throttle_serviced_ops = rrdset_create(type, "throttle_serviced_ops", NULL, "disk", "cgroup.throttle_serviced_ops", title, "operations/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_LINE);
2227 }
2228 rrddim_add(cg->st_throttle_serviced_ops, "read", NULL, 1, 1, RRDDIM_INCREMENTAL);
2229 rrddim_add(cg->st_throttle_serviced_ops, "write", NULL, -1, 1, RRDDIM_INCREMENTAL);
@@ -2095,7 +2241,7 @@ void update_cgroup_charts(int update_every) {
2241 cg->st_queued_ops = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "queued_ops");
2242 if(likely(!cg->st_queued_ops)) {
2243 snprintfz(title, CHART_TITLE_MAX, "Queued I/O Operations (all disks) for cgroup %s", cg->chart_title);
2098 - cg->st_queued_ops = rrdset_create(type, "queued_ops", NULL, "disk", "cgroup.queued_ops", title, "operations", 42000, update_every, RRDSET_TYPE_LINE);
2244 + cg->st_queued_ops = rrdset_create(type, "queued_ops", NULL, "disk", "cgroup.queued_ops", title, "operations", CHART_PRIORITY_CONTAINERS + 2000, update_every, RRDSET_TYPE_LINE);
2245 }
2246 rrddim_add(cg->st_queued_ops, "read", NULL, 1, 1, RRDDIM_ABSOLUTE);
2247 rrddim_add(cg->st_queued_ops, "write", NULL, -1, 1, RRDDIM_ABSOLUTE);
@@ -2113,7 +2259,7 @@ void update_cgroup_charts(int update_every) {
2259 cg->st_merged_ops = rrdset_find_bytype(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "merged_ops");
2260 if(likely(!cg->st_merged_ops)) {
2261 snprintfz(title, CHART_TITLE_MAX, "Merged I/O Operations (all disks) for cgroup %s", cg->chart_title);
2116 - cg->st_merged_ops = rrdset_create(type, "merged_ops", NULL, "disk", "cgroup.merged_ops", title, "operations/s", 42100, update_every, RRDSET_TYPE_LINE);
2262 + cg->st_merged_ops = rrdset_create(type, "merged_ops", NULL, "disk", "cgroup.merged_ops", title, "operations/s", CHART_PRIORITY_CONTAINERS + 2100, update_every, RRDSET_TYPE_LINE);
2263 }
2264 rrddim_add(cg->st_merged_ops, "read", NULL, 1, 1024, RRDDIM_INCREMENTAL);
2265 rrddim_add(cg->st_merged_ops, "write", NULL, -1, 1024, RRDDIM_INCREMENTAL);
@@ -2131,6 +2277,7 @@ void update_cgroup_charts(int update_every) {
2277 update_services_charts(update_every,
2278 services_do_cpu,
2279 services_do_mem_usage,
2280 + services_do_mem_detailed,
2281 services_do_mem_failcnt,
2282 services_do_swap_usage,
2283 services_do_io,