diff options
author | thiagoftsm <thiagoftsm@gmail.com> | 2020-01-14 10:27:22 +0000 |
---|---|---|
committer | Timo <timotej@netdata.cloud> | 2020-01-14 11:27:22 +0100 |
commit | ef2b11fcb4d56ec946f6dc24929ba6ec0b54d0f2 (patch) | |
tree | 5ac5e89b35404bdabc08162505f9ad02c86df7c3 /collectors | |
parent | bb51e824f97cd135674e2940bdbd5458fbfba15f (diff) |
Stream with labels (#7549)
This commit enables streaming host labels
Diffstat (limited to 'collectors')
-rw-r--r-- | collectors/plugins.d/plugins_d.c | 40 | ||||
-rw-r--r-- | collectors/plugins.d/plugins_d.h | 2 |
2 files changed, 42 insertions, 0 deletions
diff --git a/collectors/plugins.d/plugins_d.c b/collectors/plugins.d/plugins_d.c index 32c5840328..7ac17587a9 100644 --- a/collectors/plugins.d/plugins_d.c +++ b/collectors/plugins.d/plugins_d.c @@ -234,9 +234,12 @@ inline size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp, int uint32_t DIMENSION_HASH = simple_hash(PLUGINSD_KEYWORD_DIMENSION); uint32_t DISABLE_HASH = simple_hash(PLUGINSD_KEYWORD_DISABLE); uint32_t VARIABLE_HASH = simple_hash(PLUGINSD_KEYWORD_VARIABLE); + uint32_t LABEL_HASH = simple_hash(PLUGINSD_KEYWORD_LABEL); + uint32_t OVERWRITE_HASH = simple_hash(PLUGINSD_KEYWORD_OVERWRITE); RRDSET *st = NULL; uint32_t hash; + struct label *new_labels = NULL; errno = 0; clearerr(fp); @@ -283,6 +286,7 @@ inline size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp, int #else r = fgets(line, PLUGINSD_LINE_MAX, fp); #endif + if(unlikely(!r)) { if(feof(fp)) error("read failed: end of file"); @@ -616,6 +620,39 @@ inline size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp, int enabled = 0; break; } + else if(likely(hash == LABEL_HASH && !strcmp(s, PLUGINSD_KEYWORD_LABEL))) { + debug(D_PLUGINSD, "requested a LABEL CHANGE"); + char *store; + if(!words[4]) + store = words[3]; + else { + store = callocz(PLUGINSD_LINE_MAX + 1, sizeof(char)); + char *move = store; + int i = 3; + while (i < w) { + size_t length = strlen(words[i]); + memcpy(move, words[i], length); + move += length; + *move++ = ' '; + + i++; + if(!words[i]) + break; + } + } + + new_labels = add_label_to_list(new_labels, words[1], store, strtol(words[2], NULL, 10)); + } + else if(likely(hash == OVERWRITE_HASH && !strcmp(s, PLUGINSD_KEYWORD_OVERWRITE))) { + debug(D_PLUGINSD, "requested a OVERWITE a variable"); + if(!host->labels) { + host->labels = new_labels; + } else { + replace_label_list(host, new_labels); + } + + new_labels = NULL; + } else { error("sent command '%s' which is not known by netdata, for host '%s'. Disabling it.", s, host->hostname); enabled = 0; @@ -626,6 +663,9 @@ inline size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp, int cleanup: cd->enabled = enabled; + if(new_labels) + free_host_labels(new_labels); + if(likely(count)) { cd->successful_collections += count; cd->serial_failures = 0; diff --git a/collectors/plugins.d/plugins_d.h b/collectors/plugins.d/plugins_d.h index 7d5c7dda47..8134b99650 100644 --- a/collectors/plugins.d/plugins_d.h +++ b/collectors/plugins.d/plugins_d.h @@ -29,6 +29,8 @@ #define PLUGINSD_KEYWORD_FLUSH "FLUSH" #define PLUGINSD_KEYWORD_DISABLE "DISABLE" #define PLUGINSD_KEYWORD_VARIABLE "VARIABLE" +#define PLUGINSD_KEYWORD_LABEL "LABEL" +#define PLUGINSD_KEYWORD_OVERWRITE "OVERWRITE" #define PLUGINSD_LINE_MAX 1024 #define PLUGINSD_LINE_MAX_SSL_READ 512 |