From 483926a283e118590da3f9ecfa75a8a4d62143ce Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 1 Dec 2021 07:15:11 +0100 Subject: Merging upstream version 1.32.0. Signed-off-by: Daniel Baumann --- parser/parser.c | 2 ++ parser/parser.h | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'parser') diff --git a/parser/parser.c b/parser/parser.c index 21d7fb3fc..5fc601cea 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -61,6 +61,8 @@ PARSER *parser_init(RRDHOST *host, void *user, void *input, PARSER_INPUT_TYPE fl rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_LABEL, pluginsd_label); rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_OVERWRITE, pluginsd_overwrite); rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_END, pluginsd_end); + rc += parser_add_keyword(parser, "CLABEL_COMMIT", pluginsd_clabel_commit); + rc += parser_add_keyword(parser, "CLABEL", pluginsd_clabel); rc += parser_add_keyword(parser, PLUGINSD_KEYWORD_BEGIN, pluginsd_begin); rc += parser_add_keyword(parser, "SET", pluginsd_set); } diff --git a/parser/parser.h b/parser/parser.h index 86a837e80..8d11a9007 100644 --- a/parser/parser.h +++ b/parser/parser.h @@ -3,7 +3,7 @@ #ifndef NETDATA_INCREMENTAL_PARSER_H #define NETDATA_INCREMENTAL_PARSER_H 1 -#include "../daemon/common.h" +#include "daemon/common.h" #define PARSER_MAX_CALLBACKS 20 #define PARSER_MAX_RECOVER_KEYWORDS 128 @@ -31,6 +31,8 @@ typedef struct pluginsd_action { PARSER_RC (*variable_action)(void *user, RRDHOST *host, RRDSET *st, char *name, int global, calculated_number value); PARSER_RC (*label_action)(void *user, char *key, char *value, LABEL_SOURCE source); PARSER_RC (*overwrite_action)(void *user, RRDHOST *host, struct label *new_labels); + PARSER_RC (*clabel_action)(void *user, char *key, char *value, LABEL_SOURCE source); + PARSER_RC (*clabel_commit_action)(void *user, RRDHOST *host, struct label *new_labels); PARSER_RC (*guid_action)(void *user, uuid_t *uuid); PARSER_RC (*context_action)(void *user, uuid_t *uuid); @@ -110,5 +112,7 @@ extern PARSER_RC pluginsd_overwrite(char **words, void *user, PLUGINSD_ACTION * extern PARSER_RC pluginsd_guid(char **words, void *user, PLUGINSD_ACTION *plugins_action); extern PARSER_RC pluginsd_context(char **words, void *user, PLUGINSD_ACTION *plugins_action); extern PARSER_RC pluginsd_tombstone(char **words, void *user, PLUGINSD_ACTION *plugins_action); +extern PARSER_RC pluginsd_clabel_commit(char **words, void *user, PLUGINSD_ACTION *plugins_action); +extern PARSER_RC pluginsd_clabel(char **words, void *user, PLUGINSD_ACTION *plugins_action); #endif -- cgit v1.2.3