]> arthur.barton.de Git - netdata.git/blobdiff - src/sys_fs_cgroup.c
Merge pull request #643 from paulfantom/master
[netdata.git] / src / sys_fs_cgroup.c
index 2e88fad94b297d1b3dc3144e230946c7d2605af3..5f139c891ee824b220f96b12bbd6ac96a501b1cc 100644 (file)
@@ -32,7 +32,7 @@ static char *cgroup_blkio_base = NULL;
 static char *cgroup_memory_base = NULL;
 
 static int cgroup_root_count = 0;
-static int cgroup_root_max = 50;
+static int cgroup_root_max = 500;
 static int cgroup_max_depth = 0;
 
 void read_cgroup_plugin_configuration() {
@@ -47,21 +47,33 @@ void read_cgroup_plugin_configuration() {
        struct mountinfo *mi, *root = mountinfo_read();
 
        mi = mountinfo_find_by_filesystem_mount_source(root, "cgroup", "cpuacct");
-       if(!mi) s = "/sys/fs/cgroup/cpuacct";
+       if(!mi) mi = mountinfo_find_by_filesystem_super_option(root, "cgroup", "cpuacct");
+       if(!mi) {
+               error("Cannot find cgroup cpuacct mountinfo. Assuming default: /sys/fs/cgroup/cpuacct");
+               s = "/sys/fs/cgroup/cpuacct";
+       }
        else s = mi->mount_point;
-       snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
+       snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
        cgroup_cpuacct_base = config_get("plugin:cgroups", "path to /sys/fs/cgroup/cpuacct", filename);
 
        mi = mountinfo_find_by_filesystem_mount_source(root, "cgroup", "blkio");
-       if(!mi) s = "/sys/fs/cgroup/blkio";
+       if(!mi) mi = mountinfo_find_by_filesystem_super_option(root, "cgroup", "blkio");
+       if(!mi) {
+               error("Cannot find cgroup blkio mountinfo. Assuming default: /sys/fs/cgroup/blkio");
+               s = "/sys/fs/cgroup/blkio";
+       }
        else s = mi->mount_point;
-       snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
+       snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
        cgroup_blkio_base = config_get("plugin:cgroups", "path to /sys/fs/cgroup/blkio", filename);
 
        mi = mountinfo_find_by_filesystem_mount_source(root, "cgroup", "memory");
-       if(!mi) s = "/sys/fs/cgroup/memory";
+       if(!mi) mi = mountinfo_find_by_filesystem_super_option(root, "cgroup", "memory");
+       if(!mi) {
+               error("Cannot find cgroup memory mountinfo. Assuming default: /sys/fs/cgroup/memory");
+               s = "/sys/fs/cgroup/memory";
+       }
        else s = mi->mount_point;
-       snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
+       snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
        cgroup_memory_base = config_get("plugin:cgroups", "path to /sys/fs/cgroup/memory", filename);
 
        cgroup_root_max = config_get_number("plugin:cgroups", "max cgroups to allow", cgroup_root_max);
@@ -162,6 +174,7 @@ struct cgroup {
        uint32_t hash;
 
        char *chart_id;
+       char *chart_title;
 
        struct cpuacct_stat cpuacct_stat;
        struct cpuacct_usage cpuacct_usage;
@@ -239,7 +252,7 @@ void cgroup_read_cpuacct_usage(struct cpuacct_usage *ca) {
                if(!ff) return;
 
                if(procfile_lines(ff) < 1) {
-                       error("File '%s' should have 1+ lines but has %d.", ca->filename, procfile_lines(ff));
+                       error("File '%s' should have 1+ lines but has %u.", ca->filename, procfile_lines(ff));
                        return;
                }
 
@@ -258,7 +271,7 @@ void cgroup_read_cpuacct_usage(struct cpuacct_usage *ca) {
 
                        ca->cpu_percpu = malloc(sizeof(unsigned long long) * i);
                        if(!ca->cpu_percpu)
-                               fatal("Cannot allocate memory (%z bytes)", sizeof(unsigned long long) * i);
+                               fatal("Cannot allocate memory (%zu bytes)", sizeof(unsigned long long) * i);
 
                        ca->cpus = i;
                }
@@ -585,7 +598,7 @@ void cgroup_get_chart_id(struct cgroup *cg) {
        pid_t cgroup_pid;
        char buffer[CGROUP_CHARTID_LINE_MAX + 1];
 
-       snprintf(buffer, CGROUP_CHARTID_LINE_MAX, "exec %s '%s'",
+       snprintfz(buffer, CGROUP_CHARTID_LINE_MAX, "exec %s '%s'",
                 config_get("plugin:cgroups", "script to get cgroup names", PLUGINS_DIR "/cgroup-name.sh"), cg->chart_id);
 
        debug(D_CGROUP, "executing command '%s' for cgroup '%s'", buffer, cg->id);
@@ -604,13 +617,22 @@ void cgroup_get_chart_id(struct cgroup *cg) {
                debug(D_CGROUP, "cgroup '%s' should be renamed to '%s'", cg->id, s);
 
                trim(s);
-               netdata_fix_chart_id(s);
+
+               free(cg->chart_title);
+               cg->chart_title = strdup(s);
+               if(!cg->chart_title)
+                       fatal("CGROUP: Cannot allocate memory for chart name of cgroup '%s' chart name: '%s'", cg->id, s);
+
+               netdata_fix_chart_name(cg->chart_title);
+
                free(cg->chart_id);
                cg->chart_id = strdup(s);
                if(!cg->chart_id)
                        fatal("CGROUP: Cannot allocate memory for chart id of cgroup '%s' chart id: '%s'", cg->id, s);
 
-               debug(D_CGROUP, "cgroup '%s' renamed to '%s'", cg->id, cg->chart_id);
+               netdata_fix_chart_id(cg->chart_id);
+
+               debug(D_CGROUP, "cgroup '%s' renamed to '%s' (title: '%s')", cg->id, cg->chart_id, cg->chart_title);
        }
        else debug(D_CGROUP, "cgroup '%s' is not to be renamed (will be shown as '%s')", cg->id, cg->chart_id);
 }
@@ -628,23 +650,42 @@ struct cgroup *cgroup_add(const char *id) {
        if(!*chart_id) {
                chart_id = "/";
 
-               // disable by default the host cgroup
+               // disable by default the root cgroup
                def = 0;
-               debug(D_CGROUP, "cgroup '%s' is the host container (by default %s)", id, (def)?"enabled":"disabled");
+               debug(D_CGROUP, "cgroup '%s' is the root container (by default %s)", id, (def)?"enabled":"disabled");
        }
        else {
                if(*chart_id == '/') chart_id++;
 
+               size_t len = strlen(chart_id);
+
                // disable by default the parent cgroup
                // for known cgroup managers
                if(!strcmp(chart_id, "lxc") ||
                                !strcmp(chart_id, "docker") ||
+                               !strcmp(chart_id, "libvirt") ||
+                               !strcmp(chart_id, "qemu") ||
                                !strcmp(chart_id, "systemd") ||
-                               !strncmp(chart_id, "user.slice", 10) ||
-                               !strncmp(chart_id, "system.slice", 12)
+                               !strcmp(chart_id, "system.slice") ||
+                               !strcmp(chart_id, "machine.slice") ||
+                               !strcmp(chart_id, "init.scope") ||
+                               !strcmp(chart_id, "user") ||
+                               !strcmp(chart_id, "system") ||
+                               !strcmp(chart_id, "machine") ||
+                               // starts with them
+                               (len >  6 && !strncmp(chart_id, "user/", 6)) ||
+                               (len > 11 && !strncmp(chart_id, "user.slice/", 11)) ||
+                               // ends with them
+                               (len >  5 && !strncmp(&chart_id[len -  5], ".user", 5)) ||
+                               (len >  5 && !strncmp(&chart_id[len -  5], ".swap", 5)) ||
+                               (len >  6 && !strncmp(&chart_id[len -  6], ".slice", 6)) ||
+                               (len >  6 && !strncmp(&chart_id[len -  6], ".mount", 6)) ||
+                               (len >  8 && !strncmp(&chart_id[len -  8], ".session", 8)) ||
+                               (len >  8 && !strncmp(&chart_id[len -  8], ".service", 8)) ||
+                               (len > 10 && !strncmp(&chart_id[len - 10], ".partition", 10))
                                ) {
                        def = 0;
-                       debug(D_CGROUP, "cgroup '%s' is container manager (by default %s)", id, (def)?"enabled":"disabled");
+                       debug(D_CGROUP, "cgroup '%s' is %s (by default)", id, (def)?"enabled":"disabled");
                }
        }
 
@@ -661,6 +702,9 @@ struct cgroup *cgroup_add(const char *id) {
        cg->chart_id = strdup(chart_id);
        if(!cg->chart_id) fatal("Cannot allocate memory for cgroup '%s'", id);
 
+       cg->chart_title = strdup(chart_id);
+       if(!cg->chart_title) fatal("Cannot allocate memory for cgroup '%s'", id);
+
        if(!cgroup_root)
                cgroup_root = cg;
        else {
@@ -676,22 +720,16 @@ struct cgroup *cgroup_add(const char *id) {
        cgroup_get_chart_id(cg);
 
        char option[FILENAME_MAX + 1];
-       snprintf(option, FILENAME_MAX, "enable cgroup %s", chart_id);
+       snprintfz(option, FILENAME_MAX, "enable cgroup %s", cg->chart_title);
        cg->enabled = config_get_boolean("plugin:cgroups", option, def);
 
-       // FIXME
-       // switch this to debug(D_CGROUP, ...
-       info("Added cgroup '%s' with chart id '%s' as %s (default was %s)", cg->id, cg->chart_id, (cg->enabled)?"enabled":"disabled", (def)?"enabled":"disabled");
+       debug(D_CGROUP, "Added cgroup '%s' with chart id '%s' and title '%s' as %s (default was %s)", cg->id, cg->chart_id, cg->chart_title, (cg->enabled)?"enabled":"disabled", (def)?"enabled":"disabled");
 
        return cg;
 }
 
 void cgroup_free(struct cgroup *cg) {
-       debug(D_CGROUP, "removing cgroup '%s'", cg->id);
-
-       // FIXME
-       // switch this to debug(D_CGROUP, ...
-       info("Removing cgroup '%s' with chart id '%s' (was %s and %s)", cg->id, cg->chart_id, (cg->enabled)?"enabled":"disabled", (cg->available)?"available":"not available");
+       debug(D_CGROUP, "Removing cgroup '%s' with chart id '%s' (was %s and %s)", cg->id, cg->chart_id, (cg->enabled)?"enabled":"disabled", (cg->available)?"available":"not available");
 
        free(cg->cpuacct_usage.cpu_percpu);
 
@@ -707,6 +745,7 @@ void cgroup_free(struct cgroup *cg) {
 
        free(cg->id);
        free(cg->chart_id);
+       free(cg->chart_title);
        free(cg);
 
        cgroup_root_count--;
@@ -732,7 +771,7 @@ struct cgroup *cgroup_find(const char *id) {
 // detect running cgroups
 
 // callback for find_file_in_subdirs()
-void found_dir_in_subdir(const char *dir) {
+void found_subdir_in_dir(const char *dir) {
        debug(D_CGROUP, "examining cgroup dir '%s'", dir);
 
        struct cgroup *cg = cgroup_find(dir);
@@ -761,11 +800,12 @@ void find_dir_in_subdirs(const char *base, const char *this, void (*callback)(co
        int enabled = -1;
        if(!this) this = base;
        size_t dirlen = strlen(this), baselen = strlen(base);
+       const char *relative_path = &this[baselen];
 
        DIR *dir = opendir(this);
        if(!dir) return;
 
-       callback(&this[baselen]);
+       callback(relative_path);
 
        struct dirent *de = NULL;
        while((de = readdir(dir))) {
@@ -780,19 +820,17 @@ void find_dir_in_subdirs(const char *base, const char *this, void (*callback)(co
 
                if(de->d_type == DT_DIR) {
                        if(enabled == -1) {
+                               const char *r = relative_path;
+                               if(*r == '\0') r = "/";
+                               else if (*r == '/') r++;
+
                                // we check for this option here
                                // so that the config will not have settings
                                // for leaf directories
                                char option[FILENAME_MAX + 1];
-                               snprintf(option, FILENAME_MAX, "search for cgroups under %s", (this == base)?"/":this);
-
-                               int def = 1;
-                               if(!strcmp(this, "system.slice") ||
-                                       !strcmp(this, "user.slice") ||
-                                       !strcmp(this, "systemd"))
-                                       def = 0;
-
-                               enabled = config_get_boolean("plugin:cgroups", option, def);
+                               snprintfz(option, FILENAME_MAX, "search for cgroups under %s", r);
+                               option[FILENAME_MAX] = '\0';
+                               enabled = config_get_boolean("plugin:cgroups", option, 1);
                        }
 
                        if(enabled) {
@@ -852,13 +890,13 @@ void find_all_cgroups() {
        mark_all_cgroups_as_not_available();
 
        if(cgroup_enable_cpuacct_stat || cgroup_enable_cpuacct_usage)
-               find_dir_in_subdirs(cgroup_cpuacct_base, NULL, found_dir_in_subdir);
+               find_dir_in_subdirs(cgroup_cpuacct_base, NULL, found_subdir_in_dir);
 
        if(cgroup_enable_blkio)
-               find_dir_in_subdirs(cgroup_blkio_base, NULL, found_dir_in_subdir);
+               find_dir_in_subdirs(cgroup_blkio_base, NULL, found_subdir_in_dir);
 
        if(cgroup_enable_memory)
-               find_dir_in_subdirs(cgroup_memory_base, NULL, found_dir_in_subdir);
+               find_dir_in_subdirs(cgroup_memory_base, NULL, found_subdir_in_dir);
 
        // remove any non-existing cgroups
        cleanup_all_cgroups();
@@ -876,48 +914,48 @@ void find_all_cgroups() {
                // and update the filenames they read
                char filename[FILENAME_MAX + 1];
                if(cgroup_enable_cpuacct_stat && !cg->cpuacct_stat.filename) {
-                       snprintf(filename, FILENAME_MAX, "%s%s/cpuacct.stat", cgroup_cpuacct_base, cg->id);
+                       snprintfz(filename, FILENAME_MAX, "%s%s/cpuacct.stat", cgroup_cpuacct_base, cg->id);
                        cg->cpuacct_stat.filename = strdup(filename);
                        debug(D_CGROUP, "cpuacct.stat filename for cgroup '%s': '%s'", cg->id, cg->cpuacct_stat.filename);
                }
                if(cgroup_enable_cpuacct_usage && !cg->cpuacct_usage.filename) {
-                       snprintf(filename, FILENAME_MAX, "%s%s/cpuacct.usage_percpu", cgroup_cpuacct_base, cg->id);
+                       snprintfz(filename, FILENAME_MAX, "%s%s/cpuacct.usage_percpu", cgroup_cpuacct_base, cg->id);
                        cg->cpuacct_usage.filename = strdup(filename);
                        debug(D_CGROUP, "cpuacct.usage_percpu filename for cgroup '%s': '%s'", cg->id, cg->cpuacct_usage.filename);
                }
                if(cgroup_enable_memory && !cg->memory.filename) {
-                       snprintf(filename, FILENAME_MAX, "%s%s/memory.stat", cgroup_memory_base, cg->id);
+                       snprintfz(filename, FILENAME_MAX, "%s%s/memory.stat", cgroup_memory_base, cg->id);
                        cg->memory.filename = strdup(filename);
                        debug(D_CGROUP, "memory.stat filename for cgroup '%s': '%s'", cg->id, cg->memory.filename);
                }
                if(cgroup_enable_blkio) {
                        if(!cg->io_service_bytes.filename) {
-                               snprintf(filename, FILENAME_MAX, "%s%s/blkio.io_service_bytes", cgroup_blkio_base, cg->id);
+                               snprintfz(filename, FILENAME_MAX, "%s%s/blkio.io_service_bytes", cgroup_blkio_base, cg->id);
                                cg->io_service_bytes.filename = strdup(filename);
                                debug(D_CGROUP, "io_service_bytes filename for cgroup '%s': '%s'", cg->id, cg->io_service_bytes.filename);
                        }
                        if(!cg->io_serviced.filename) {
-                               snprintf(filename, FILENAME_MAX, "%s%s/blkio.io_serviced", cgroup_blkio_base, cg->id);
+                               snprintfz(filename, FILENAME_MAX, "%s%s/blkio.io_serviced", cgroup_blkio_base, cg->id);
                                cg->io_serviced.filename = strdup(filename);
                                debug(D_CGROUP, "io_serviced filename for cgroup '%s': '%s'", cg->id, cg->io_serviced.filename);
                        }
                        if(!cg->throttle_io_service_bytes.filename) {
-                               snprintf(filename, FILENAME_MAX, "%s%s/blkio.throttle.io_service_bytes", cgroup_blkio_base, cg->id);
+                               snprintfz(filename, FILENAME_MAX, "%s%s/blkio.throttle.io_service_bytes", cgroup_blkio_base, cg->id);
                                cg->throttle_io_service_bytes.filename = strdup(filename);
                                debug(D_CGROUP, "throttle_io_service_bytes filename for cgroup '%s': '%s'", cg->id, cg->throttle_io_service_bytes.filename);
                        }
                        if(!cg->throttle_io_serviced.filename) {
-                               snprintf(filename, FILENAME_MAX, "%s%s/blkio.throttle.io_serviced", cgroup_blkio_base, cg->id);
+                               snprintfz(filename, FILENAME_MAX, "%s%s/blkio.throttle.io_serviced", cgroup_blkio_base, cg->id);
                                cg->throttle_io_serviced.filename = strdup(filename);
                                debug(D_CGROUP, "throttle_io_serviced filename for cgroup '%s': '%s'", cg->id, cg->throttle_io_serviced.filename);
                        }
                        if(!cg->io_merged.filename) {
-                               snprintf(filename, FILENAME_MAX, "%s%s/blkio.io_merged", cgroup_blkio_base, cg->id);
+                               snprintfz(filename, FILENAME_MAX, "%s%s/blkio.io_merged", cgroup_blkio_base, cg->id);
                                cg->io_merged.filename = strdup(filename);
                                debug(D_CGROUP, "io_merged filename for cgroup '%s': '%s'", cg->id, cg->io_merged.filename);
                        }
                        if(!cg->io_queued.filename) {
-                               snprintf(filename, FILENAME_MAX, "%s%s/blkio.io_queued", cgroup_blkio_base, cg->id);
+                               snprintfz(filename, FILENAME_MAX, "%s%s/blkio.io_queued", cgroup_blkio_base, cg->id);
                                cg->io_queued.filename = strdup(filename);
                                debug(D_CGROUP, "io_queued filename for cgroup '%s': '%s'", cg->id, cg->io_queued.filename);
                        }
@@ -947,18 +985,18 @@ void update_cgroup_charts(int update_every) {
                        continue;
 
                if(cg->id[0] == '\0')
-                       strcpy(type, "cgroup_host");
+                       strcpy(type, "cgroup_root");
                else if(cg->id[0] == '/')
-                       snprintf(type, RRD_ID_LENGTH_MAX, "cgroup_%s", cg->chart_id);
+                       snprintfz(type, RRD_ID_LENGTH_MAX, "cgroup_%s", cg->chart_id);
                else
-                       snprintf(type, RRD_ID_LENGTH_MAX, "cgroup_%s", cg->chart_id);
+                       snprintfz(type, RRD_ID_LENGTH_MAX, "cgroup_%s", cg->chart_id);
 
                netdata_fix_chart_id(type);
 
                if(cg->cpuacct_stat.updated) {
                        st = rrdset_find_bytype(type, "cpu");
                        if(!st) {
-                               snprintf(title, CHART_TITLE_MAX, "CPU Usage for cgroup %s", cg->chart_id);
+                               snprintfz(title, CHART_TITLE_MAX, "CPU Usage for cgroup %s", cg->chart_title);
                                st = rrdset_create(type, "cpu", NULL, "cpu", "cgroup.cpu", title, "%", 40000, update_every, RRDSET_TYPE_STACKED);
 
                                rrddim_add(st, "user", NULL, 100, hz, RRDDIM_INCREMENTAL);
@@ -977,18 +1015,18 @@ void update_cgroup_charts(int update_every) {
 
                        st = rrdset_find_bytype(type, "cpu_per_core");
                        if(!st) {
-                               snprintf(title, CHART_TITLE_MAX, "CPU Usage Per Core for cgroup %s", cg->chart_id);
+                               snprintfz(title, CHART_TITLE_MAX, "CPU Usage Per Core for cgroup %s", cg->chart_title);
                                st = rrdset_create(type, "cpu_per_core", NULL, "cpu", "cgroup.cpu_per_core", title, "%", 40100, update_every, RRDSET_TYPE_STACKED);
 
                                for(i = 0; i < cg->cpuacct_usage.cpus ;i++) {
-                                       snprintf(id, CHART_TITLE_MAX, "cpu%d", i);
+                                       snprintfz(id, CHART_TITLE_MAX, "cpu%u", i);
                                        rrddim_add(st, id, NULL, 100, 1000000, RRDDIM_INCREMENTAL);
                                }
                        }
                        else rrdset_next(st);
 
                        for(i = 0; i < cg->cpuacct_usage.cpus ;i++) {
-                               snprintf(id, CHART_TITLE_MAX, "cpu%d", i);
+                               snprintfz(id, CHART_TITLE_MAX, "cpu%u", i);
                                rrddim_set(st, id, cg->cpuacct_usage.cpu_percpu[i]);
                        }
                        rrdset_done(st);
@@ -998,7 +1036,7 @@ void update_cgroup_charts(int update_every) {
                        if(cg->memory.cache + cg->memory.rss + cg->memory.rss_huge + cg->memory.mapped_file > 0) {
                                st = rrdset_find_bytype(type, "mem");
                                if(!st) {
-                                       snprintf(title, CHART_TITLE_MAX, "Memory Usage for cgroup %s", cg->chart_id);
+                                       snprintfz(title, CHART_TITLE_MAX, "Memory Usage for cgroup %s", cg->chart_title);
                                        st = rrdset_create(type, "mem", NULL, "mem", "cgroup.mem", title, "MB", 40200, update_every,
                                                           RRDSET_TYPE_STACKED);
 
@@ -1022,7 +1060,7 @@ void update_cgroup_charts(int update_every) {
 
                        st = rrdset_find_bytype(type, "writeback");
                        if(!st) {
-                               snprintf(title, CHART_TITLE_MAX, "Writeback Memory for cgroup %s", cg->chart_id);
+                               snprintfz(title, CHART_TITLE_MAX, "Writeback Memory for cgroup %s", cg->chart_title);
                                st = rrdset_create(type, "writeback", NULL, "mem", "cgroup.writeback", title, "MB", 40300,
                                                   update_every, RRDSET_TYPE_AREA);
 
@@ -1040,7 +1078,7 @@ void update_cgroup_charts(int update_every) {
                        if(cg->memory.pgpgin + cg->memory.pgpgout > 0) {
                                st = rrdset_find_bytype(type, "mem_activity");
                                if(!st) {
-                                       snprintf(title, CHART_TITLE_MAX, "Memory Activity for cgroup %s", cg->chart_id);
+                                       snprintfz(title, CHART_TITLE_MAX, "Memory Activity for cgroup %s", cg->chart_title);
                                        st = rrdset_create(type, "mem_activity", NULL, "mem", "cgroup.mem_activity", title, "MB/s",
                                                           40400, update_every, RRDSET_TYPE_LINE);
 
@@ -1057,7 +1095,7 @@ void update_cgroup_charts(int update_every) {
                        if(cg->memory.pgfault + cg->memory.pgmajfault > 0) {
                                st = rrdset_find_bytype(type, "pgfaults");
                                if(!st) {
-                                       snprintf(title, CHART_TITLE_MAX, "Memory Page Faults for cgroup %s", cg->chart_id);
+                                       snprintfz(title, CHART_TITLE_MAX, "Memory Page Faults for cgroup %s", cg->chart_title);
                                        st = rrdset_create(type, "pgfaults", NULL, "mem", "cgroup.pgfaults", title, "MB/s", 40500,
                                                           update_every, RRDSET_TYPE_LINE);
 
@@ -1075,7 +1113,7 @@ void update_cgroup_charts(int update_every) {
                if(cg->io_service_bytes.updated && cg->io_service_bytes.Read + cg->io_service_bytes.Write > 0) {
                        st = rrdset_find_bytype(type, "io");
                        if(!st) {
-                               snprintf(title, CHART_TITLE_MAX, "I/O Bandwidth (all disks) for cgroup %s", cg->chart_id);
+                               snprintfz(title, CHART_TITLE_MAX, "I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
                                st = rrdset_create(type, "io", NULL, "disk", "cgroup.io", title, "KB/s", 41200,
                                                   update_every, RRDSET_TYPE_LINE);
 
@@ -1092,7 +1130,7 @@ void update_cgroup_charts(int update_every) {
                if(cg->io_serviced.updated && cg->io_serviced.Read + cg->io_serviced.Write > 0) {
                        st = rrdset_find_bytype(type, "serviced_ops");
                        if(!st) {
-                               snprintf(title, CHART_TITLE_MAX, "Serviced I/O Operations (all disks) for cgroup %s", cg->chart_id);
+                               snprintfz(title, CHART_TITLE_MAX, "Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
                                st = rrdset_create(type, "serviced_ops", NULL, "disk", "cgroup.serviced_ops", title, "operations/s", 41200,
                                                   update_every, RRDSET_TYPE_LINE);
 
@@ -1109,7 +1147,7 @@ void update_cgroup_charts(int update_every) {
                if(cg->throttle_io_service_bytes.updated && cg->throttle_io_service_bytes.Read + cg->throttle_io_service_bytes.Write > 0) {
                        st = rrdset_find_bytype(type, "io");
                        if(!st) {
-                               snprintf(title, CHART_TITLE_MAX, "Throttle I/O Bandwidth (all disks) for cgroup %s", cg->chart_id);
+                               snprintfz(title, CHART_TITLE_MAX, "Throttle I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
                                st = rrdset_create(type, "io", NULL, "disk", "cgroup.io", title, "KB/s", 41200,
                                                   update_every, RRDSET_TYPE_LINE);
 
@@ -1127,7 +1165,7 @@ void update_cgroup_charts(int update_every) {
                if(cg->throttle_io_serviced.updated && cg->throttle_io_serviced.Read + cg->throttle_io_serviced.Write > 0) {
                        st = rrdset_find_bytype(type, "throttle_serviced_ops");
                        if(!st) {
-                               snprintf(title, CHART_TITLE_MAX, "Throttle Serviced I/O Operations (all disks) for cgroup %s", cg->chart_id);
+                               snprintfz(title, CHART_TITLE_MAX, "Throttle Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
                                st = rrdset_create(type, "throttle_serviced_ops", NULL, "disk", "cgroup.throttle_serviced_ops", title, "operations/s", 41200,
                                                   update_every, RRDSET_TYPE_LINE);
 
@@ -1144,7 +1182,7 @@ void update_cgroup_charts(int update_every) {
                if(cg->io_queued.updated) {
                        st = rrdset_find_bytype(type, "queued_ops");
                        if(!st) {
-                               snprintf(title, CHART_TITLE_MAX, "Queued I/O Operations (all disks) for cgroup %s", cg->chart_id);
+                               snprintfz(title, CHART_TITLE_MAX, "Queued I/O Operations (all disks) for cgroup %s", cg->chart_title);
                                st = rrdset_create(type, "queued_ops", NULL, "disk", "cgroup.queued_ops", title, "operations", 42000,
                                                   update_every, RRDSET_TYPE_LINE);
 
@@ -1161,7 +1199,7 @@ void update_cgroup_charts(int update_every) {
                if(cg->io_merged.updated && cg->io_merged.Read + cg->io_merged.Write > 0) {
                        st = rrdset_find_bytype(type, "merged_ops");
                        if(!st) {
-                               snprintf(title, CHART_TITLE_MAX, "Merged I/O Operations (all disks) for cgroup %s", cg->chart_id);
+                               snprintfz(title, CHART_TITLE_MAX, "Merged I/O Operations (all disks) for cgroup %s", cg->chart_title);
                                st = rrdset_create(type, "merged_ops", NULL, "disk", "cgroup.merged_ops", title, "operations/s", 42100,
                                                   update_every, RRDSET_TYPE_LINE);
 
@@ -1237,7 +1275,7 @@ void *cgroups_main(void *ptr)
 
                // delay until it is our time to run
                while((sunow = timems()) < sunext)
-                       usleep((useconds_t)(sunext - sunow));
+                       usecsleep(sunext - sunow);
 
                // find the next time we need to run
                while(timems() > sunext)
@@ -1264,7 +1302,7 @@ void *cgroups_main(void *ptr)
 
                        if(!stcpu_thread) stcpu_thread = rrdset_find("netdata.plugin_cgroups_cpu");
                        if(!stcpu_thread) {
-                               stcpu_thread = rrdset_create("netdata", "plugin_cgroups_cpu", NULL, "proc.internal", NULL, "NetData CGroups Plugin CPU usage", "milliseconds/s", 131000, rrd_update_every, RRDSET_TYPE_STACKED);
+                               stcpu_thread = rrdset_create("netdata", "plugin_cgroups_cpu", NULL, "proc.internal", NULL, "NetData CGroups Plugin CPU usage", "milliseconds/s", 132000, rrd_update_every, RRDSET_TYPE_STACKED);
 
                                rrddim_add(stcpu_thread, "user",  NULL,  1, 1000, RRDDIM_INCREMENTAL);
                                rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);