cgroups: now all cgroups are evaluated by default, up to 500 cgroups are allowed...

diff --git a/plugins.d/cgroup-name.sh b/plugins.d/cgroup-name.sh
index 1be3aec1f83a525ad8ac676752cbe54d760ecaef..4bb963dd885d2cbd93c1ee31392fe32a1a54be6c 100755 (executable)
--- a/plugins.d/cgroup-name.sh
+++ b/plugins.d/cgroup-name.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 export PATH="${PATH}:/sbin:/usr/sbin:/usr/local/sbin"
+export LC_ALL=C
 
 NETDATA_CONFIG_DIR="${NETDATA_CONFIG_DIR-/etc/netdata}"
 CONFIG="${NETDATA_CONFIG_DIR}/cgroups-names.conf"
@@ -20,26 +21,33 @@ if [ -f "${CONFIG}" ]
                then
                echo >&2 "${0}: cannot find cgroup '${CGROUP}' in '${CONFIG}'."
        fi
-else
-       echo >&2 "${0}: configuration file '${CONFIG}' is not available."
-fi
-
-if [ -z "${NAME}" -a "${CGROUP:0:7}" = "docker/" ]
-       then
-       NAME="$(docker ps --filter=id="${CGROUP:7:64}" --format="{{.Names}}")"
-       [ -z "${NAME}" ] && NAME="${CGROUP:0:19}"
-       [ ${#NAME} -gt 20 ] && NAME="${NAME:0:20}"
+#else
+#      echo >&2 "${0}: configuration file '${CONFIG}' is not available."
 fi
 
 if [ -z "${NAME}" ]
        then
-       if [ ${#CGROUP} -gt 20 ]
+       if [[ "${CGROUP}" =~ ^.*docker[-/\.][a-fA-F0-9]+[-\.]?.*$ ]]
                then
-               NAME="${CGROUP:0:20}"
-       else
-               NAME="${CGROUP}"
+               DOCKERID="$( echo "${CGROUP}" | sed "s|^.*docker[-/]\([a-fA-F0-9]\+\)[-\.]\?.*$|\1|" )"
+
+               if [ ! -z "${DOCKERID}" -a \( ${#DOCKERID} -eq 64 -o ${#DOCKERID} -eq 12 \) ]
+                       then
+                       echo >&2 "Running command: docker ps --filter=id=\"${DOCKERID}\" --format=\"{{.Names}}\""
+                       NAME="$( docker ps --filter=id="${DOCKERID}" --format="{{.Names}}" )"
+                       if [ -z "${NAME}" ]
+                               then
+                               echo >&2 "Cannot find the name of docker container '${DOCKERID}'"
+                               NAME="${DOCKERID:0:12}"
+                       else
+                               echo >&2 "Docker container '${DOCKERID}' is named '${NAME}'"
+                       fi
+               fi
        fi
+
+       [ -z "${NAME}" ] && NAME="${CGROUP}"
+       [ ${#NAME} -gt 50 ] && NAME="${NAME:0:50}"
 fi
 
-echo >&2 "${0}: cgroup '${CGROUP}' is named as '${NAME}'"
+echo >&2 "${0}: cgroup '${CGROUP}' is called '${NAME}'"
 echo "${NAME}"

diff --git a/src/sys_fs_cgroup.c b/src/sys_fs_cgroup.c
index 4f12cadce36dee2fa5d55ad0de2ba2adccf16ad6..a5b566cafde1df24880b148f1207637017b9349c 100644 (file)
--- a/src/sys_fs_cgroup.c
+++ b/src/sys_fs_cgroup.c
@@ -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() {
@@ -657,18 +657,23 @@ struct cgroup *cgroup_add(const char *id) {
                                !strcmp(chart_id, "libvirt") ||
                                !strcmp(chart_id, "qemu") ||
                                !strcmp(chart_id, "systemd") ||
-                               !strcmp(chart_id, "user.slice") ||
                                !strcmp(chart_id, "system.slice") ||
                                !strcmp(chart_id, "machine.slice") ||
                                !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 >  6 && !strncmp(&chart_id[len -  6], ".scope", 6)) ||
+                               (len >  6 && !strncmp(&chart_id[len -  6], ".slice", 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 cgroup parent (by default %s)", id, (def)?"enabled":"disabled");
+                       debug(D_CGROUP, "cgroup '%s' is %s (by default)", id, (def)?"enabled":"disabled");
                }
        }
 
@@ -813,18 +818,7 @@ void find_dir_in_subdirs(const char *base, const char *this, void (*callback)(co
                                char option[FILENAME_MAX + 1];
                                snprintf(option, FILENAME_MAX, "search for cgroups under %s", r);
                                option[FILENAME_MAX] = '\0';
-
-                               int def = 1;
-                               size_t len = strlen(r);
-                               if((len > 5 && !strncmp(&r[len - 5], ".user", 5)) ||
-                                       !strcmp(r, "system.slice") ||
-                                       !strcmp(r, "user.slice") ||
-                                       !strcmp(r, "system") ||
-                                       !strcmp(r, "user") ||
-                                       !strcmp(r, "systemd"))
-                                       def = 0;
-
-                               enabled = config_get_boolean("plugin:cgroups", option, def);
+                               enabled = config_get_boolean("plugin:cgroups", option, 1);
                        }
 
                        if(enabled) {