Skip to content

filter_rewrite_tag: add and-combination for rules #2399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

filter_rewrite_tag: add and-combination for rules #2399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions plugins/filter_rewrite_tag/rewrite_tag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,15 @@ static int process_config(struct flb_rewrite_tag *ctx)
entry = flb_slist_entry_get(val->val.list, 3);
rule->keep_record = flb_utils_bool(entry->str);

/* rule with and operator set ? */
entry = flb_slist_entry_get(val->val.list, 4);
if (entry) {
rule->and_combination = flb_utils_bool(entry->str);
}
else {
rule->and_combination = FLB_FALSE;
}

/* Link new rule */
mk_list_add(&rule->_head, &ctx->rules);
}
Expand Down Expand Up @@ -299,17 +308,36 @@ static int process_record(const char *tag, int tag_len, msgpack_object map,
struct mk_list *head;
struct rewrite_rule *rule = NULL;
struct flb_regex_search result = {0};
int rule_last_and = FLB_FALSE;
int rule_last = FLB_FALSE;
int rule_and_failed = FLB_FALSE;

mk_list_foreach(head, &ctx->rules) {
rule = mk_list_entry(head, struct rewrite_rule, _head);

if (rule_last_and && !rule_last) {
rule_last_and = rule->and_combination;
rule_last = FLB_FALSE;
rule = NULL;
continue;
}

ret = flb_ra_regex_match(rule->ra_key, map, rule->regex, &result);
if (ret < 0) { /* no match */
rule_last_and = rule->and_combination;
rule_last = FLB_FALSE;
rule = NULL;
continue;
}

/* A record matched, just break and check 'rule' */
break;
/* A record matched the rule */
/* OR combination: just break and check 'rule' */
if (!rule->and_combination) {
break;
}
/* AND combination: save state, go to next rule, next rule must match */
rule_last_and = FLB_TRUE;
rule_last = FLB_TRUE;
}

if (!rule) {
Expand Down
1 change: 1 addition & 0 deletions plugins/filter_rewrite_tag/rewrite_tag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
/* Rewrite rule */
struct rewrite_rule {
int keep_record; /* keep original record ? */
int and_combination; /* rule combination: false: OR, true: AND */
struct flb_regex *regex; /* matching regex */
struct flb_record_accessor *ra_key; /* key record accessor */
struct flb_record_accessor *ra_tag; /* tag record accessor */
Expand Down