Merge pull request #1952 from ktsaou/master

minor fixes

diff --git a/src/sys_fs_cgroup.c b/src/sys_fs_cgroup.c
index 16d057f4031b75977d0009da3a9bbf183926ca49..8f31527dec969e13b08dc6d180650633f32e835b 100644 (file)
--- a/src/sys_fs_cgroup.c
+++ b/src/sys_fs_cgroup.c
@@ -148,6 +148,7 @@ void read_cgroup_plugin_configuration() {
     enabled_cgroup_patterns = simple_pattern_create(
             config_get("plugin:cgroups", "enable by default cgroups matching",
                     " /system.slice/docker-*.scope "
+                    " /qemu.slice/*.scope "                // #1949
                     " !*.mount "
                     " !*.partition "
                     " !*.scope "
@@ -159,18 +160,18 @@ void read_cgroup_plugin_configuration() {
                     " !/docker "
                     " !/libvirt "
                     " !/lxc "
-                    " !/lxc/*/ns "         //  #1397
+                    " !/lxc/*/ns "                         //  #1397
                     " !/machine "
                     " !/qemu "
                     " !/system "
                     " !/systemd "
                     " !/user "
-                    " * "                  // enable anything else
+                    " * "                                  // enable anything else
             ), SIMPLE_PATTERN_EXACT);
 
     enabled_cgroup_paths = simple_pattern_create(
             config_get("plugin:cgroups", "search for cgroups in subpaths matching",
-                    " !*-qemu "            //  #345
+                    " !*-qemu "                           //  #345
                     " !/init.scope "
                     " !/system "
                     " !/systemd "
@@ -184,6 +185,7 @@ void read_cgroup_plugin_configuration() {
 
     enabled_cgroup_renames = simple_pattern_create(
             config_get("plugin:cgroups", "run script to rename cgroups matching",
+                    " /qemu.slice/*.scope "                // #1949
                     " *docker* "
                     " *lxc* "
                     " !/ "

diff --git a/system/netdata.service.in b/system/netdata.service.in
index e260e2738038e7396df07bcb601a26772e86d815..6bbb84eb5faa3229ea5a78db828b89b6d03bc386 100644 (file)
--- a/system/netdata.service.in
+++ b/system/netdata.service.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=Real time performance monitoring
-After=network.target httpd.service squid.service nfs-server.service mysqld.service named.service postfix.service
+After=network.target httpd.service squid.service nfs-server.service mysqld.service mysql.service named.service postfix.service
 
 [Service]
 Type=simple