diff options
author | Stelios Fragkakis <52996999+stelfrag@users.noreply.github.com> | 2022-10-10 15:27:35 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-10 15:27:35 +0300 |
commit | 360e57d47bc29d0f0362c74493e4e3d932ea147e (patch) | |
tree | 79b3868c9e4f870dde09638a2953d43e28db0755 /database/engine | |
parent | e14b42359048b8a6eb39ae6b2d3434e73ff947b9 (diff) |
Parser cleanup (#13782)
* Remove end, set disable and flush actions
* Remove begin action
* Remove label action
* Remove overwrite action
* Remove chart action
* Remove dimension action
* Remove label action (part 2)
* Remove variable action
Co-authored-by: vkalintiris <vasilis@netdata.cloud>
Diffstat (limited to 'database/engine')
-rw-r--r-- | database/engine/metadata_log/logfile.c | 2 | ||||
-rwxr-xr-x | database/engine/metadata_log/metalogpluginsd.c | 51 | ||||
-rw-r--r-- | database/engine/metadata_log/metalogpluginsd.h | 8 |
3 files changed, 2 insertions, 59 deletions
diff --git a/database/engine/metadata_log/logfile.c b/database/engine/metadata_log/logfile.c index db8886f8cb..fa5961b307 100644 --- a/database/engine/metadata_log/logfile.c +++ b/database/engine/metadata_log/logfile.c @@ -388,8 +388,6 @@ static int scan_metalog_files(struct metalog_instance *ctx) parser_add_keyword(parser, PLUGINSD_KEYWORD_GUID, pluginsd_guid); parser_add_keyword(parser, PLUGINSD_KEYWORD_CONTEXT, pluginsd_context); parser_add_keyword(parser, PLUGINSD_KEYWORD_TOMBSTONE, pluginsd_tombstone); - parser->plugins_action->dimension_action = &metalog_pluginsd_dimension_action; - parser->plugins_action->chart_action = &metalog_pluginsd_chart_action; parser->plugins_action->guid_action = &metalog_pluginsd_guid_action; parser->plugins_action->context_action = &metalog_pluginsd_context_action; parser->plugins_action->tombstone_action = &metalog_pluginsd_tombstone_action; diff --git a/database/engine/metadata_log/metalogpluginsd.c b/database/engine/metadata_log/metalogpluginsd.c index dcf2deb7d2..d9dce44a7b 100755 --- a/database/engine/metadata_log/metalogpluginsd.c +++ b/database/engine/metadata_log/metalogpluginsd.c @@ -44,57 +44,6 @@ PARSER_RC metalog_pluginsd_host_action( return PARSER_RC_OK; } -PARSER_RC metalog_pluginsd_chart_action(void *user, char *type, char *id, char *name, char *family, char *context, - char *title, char *units, char *plugin, char *module, int priority, - int update_every, RRDSET_TYPE chart_type, char *options) -{ - UNUSED(options); - - struct metalog_pluginsd_state *state = ((PARSER_USER_OBJECT *)user)->private; - RRDHOST *host = ((PARSER_USER_OBJECT *) user)->host; - - if (unlikely(uuid_is_null(state->host_uuid))) { - debug(D_METADATALOG, "Ignoring chart belonging to missing or ignored host."); - return PARSER_RC_OK; - } - uuid_copy(state->chart_uuid, state->uuid); - uuid_clear(state->uuid); /* Consume UUID */ - (void) sql_store_chart(&state->chart_uuid, &state->host_uuid, - type, id, name, family, context, title, units, - plugin, module, priority, update_every, - chart_type, RRD_MEMORY_MODE_DBENGINE, host ? host->rrd_history_entries : 1); - ((PARSER_USER_OBJECT *)user)->st_exists = 1; - - return PARSER_RC_OK; -} - -PARSER_RC metalog_pluginsd_dimension_action(void *user, RRDSET *st, char *id, char *name, char *algorithm, - long multiplier, long divisor, char *options, RRD_ALGORITHM algorithm_type) -{ - struct metalog_pluginsd_state *state = ((PARSER_USER_OBJECT *)user)->private; - UNUSED(user); - UNUSED(options); - UNUSED(algorithm); - UNUSED(st); - - if (unlikely(uuid_is_null(state->chart_uuid))) { - debug(D_METADATALOG, "Ignoring dimension belonging to missing or ignored chart."); - info("Ignoring dimension belonging to missing or ignored chart."); - return PARSER_RC_OK; - } - - if (unlikely(uuid_is_null(state->uuid))) { - debug(D_METADATALOG, "Ignoring dimension without unknown UUID"); - info("Ignoring dimension without unknown UUID"); - return PARSER_RC_OK; - } - - (void) sql_store_dimension(&state->uuid, &state->chart_uuid, id, name, multiplier, divisor, algorithm_type); - uuid_clear(state->uuid); /* Consume UUID */ - - return PARSER_RC_OK; -} - PARSER_RC metalog_pluginsd_guid_action(void *user, uuid_t *uuid) { struct metalog_pluginsd_state *state = ((PARSER_USER_OBJECT *)user)->private; diff --git a/database/engine/metadata_log/metalogpluginsd.h b/database/engine/metadata_log/metalogpluginsd.h index 0bc9641d65..2c7a6a1ac4 100644 --- a/database/engine/metadata_log/metalogpluginsd.h +++ b/database/engine/metadata_log/metalogpluginsd.h @@ -17,13 +17,9 @@ struct metalog_pluginsd_state { }; void metalog_pluginsd_state_init(struct metalog_pluginsd_state *state, struct metalog_instance *ctx); - -PARSER_RC metalog_pluginsd_chart_action(void *user, char *type, char *id, char *name, char *family, - char *context, char *title, char *units, char *plugin, char *module, - int priority, int update_every, RRDSET_TYPE chart_type, char *options); PARSER_RC metalog_pluginsd_dimension_action(void *user, RRDSET *st, char *id, char *name, char *algorithm, - long multiplier, long divisor, char *options, - RRD_ALGORITHM algorithm_type); + long multiplier, long divisor, char *options, + RRD_ALGORITHM algorithm_type); PARSER_RC metalog_pluginsd_guid_action(void *user, uuid_t *uuid); PARSER_RC metalog_pluginsd_context_action(void *user, uuid_t *uuid); PARSER_RC metalog_pluginsd_tombstone_action(void *user, uuid_t *uuid); |