Merging upstream version 1.46.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 0 insertions, 350 deletions

diff --git a/fluent-bit/plugins/out_flowcounter/CMakeLists.txt b/fluent-bit/plugins/out_flowcounter/CMakeLists.txt
deleted file mode 100644
index 7699b196a..000000000
--- a/fluent-bit/plugins/out_flowcounter/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-set(src
-  out_flowcounter.c)
-
-FLB_PLUGIN(out_flowcounter "${src}" "")
diff --git a/fluent-bit/plugins/out_flowcounter/out_flowcounter.c b/fluent-bit/plugins/out_flowcounter/out_flowcounter.c
deleted file mode 100644
index 1ed14636f..000000000
--- a/fluent-bit/plugins/out_flowcounter/out_flowcounter.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-/*  Fluent Bit
- *  ==========
- *  Copyright (C) 2015-2022 The Fluent Bit Authors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#include <fluent-bit/flb_output_plugin.h>
-#include <fluent-bit/flb_utils.h>
-#include <fluent-bit/flb_time.h>
-#include <fluent-bit/flb_log_event_decoder.h>
-
-#include <msgpack.h>
-
-#include "out_flowcounter.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <time.h>
-
-
-#define PLUGIN_NAME "out_flowcounter"
-
-static void count_initialized(struct flb_out_fcount_buffer* buf)
-{
-    buf->bytes  = 0;
-    buf->counts = 0;
-}
-
-static int time_is_valid(time_t t, struct flb_flowcounter *ctx)
-{
-    if (t < ctx->buf[ctx->index].until - ctx->tick) {
-        return FLB_FALSE;
-    }
-    return FLB_TRUE;
-}
-
-static int configure(struct flb_flowcounter *ctx,
-                     struct flb_output_instance *ins,
-                     struct flb_config *config)
-{
-    int i;
-    time_t base = time(NULL);
-    const char* pval = NULL;
-
-    /* default */
-    ctx->unit = FLB_UNIT_MIN;
-    ctx->tick         = 60;
-
-    pval = flb_output_get_property("unit", ins);
-    if (pval != NULL) {
-        /* check unit of duration */
-        if (!strcasecmp(pval, FLB_UNIT_SEC)) {
-            ctx->unit = FLB_UNIT_SEC;
-            ctx->tick = 1;
-        }
-        else if (!strcasecmp(pval, FLB_UNIT_HOUR)) {
-            ctx->unit = FLB_UNIT_HOUR;
-            ctx->tick = 3600;
-        }
-        else if(!strcasecmp(pval, FLB_UNIT_DAY)) {
-            ctx->unit = FLB_UNIT_DAY;
-            ctx->tick = 86400;
-        }
-    }
-
-    flb_plg_debug(ctx->ins, "unit is \"%s\"", ctx->unit);
-
-    /* initialize buffer */
-    ctx->size  = (config->flush / ctx->tick) + 1;
-    flb_plg_debug(ctx->ins, "buffer size=%d", ctx->size);
-
-    ctx->index = 0;
-    ctx->buf = flb_malloc(sizeof(struct flb_out_fcount_buffer) * ctx->size);
-    if (!ctx->buf) {
-        flb_errno();
-        return -1;
-    }
-
-    for (i = 0; i < ctx->size; i++) {
-        ctx->buf[i].until = base + ctx->tick*i;
-        count_initialized(&ctx->buf[i]);
-    }
-
-    return 0;
-}
-
-static void output_fcount(FILE *f, struct flb_flowcounter *ctx,
-                          struct flb_out_fcount_buffer *buf)
-{
-    fprintf(f,
-           "[%s] [%lu, {"
-           "\"counts\":%"PRIu64", "
-           "\"bytes\":%"PRIu64", "
-           "\"counts/%s\":%"PRIu64", "
-           "\"bytes/%s\":%"PRIu64" }"
-           "]\n",
-           PLUGIN_NAME, buf->until,
-           buf->counts,
-           buf->bytes,
-           ctx->unit, buf->counts/ctx->tick,
-           ctx->unit, buf->bytes/ctx->tick);
-    /* TODO filtering with tag? */
-}
-
-static void count_up(struct flb_log_event *log_event,
-                     struct flb_out_fcount_buffer *ctx, uint64_t size)
-{
-    ctx->counts++;
-    ctx->bytes += size;
-
-    /*TODO extract specific data from log_event */
-}
-
-static int out_fcount_init(struct flb_output_instance *ins, struct flb_config *config,
-                           void *data)
-{
-    int ret;
-    (void) data;
-
-    struct flb_flowcounter *ctx = NULL;
-
-    ctx = flb_malloc(sizeof(struct flb_flowcounter));
-    if (ctx == NULL) {
-        flb_errno();
-        return -1;
-    }
-    ctx->ins = ins;
-
-    ret = flb_output_config_map_set(ins, (void *) ctx);
-    if (ret == -1) {
-        flb_free(ctx);
-        return -1;
-    }
-
-    ret = configure(ctx, ins, config);
-    if (ret < 0) {
-        flb_free(ctx);
-        return -1;
-    }
-
-    flb_output_set_context(ins, ctx);
-
-    return 0;
-}
-
-static struct flb_out_fcount_buffer* seek_buffer(time_t t,
-                                                 struct flb_flowcounter *ctx)
-{
-    int i = ctx->index;
-    int32_t diff;
-
-    while (1) {
-        diff = (int32_t) difftime(ctx->buf[i].until, t);
-        if (diff >= 0 && diff <= ctx->tick) {
-            return &ctx->buf[i];
-        }
-        i++;
-
-        if (i >= ctx->size) {
-            i = 0;
-        }
-
-        if (i == ctx->index) {
-            break;
-        }
-    }
-    return NULL;
-}
-
-
-
-static void out_fcount_flush(struct flb_event_chunk *event_chunk,
-                             struct flb_output_flush *out_flush,
-                             struct flb_input_instance *i_ins,
-                             void *out_context,
-                             struct flb_config *config)
-{
-    struct flb_flowcounter *ctx = out_context;
-    struct flb_out_fcount_buffer *buf = NULL;
-    size_t off = 0;
-    time_t t;
-    uint64_t last_off   = 0;
-    uint64_t byte_data  = 0;
-    struct flb_time tm;
-    struct flb_log_event_decoder log_decoder;
-    struct flb_log_event log_event;
-    int ret;
-
-    (void) i_ins;
-    (void) config;
-
-    ret = flb_log_event_decoder_init(&log_decoder,
-                                     (char *) event_chunk->data,
-                                     event_chunk->size);
-
-    if (ret != FLB_EVENT_DECODER_SUCCESS) {
-        flb_plg_error(ctx->ins,
-                      "Log event decoder initialization error : %d", ret);
-
-        FLB_OUTPUT_RETURN(FLB_RETRY);
-    }
-    while ((ret = flb_log_event_decoder_next(
-                    &log_decoder,
-                    &log_event)) == FLB_EVENT_DECODER_SUCCESS) {
-        if (ctx->event_based) {
-            flb_time_copy(&tm, &log_event.timestamp);
-        }
-        else {
-            flb_time_get(&tm);
-        }
-        t = tm.tm.tv_sec;
-        if (time_is_valid(t, ctx) == FLB_FALSE) {
-            flb_plg_warn(ctx->ins, "out of range. Skip the record");
-            continue;
-        }
-
-        byte_data     = (uint64_t)(off - last_off);
-        last_off      = off;
-
-        buf = seek_buffer(t, ctx);
-
-        while (buf == NULL) {
-            /* flush buffer */
-            output_fcount(stdout, ctx, &ctx->buf[ctx->index]);
-            count_initialized(&ctx->buf[ctx->index]);
-            ctx->buf[ctx->index].until += ctx->tick * ctx->size;
-
-            ctx->index++;
-            if (ctx->index >= ctx->size) {
-                ctx->index = 0;
-            }
-            buf = seek_buffer(t, ctx);
-        }
-
-        if (buf != NULL) {
-            count_up(&log_event, buf, byte_data);
-        }
-    }
-
-    flb_log_event_decoder_destroy(&log_decoder);
-
-    FLB_OUTPUT_RETURN(FLB_OK);
-}
-
-static int out_fcount_exit(void *data, struct flb_config* config)
-{
-    struct flb_flowcounter *ctx = data;
-
-    if (!ctx) {
-        return 0;
-    }
-
-    flb_free(ctx->buf);
-    flb_free(ctx);
-    return 0;
-}
-
-/* Configuration properties map */
-static struct flb_config_map config_map[] = {
-    {
-     FLB_CONFIG_MAP_STR, "unit", NULL,
-     0, FLB_FALSE, 0,
-     NULL
-    },
-    {
-     FLB_CONFIG_MAP_BOOL, "event_based", "false",
-     0, FLB_TRUE, offsetof(struct flb_flowcounter, event_based),
-     NULL
-    },
-
-    /* EOF */
-    {0}
-};
-
-struct flb_output_plugin out_flowcounter_plugin = {
-    .name         = "flowcounter",
-    .description  = "FlowCounter",
-    .cb_init      = out_fcount_init,
-    .cb_flush     = out_fcount_flush,
-    .cb_exit      = out_fcount_exit,
-    .config_map   = config_map,
-    .flags        = 0,
-};
diff --git a/fluent-bit/plugins/out_flowcounter/out_flowcounter.h b/fluent-bit/plugins/out_flowcounter/out_flowcounter.h
deleted file mode 100644
index de714cf9e..000000000
--- a/fluent-bit/plugins/out_flowcounter/out_flowcounter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-/*  Fluent Bit
- *  ==========
- *  Copyright (C) 2015-2022 The Fluent Bit Authors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#ifndef FLB_OUT_FLOWCOUNTER
-#define FLB_OUT_FLOWCOUNTER
-
-#include <fluent-bit/flb_output.h>
-#include <stdint.h>
-
-#define FLB_UNIT_SEC  "second"
-#define FLB_UNIT_MIN  "minute"
-#define FLB_UNIT_HOUR "hour"
-#define FLB_UNIT_DAY  "day"
-
-struct flb_out_fcount_buffer {
-    time_t until;
-    uint64_t counts;
-    uint64_t bytes;
-};
-
-struct flb_flowcounter {
-    char     *unit;
-    int32_t   tick;
-    int       event_based;
-
-    struct flb_out_fcount_buffer *buf;
-    int index;
-    int size;
-
-    struct flb_output_instance *ins;
-};
-
-#endif