New upstream version 1.6.0+dfsgupstream/1.6.0+dfsg

1 files changed, 259 insertions, 247 deletions

diff --git a/src/plugins_d.c b/src/plugins_d.c
index 4b83b528..7fa19eaf 100644
--- a/src/plugins_d.c
+++ b/src/plugins_d.c
@@ -83,302 +83,315 @@ static int pluginsd_split_words(char *str, char **words, int max_words) {
     return i;
 }
 
+inline size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp, int trust_durations) {
+    int enabled = cd->enabled;
 
-void *pluginsd_worker_thread(void *arg)
-{
-    struct plugind *cd = (struct plugind *)arg;
-    cd->obsolete = 0;
+    if(!fp || !enabled) {
+        cd->enabled = 0;
+        return 0;
+    }
 
-    char line[PLUGINSD_LINE_MAX + 1];
+    size_t count = 0;
 
-#ifdef DETACH_PLUGINS_FROM_NETDATA
-    usec_t usec = 0, susec = 0;
-    struct timeval last = {0, 0} , now = {0, 0};
-#endif
+    char line[PLUGINSD_LINE_MAX + 1];
 
     char *words[MAX_WORDS] = { NULL };
+    /* uint32_t HOST_HASH = simple_hash("HOST"); */
     uint32_t BEGIN_HASH = simple_hash("BEGIN");
     uint32_t END_HASH = simple_hash("END");
     uint32_t FLUSH_HASH = simple_hash("FLUSH");
     uint32_t CHART_HASH = simple_hash("CHART");
     uint32_t DIMENSION_HASH = simple_hash("DIMENSION");
     uint32_t DISABLE_HASH = simple_hash("DISABLE");
-#ifdef DETACH_PLUGINS_FROM_NETDATA
-    uint32_t MYPID_HASH = simple_hash("MYPID");
-    uint32_t STOPPING_WAKE_ME_UP_PLEASE_HASH = simple_hash("STOPPING_WAKE_ME_UP_PLEASE");
-#endif
 
-    size_t count = 0;
+    RRDSET *st = NULL;
+    uint32_t hash;
 
-    for(;;) {
+    errno = 0;
+    clearerr(fp);
+
+    if(unlikely(fileno(fp) == -1)) {
+        error("PLUGINSD: %s: file is not a valid stream.", cd->fullfilename);
+        goto cleanup;
+    }
+
+    while(!ferror(fp)) {
         if(unlikely(netdata_exit)) break;
 
-        FILE *fp = mypopen(cd->cmd, &cd->pid);
-        if(unlikely(!fp)) {
-            error("Cannot popen(\"%s\", \"r\").", cd->cmd);
+        char *r = fgets(line, PLUGINSD_LINE_MAX, fp);
+        if(unlikely(!r)) {
+            error("PLUGINSD: %s : read failed.", cd->fullfilename);
             break;
         }
 
-        info("PLUGINSD: '%s' running on pid %d", cd->fullfilename, cd->pid);
+        if(unlikely(netdata_exit)) break;
 
-        RRDSET *st = NULL;
-        uint32_t hash;
+        line[PLUGINSD_LINE_MAX] = '\0';
 
-        while(likely(fgets(line, PLUGINSD_LINE_MAX, fp) != NULL)) {
-            if(unlikely(netdata_exit)) break;
+        // debug(D_PLUGINSD, "PLUGINSD: %s: %s", cd->filename, line);
 
-            line[PLUGINSD_LINE_MAX] = '\0';
+        int w = pluginsd_split_words(line, words, MAX_WORDS);
+        char *s = words[0];
+        if(unlikely(!s || !*s || !w)) {
+            // debug(D_PLUGINSD, "PLUGINSD: empty line");
+            continue;
+        }
 
-            // debug(D_PLUGINSD, "PLUGINSD: %s: %s", cd->filename, line);
+        // debug(D_PLUGINSD, "PLUGINSD: words 0='%s' 1='%s' 2='%s' 3='%s' 4='%s' 5='%s' 6='%s' 7='%s' 8='%s' 9='%s'", words[0], words[1], words[2], words[3], words[4], words[5], words[6], words[7], words[8], words[9]);
 
-            int w = pluginsd_split_words(line, words, MAX_WORDS);
-            char *s = words[0];
-            if(unlikely(!s || !*s || !w)) {
-                // debug(D_PLUGINSD, "PLUGINSD: empty line");
-                continue;
-            }
+        if(likely(!simple_hash_strcmp(s, "SET", &hash))) {
+            char *dimension = words[1];
+            char *value = words[2];
 
-            // debug(D_PLUGINSD, "PLUGINSD: words 0='%s' 1='%s' 2='%s' 3='%s' 4='%s' 5='%s' 6='%s' 7='%s' 8='%s' 9='%s'", words[0], words[1], words[2], words[3], words[4], words[5], words[6], words[7], words[8], words[9]);
+            if(unlikely(!dimension || !*dimension)) {
+                error("PLUGINSD: '%s' is requesting a SET on chart '%s' of host '%s', without a dimension. Disabling it.", cd->fullfilename, st->id, host->hostname);
+                enabled = 0;
+                break;
+            }
 
-            if(likely(!simple_hash_strcmp(s, "SET", &hash))) {
-                char *dimension = words[1];
-                char *value = words[2];
+            if(unlikely(!value || !*value)) value = NULL;
 
-                if(unlikely(!dimension || !*dimension)) {
-                    error("PLUGINSD: '%s' is requesting a SET on chart '%s', without a dimension. Disabling it.", cd->fullfilename, st->id);
-                    cd->enabled = 0;
-                    killpid(cd->pid, SIGTERM);
-                    break;
-                }
+            if(unlikely(!st)) {
+                error("PLUGINSD: '%s' is requesting a SET on dimension %s with value %s on host '%s', without a BEGIN. Disabling it.", cd->fullfilename, dimension, value?value:"<nothing>", host->hostname);
+                enabled = 0;
+                break;
+            }
 
-                if(unlikely(!value || !*value)) value = NULL;
+            if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) debug(D_PLUGINSD, "PLUGINSD: '%s' is setting dimension %s/%s to %s", cd->fullfilename, st->id, dimension, value?value:"<nothing>");
 
-                if(unlikely(!st)) {
-                    error("PLUGINSD: '%s' is requesting a SET on dimension %s with value %s, without a BEGIN. Disabling it.", cd->fullfilename, dimension, value?value:"<nothing>");
-                    cd->enabled = 0;
-                    killpid(cd->pid, SIGTERM);
-                    break;
-                }
-
-                if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: '%s' is setting dimension %s/%s to %s", cd->fullfilename, st->id, dimension, value?value:"<nothing>");
+            if(value) rrddim_set(st, dimension, strtoll(value, NULL, 0));
+        }
+        else if(likely(hash == BEGIN_HASH && !strcmp(s, "BEGIN"))) {
+            char *id = words[1];
+            char *microseconds_txt = words[2];
 
-                if(value) rrddim_set(st, dimension, strtoll(value, NULL, 0));
+            if(unlikely(!id)) {
+                error("PLUGINSD: '%s' is requesting a BEGIN without a chart id for host '%s'. Disabling it.", cd->fullfilename, host->hostname);
+                enabled = 0;
+                break;
             }
-            else if(likely(hash == BEGIN_HASH && !strcmp(s, "BEGIN"))) {
-                char *id = words[1];
-                char *microseconds_txt = words[2];
 
-                if(unlikely(!id)) {
-                    error("PLUGINSD: '%s' is requesting a BEGIN without a chart id. Disabling it.", cd->fullfilename);
-                    cd->enabled = 0;
-                    killpid(cd->pid, SIGTERM);
-                    break;
-                }
+            st = rrdset_find(host, id);
+            if(unlikely(!st)) {
+                error("PLUGINSD: '%s' is requesting a BEGIN on chart '%s', which does not exist on host '%s'. Disabling it.", cd->fullfilename, id, host->hostname);
+                enabled = 0;
+                break;
+            }
 
-                st = rrdset_find(id);
-                if(unlikely(!st)) {
-                    error("PLUGINSD: '%s' is requesting a BEGIN on chart '%s', which does not exist. Disabling it.", cd->fullfilename, id);
-                    cd->enabled = 0;
-                    killpid(cd->pid, SIGTERM);
-                    break;
-                }
+            if(likely(st->counter_done)) {
+                usec_t microseconds = 0;
+                if(microseconds_txt && *microseconds_txt) microseconds = str2ull(microseconds_txt);
 
-                if(likely(st->counter_done)) {
-                    usec_t microseconds = 0;
-                    if(microseconds_txt && *microseconds_txt) microseconds = str2ull(microseconds_txt);
-                    if(microseconds) rrdset_next_usec(st, microseconds);
-                    else rrdset_next(st);
+                if(likely(microseconds)) {
+                    if(trust_durations)
+                        rrdset_next_usec_unfiltered(st, microseconds);
+                    else
+                        rrdset_next_usec(st, microseconds);
                 }
+                else rrdset_next(st);
             }
-            else if(likely(hash == END_HASH && !strcmp(s, "END"))) {
-                if(unlikely(!st)) {
-                    error("PLUGINSD: '%s' is requesting an END, without a BEGIN. Disabling it.", cd->fullfilename);
-                    cd->enabled = 0;
-                    killpid(cd->pid, SIGTERM);
-                    break;
-                }
+        }
+        else if(likely(hash == END_HASH && !strcmp(s, "END"))) {
+            if(unlikely(!st)) {
+                error("PLUGINSD: '%s' is requesting an END, without a BEGIN on host '%s'. Disabling it.", cd->fullfilename, host->hostname);
+                enabled = 0;
+                break;
+            }
+
+            if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) debug(D_PLUGINSD, "PLUGINSD: '%s' is requesting an END on chart %s", cd->fullfilename, st->id);
 
-                if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: '%s' is requesting an END on chart %s", cd->fullfilename, st->id);
+            rrdset_done(st);
+            st = NULL;
 
-                rrdset_done(st);
-                st = NULL;
+            count++;
+        }
+/*        else if(likely(hash == HOST_HASH && !strcmp(s, "HOST"))) {
+            char *guid = words[1];
+            char *hostname = words[2];
 
-                count++;
+            if(unlikely(!guid || !*guid)) {
+                error("PLUGINSD: '%s' is requesting HOST with guid '%s' and hostname '%s', without a guid. Disabling it.", cd->fullfilename, guid?guid:"", hostname?hostname:"");
+                enabled = 0;
+                break;
             }
-            else if(likely(hash == FLUSH_HASH && !strcmp(s, "FLUSH"))) {
-                debug(D_PLUGINSD, "PLUGINSD: '%s' is requesting a FLUSH", cd->fullfilename);
-                st = NULL;
+            if(unlikely(!hostname || !*hostname)) {
+                error("PLUGINSD: '%s' is requesting HOST with guid '%s' and hostname '%s', without a hostname. Disabling it.", cd->fullfilename, guid?guid:"", hostname?hostname:"");
+                enabled = 0;
+                break;
             }
-            else if(likely(hash == CHART_HASH && !strcmp(s, "CHART"))) {
-                int noname = 0;
-                st = NULL;
-
-                if((words[1]) != NULL && (words[2]) != NULL && strcmp(words[1], words[2]) == 0)
-                    noname = 1;
-
-                char *type = words[1];
-                char *id = NULL;
-                if(likely(type)) {
-                    id = strchr(type, '.');
-                    if(likely(id)) { *id = '\0'; id++; }
-                }
-                char *name = words[2];
-                char *title = words[3];
-                char *units = words[4];
-                char *family = words[5];
-                char *context = words[6];
-                char *chart = words[7];
-                char *priority_s = words[8];
-                char *update_every_s = words[9];
-
-                if(unlikely(!type || !*type || !id || !*id)) {
-                    error("PLUGINSD: '%s' is requesting a CHART, without a type.id. Disabling it.", cd->fullfilename);
-                    cd->enabled = 0;
-                    killpid(cd->pid, SIGTERM);
-                    break;
-                }
 
-                int priority = 1000;
-                if(likely(priority_s)) priority = str2i(priority_s);
-
-                int update_every = cd->update_every;
-                if(likely(update_every_s)) update_every = str2i(update_every_s);
-                if(unlikely(!update_every)) update_every = cd->update_every;
-
-                int chart_type = RRDSET_TYPE_LINE;
-                if(unlikely(chart)) chart_type = rrdset_type_id(chart);
-
-                if(unlikely(noname || !name || !*name || strcasecmp(name, "NULL") == 0 || strcasecmp(name, "(NULL)") == 0)) name = NULL;
-                if(unlikely(!family || !*family)) family = NULL;
-                if(unlikely(!context || !*context)) context = NULL;
-
-                st = rrdset_find_bytype(type, id);
-                if(unlikely(!st)) {
-                    debug(D_PLUGINSD, "PLUGINSD: Creating chart type='%s', id='%s', name='%s', family='%s', context='%s', chart='%s', priority=%d, update_every=%d"
-                        , type, id
-                        , name?name:""
-                        , family?family:""
-                        , context?context:""
-                        , rrdset_type_name(chart_type)
-                        , priority
-                        , update_every
-                        );
-
-                    st = rrdset_create(type, id, name, family, context, title, units, priority, update_every, chart_type);
-                    cd->update_every = update_every;
-                }
-                else debug(D_PLUGINSD, "PLUGINSD: Chart '%s' already exists. Not adding it again.", st->id);
+            host = rrdhost_find_or_create(hostname, guid);
+        } */
+        else if(likely(hash == FLUSH_HASH && !strcmp(s, "FLUSH"))) {
+            debug(D_PLUGINSD, "PLUGINSD: '%s' is requesting a FLUSH", cd->fullfilename);
+            st = NULL;
+        }
+        else if(likely(hash == CHART_HASH && !strcmp(s, "CHART"))) {
+            int noname = 0;
+            st = NULL;
+
+            if((words[1]) != NULL && (words[2]) != NULL && strcmp(words[1], words[2]) == 0)
+                noname = 1;
+
+            char *type = words[1];
+            char *id = NULL;
+            if(likely(type)) {
+                id = strchr(type, '.');
+                if(likely(id)) { *id = '\0'; id++; }
+            }
+            char *name = words[2];
+            char *title = words[3];
+            char *units = words[4];
+            char *family = words[5];
+            char *context = words[6];
+            char *chart = words[7];
+            char *priority_s = words[8];
+            char *update_every_s = words[9];
+
+            if(unlikely(!type || !*type || !id || !*id)) {
+                error("PLUGINSD: '%s' is requesting a CHART, without a type.id, on host '%s'. Disabling it.", cd->fullfilename, host->hostname);
+                enabled = 0;
+                break;
             }
-            else if(likely(hash == DIMENSION_HASH && !strcmp(s, "DIMENSION"))) {
-                char *id = words[1];
-                char *name = words[2];
-                char *algorithm = words[3];
-                char *multiplier_s = words[4];
-                char *divisor_s = words[5];
-                char *options = words[6];
-
-                if(unlikely(!id || !*id)) {
-                    error("PLUGINSD: '%s' is requesting a DIMENSION, without an id. Disabling it.", cd->fullfilename);
-                    cd->enabled = 0;
-                    killpid(cd->pid, SIGTERM);
-                    break;
-                }
-
-                if(unlikely(!st)) {
-                    error("PLUGINSD: '%s' is requesting a DIMENSION, without a CHART. Disabling it.", cd->fullfilename);
-                    cd->enabled = 0;
-                    killpid(cd->pid, SIGTERM);
-                    break;
-                }
 
-                long multiplier = 1;
-                if(multiplier_s && *multiplier_s) multiplier = strtol(multiplier_s, NULL, 0);
-                if(unlikely(!multiplier)) multiplier = 1;
-
-                long divisor = 1;
-                if(likely(divisor_s && *divisor_s)) divisor = strtol(divisor_s, NULL, 0);
-                if(unlikely(!divisor)) divisor = 1;
-
-                if(unlikely(!algorithm || !*algorithm)) algorithm = "absolute";
-
-                if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: Creating dimension in chart %s, id='%s', name='%s', algorithm='%s', multiplier=%ld, divisor=%ld, hidden='%s'"
-                    , st->id
-                    , id
-                    , name?name:""
-                    , rrddim_algorithm_name(rrddim_algorithm_id(algorithm))
-                    , multiplier
-                    , divisor
-                    , options?options:""
-                    );
-
-                RRDDIM *rd = rrddim_find(st, id);
-                if(unlikely(!rd)) {
-                    rd = rrddim_add(st, id, name, multiplier, divisor, rrddim_algorithm_id(algorithm));
-                    rd->flags = 0x00000000;
-                    if(options && *options) {
-                        if(strstr(options, "hidden") != NULL) rd->flags |= RRDDIM_FLAG_HIDDEN;
-                        if(strstr(options, "noreset") != NULL) rd->flags |= RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS;
-                        if(strstr(options, "nooverflow") != NULL) rd->flags |= RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS;
-                    }
-                }
-                else if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: dimension %s/%s already exists. Not adding it again.", st->id, id);
+            int priority = 1000;
+            if(likely(priority_s)) priority = str2i(priority_s);
+
+            int update_every = cd->update_every;
+            if(likely(update_every_s)) update_every = str2i(update_every_s);
+            if(unlikely(!update_every)) update_every = cd->update_every;
+
+            RRDSET_TYPE chart_type = RRDSET_TYPE_LINE;
+            if(unlikely(chart)) chart_type = rrdset_type_id(chart);
+
+            if(unlikely(noname || !name || !*name || strcasecmp(name, "NULL") == 0 || strcasecmp(name, "(NULL)") == 0)) name = NULL;
+            if(unlikely(!family || !*family)) family = NULL;
+            if(unlikely(!context || !*context)) context = NULL;
+
+            st = rrdset_find_bytype(host, type, id);
+            if(unlikely(!st)) {
+                debug(D_PLUGINSD, "PLUGINSD: Creating chart type='%s', id='%s', name='%s', family='%s', context='%s', chart='%s', priority=%d, update_every=%d"
+                      , type, id
+                      , name?name:""
+                      , family?family:""
+                      , context?context:""
+                      , rrdset_type_name(chart_type)
+                      , priority
+                      , update_every
+                );
+
+                st = rrdset_create(host, type, id, name, family, context, title, units, priority, update_every, chart_type);
+                cd->update_every = update_every;
             }
-            else if(unlikely(hash == DISABLE_HASH && !strcmp(s, "DISABLE"))) {
-                info("PLUGINSD: '%s' called DISABLE. Disabling it.", cd->fullfilename);
-                cd->enabled = 0;
-                killpid(cd->pid, SIGTERM);
+            else debug(D_PLUGINSD, "PLUGINSD: Chart '%s' already exists. Not adding it again.", st->id);
+        }
+        else if(likely(hash == DIMENSION_HASH && !strcmp(s, "DIMENSION"))) {
+            char *id = words[1];
+            char *name = words[2];
+            char *algorithm = words[3];
+            char *multiplier_s = words[4];
+            char *divisor_s = words[5];
+            char *options = words[6];
+
+            if(unlikely(!id || !*id)) {
+                error("PLUGINSD: '%s' is requesting a DIMENSION, without an id, host '%s' and chart '%s'. Disabling it.", cd->fullfilename, host->hostname, st?st->id:"UNSET");
+                enabled = 0;
                 break;
             }
-#ifdef DETACH_PLUGINS_FROM_NETDATA
-            else if(likely(hash == MYPID_HASH && !strcmp(s, "MYPID"))) {
-                char *pid_s = words[1];
-                pid_t pid = strtod(pid_s, NULL, 0);
 
-                if(likely(pid)) cd->pid = pid;
-                debug(D_PLUGINSD, "PLUGINSD: %s is on pid %d", cd->id, cd->pid);
+            if(unlikely(!st)) {
+                error("PLUGINSD: '%s' is requesting a DIMENSION, without a CHART, on host '%s'. Disabling it.", cd->fullfilename, host->hostname);
+                enabled = 0;
+                break;
             }
-            else if(likely(hash == STOPPING_WAKE_ME_UP_PLEASE_HASH && !strcmp(s, "STOPPING_WAKE_ME_UP_PLEASE"))) {
-                error("PLUGINSD: '%s' (pid %d) called STOPPING_WAKE_ME_UP_PLEASE.", cd->fullfilename, cd->pid);
 
-                now_realtime_timeval(&now);
-                if(unlikely(!usec && !susec)) {
-                    // our first run
-                    susec = cd->rrd_update_every * USEC_PER_SEC;
+            long multiplier = 1;
+            if(multiplier_s && *multiplier_s) multiplier = strtol(multiplier_s, NULL, 0);
+            if(unlikely(!multiplier)) multiplier = 1;
+
+            long divisor = 1;
+            if(likely(divisor_s && *divisor_s)) divisor = strtol(divisor_s, NULL, 0);
+            if(unlikely(!divisor)) divisor = 1;
+
+            if(unlikely(!algorithm || !*algorithm)) algorithm = "absolute";
+
+            if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+                debug(D_PLUGINSD, "PLUGINSD: Creating dimension in chart %s, id='%s', name='%s', algorithm='%s', multiplier=%ld, divisor=%ld, hidden='%s'"
+                      , st->id
+                      , id
+                      , name?name:""
+                      , rrd_algorithm_name(rrd_algorithm_id(algorithm))
+                      , multiplier
+                      , divisor
+                      , options?options:""
+                );
+
+            RRDDIM *rd = rrddim_find(st, id);
+            if(unlikely(!rd)) {
+                rd = rrddim_add(st, id, name, multiplier, divisor, rrd_algorithm_id(algorithm));
+                rrddim_flag_clear(rd, RRDDIM_FLAG_HIDDEN);
+                rrddim_flag_clear(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS);
+                if(options && *options) {
+                    if(strstr(options, "hidden") != NULL) rrddim_flag_set(rd, RRDDIM_FLAG_HIDDEN);
+                    if(strstr(options, "noreset") != NULL) rrddim_flag_set(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS);
+                    if(strstr(options, "nooverflow") != NULL) rrddim_flag_set(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS);
                 }
-                else {
-                    // second+ run
-                    usec = dt_usec(&now, &last) - susec;
-                    error("PLUGINSD: %s last loop took %llu usec (worked for %llu, sleeped for %llu).\n", cd->fullfilename, usec + susec, usec, susec);
-                    if(unlikely(usec < (rrd_update_every * USEC_PER_SEC / 2ULL))) susec = (rrd_update_every * USEC_PER_SEC) - usec;
-                    else susec = rrd_update_every * USEC_PER_SEC / 2ULL;
-                }
-
-                error("PLUGINSD: %s sleeping for %llu. Will kill with SIGCONT pid %d to wake it up.\n", cd->fullfilename, susec, cd->pid);
-                usleep(susec);
-                killpid(cd->pid, SIGCONT);
-                memmove(&last, &now, sizeof(struct timeval));
-                break;
-            }
-#endif
-            else {
-                error("PLUGINSD: '%s' is sending command '%s' which is not known by netdata. Disabling it.", cd->fullfilename, s);
-                cd->enabled = 0;
-                killpid(cd->pid, SIGTERM);
-                break;
             }
+            else if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+                debug(D_PLUGINSD, "PLUGINSD: dimension %s/%s already exists. Not adding it again.", st->id, id);
+        }
+        else if(unlikely(hash == DISABLE_HASH && !strcmp(s, "DISABLE"))) {
+            info("PLUGINSD: '%s' called DISABLE. Disabling it.", cd->fullfilename);
+            enabled = 0;
+            break;
         }
-        if(likely(count)) {
-            cd->successful_collections += count;
-            cd->serial_failures = 0;
+        else {
+            error("PLUGINSD: '%s' is sending command '%s' which is not known by netdata, for host '%s'. Disabling it.", cd->fullfilename, s, host->hostname);
+            enabled = 0;
+            break;
         }
-        else
-            cd->serial_failures++;
+    }
+
+cleanup:
+    cd->enabled = enabled;
+
+    if(likely(count)) {
+        cd->successful_collections += count;
+        cd->serial_failures = 0;
+    }
+    else
+        cd->serial_failures++;
+
+    return count;
+}
+
+void *pluginsd_worker_thread(void *arg) {
+    struct plugind *cd = (struct plugind *)arg;
+    cd->obsolete = 0;
+
+    size_t count = 0;
+
+    for(;;) {
+        if(unlikely(netdata_exit)) break;
+
+        FILE *fp = mypopen(cd->cmd, &cd->pid);
+        if(unlikely(!fp)) {
+            error("Cannot popen(\"%s\", \"r\").", cd->cmd);
+            break;
+        }
+
+        info("PLUGINSD: '%s' running on pid %d", cd->fullfilename, cd->pid);
+
+        count = pluginsd_process(localhost, cd, fp, 0);
+        error("PLUGINSD: plugin '%s' disconnected.", cd->fullfilename);
+
+        killpid(cd->pid, SIGTERM);
 
         info("PLUGINSD: '%s' on pid %d stopped after %zu successful data collections (ENDs).", cd->fullfilename, cd->pid, count);
 
         // get the return code
         int code = mypclose(fp, cd->pid);
-        
+
         if(unlikely(netdata_exit)) break;
         else if(code != 0) {
             // the plugin reports failure
@@ -442,24 +455,23 @@ void *pluginsd_main(void *ptr) {
     if(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) != 0)
         error("Cannot set pthread cancel state to ENABLE.");
 
-    char *dir_name = config_get("plugins", "plugins directory", PLUGINS_DIR);
-    int automatic_run = config_get_boolean("plugins", "enable running new plugins", 1);
-    int scan_frequency = (int) config_get_number("plugins", "check for new plugins every", 60);
+    int automatic_run = config_get_boolean(CONFIG_SECTION_PLUGINS, "enable running new plugins", 1);
+    int scan_frequency = (int) config_get_number(CONFIG_SECTION_PLUGINS, "check for new plugins every", 60);
     DIR *dir = NULL;
     struct dirent *file = NULL;
     struct plugind *cd;
 
     // enable the apps plugin by default
-    // config_get_boolean("plugins", "apps", 1);
+    // config_get_boolean(CONFIG_SECTION_PLUGINS, "apps", 1);
 
     if(scan_frequency < 1) scan_frequency = 1;
 
     for(;;) {
         if(unlikely(netdata_exit)) break;
 
-        dir = opendir(dir_name);
+        dir = opendir(netdata_configured_plugins_dir);
         if(unlikely(!dir)) {
-            error("Cannot open directory '%s'.", dir_name);
+            error("Cannot open directory '%s'.", netdata_configured_plugins_dir);
             goto cleanup;
         }
 
@@ -479,7 +491,7 @@ void *pluginsd_main(void *ptr) {
 
             char pluginname[CONFIG_MAX_NAME + 1];
             snprintfz(pluginname, CONFIG_MAX_NAME, "%.*s", (int)(len - PLUGINSD_FILE_SUFFIX_LEN), file->d_name);
-            int enabled = config_get_boolean("plugins", pluginname, automatic_run);
+            int enabled = config_get_boolean(CONFIG_SECTION_PLUGINS, pluginname, automatic_run);
 
             if(unlikely(!enabled)) {
                 debug(D_PLUGINSD, "PLUGINSD: plugin '%s' is not enabled", file->d_name);
@@ -503,10 +515,10 @@ void *pluginsd_main(void *ptr) {
                 snprintfz(cd->id, CONFIG_MAX_NAME, "plugin:%s", pluginname);
 
                 strncpyz(cd->filename, file->d_name, FILENAME_MAX);
-                snprintfz(cd->fullfilename, FILENAME_MAX, "%s/%s", dir_name, cd->filename);
+                snprintfz(cd->fullfilename, FILENAME_MAX, "%s/%s", netdata_configured_plugins_dir, cd->filename);
 
                 cd->enabled = enabled;
-                cd->update_every = (int) config_get_number(cd->id, "update every", rrd_update_every);
+                cd->update_every = (int) config_get_number(cd->id, "update every", localhost->rrd_update_every);
                 cd->started_t = now_realtime_sec();
 
                 char *def = "";