diff options
| author | Costa Tsaousis <costa@netdata.cloud> | 2023-10-16 00:24:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-16 00:24:34 +0100 |
| commit | 7a3f22e24b428de258e4b55321aed75eac97b19e (patch) | |
| tree | a7e91aef54e5a2722ca95c0ef5248040527d97e7 | |
| parent | 74ad3dd508c7e7b849c2f37e8c9d0a27b192dde2 (diff) | |
allow patterns in journal queries (#16210)
| -rw-r--r-- | collectors/systemd-journal.plugin/systemd-journal.c | 4 | ||||
| -rw-r--r-- | database/rrdfunctions.c | 52 | ||||
| -rw-r--r-- | libnetdata/facets/facets.c | 2 |
3 files changed, 29 insertions, 29 deletions
diff --git a/collectors/systemd-journal.plugin/systemd-journal.c b/collectors/systemd-journal.plugin/systemd-journal.c index 02cbb6f2bf..c2bd98e7db 100644 --- a/collectors/systemd-journal.plugin/systemd-journal.c +++ b/collectors/systemd-journal.plugin/systemd-journal.c @@ -179,7 +179,7 @@ int fstat64(int fd, struct stat64 *buf) { "|_UID" \ "|_GID" \ "|_COMM" \ - /* "|_EXE" */ \ + "|_EXE" \ /* "|_CMDLINE" */ \ "|_CAP_EFFECTIVE" \ /* "|_AUDIT_SESSION" */ \ @@ -218,7 +218,7 @@ int fstat64(int fd, struct stat64 *buf) { "|OBJECT_UID" \ "|OBJECT_GID" \ "|OBJECT_COMM" \ - /* "|OBJECT_EXE" */ \ + "|OBJECT_EXE" \ /* "|OBJECT_CMDLINE" */ \ /* "|OBJECT_AUDIT_SESSION" */ \ "|OBJECT_AUDIT_LOGINUID" \ diff --git a/database/rrdfunctions.c b/database/rrdfunctions.c index 97f293d87d..6c5baf346e 100644 --- a/database/rrdfunctions.c +++ b/database/rrdfunctions.c @@ -38,17 +38,17 @@ static unsigned char functions_allowed_chars[256] = { [30] = '_', // [31] = '_', // [32] = ' ', // SPACE keep - [33] = '_', // ! - [34] = '_', // " - [35] = '_', // # - [36] = '_', // $ - [37] = '_', // % - [38] = '_', // & - [39] = '_', // ' - [40] = '_', // ( - [41] = '_', // ) - [42] = '_', // * - [43] = '_', // + + [33] = '!', // ! keep + [34] = '"', // " keep + [35] = '#', // # keep + [36] = '$', // $ keep + [37] = '%', // % keep + [38] = '&', // & keep + [39] = '\'', // ' keep + [40] = '(', // ( keep + [41] = ')', // ) keep + [42] = '*', // * keep + [43] = '+', // + keep [44] = ',', // , keep [45] = '-', // - keep [46] = '.', // . keep @@ -64,12 +64,12 @@ static unsigned char functions_allowed_chars[256] = { [56] = '8', // 8 keep [57] = '9', // 9 keep [58] = ':', // : keep - [59] = ':', // ; convert ; to : - [60] = '_', // < - [61] = ':', // = convert = to : - [62] = '_', // > - [63] = '_', // ? - [64] = '_', // @ + [59] = ';', // ; keep + [60] = '<', // < keep + [61] = '=', // = keep + [62] = '>', // > keep + [63] = '?', // ? keep + [64] = '@', // @ keep [65] = 'A', // A keep [66] = 'B', // B keep [67] = 'C', // C keep @@ -96,12 +96,12 @@ static unsigned char functions_allowed_chars[256] = { [88] = 'X', // X keep [89] = 'Y', // Y keep [90] = 'Z', // Z keep - [91] = '_', // [ - [92] = '/', // backslash convert \ to / - [93] = '_', // ] - [94] = '_', // ^ + [91] = '[', // [ keep + [92] = '\\', // backslash keep + [93] = ']', // ] keep + [94] = '^', // ^ keep [95] = '_', // _ keep - [96] = '_', // ` + [96] = '`', // ` keep [97] = 'a', // a keep [98] = 'b', // b keep [99] = 'c', // c keep @@ -128,10 +128,10 @@ static unsigned char functions_allowed_chars[256] = { [120] = 'x', // x keep [121] = 'y', // y keep [122] = 'z', // z keep - [123] = '_', // { - [124] = '_', // | - [125] = '_', // } - [126] = '_', // ~ + [123] = '{', // { keep + [124] = '|', // | keep + [125] = '}', // } keep + [126] = '~', // ~ keep [127] = '_', // [128] = '_', // [129] = '_', // diff --git a/libnetdata/facets/facets.c b/libnetdata/facets/facets.c index ddf8acb791..52898feb30 100644 --- a/libnetdata/facets/facets.c +++ b/libnetdata/facets/facets.c @@ -1458,7 +1458,7 @@ void facets_set_query(FACETS *facets, const char *query) { if(!query) return; - facets->query = simple_pattern_create(query, " \t", SIMPLE_PATTERN_SUBSTRING, false); + facets->query = simple_pattern_create(query, "|", SIMPLE_PATTERN_SUBSTRING, false); } void facets_set_items(FACETS *facets, uint32_t items) { |