metrics_exporter: push internal metrics to new queue for /api/v2

Signed-off-by: Eduardo Silva <[email protected]>

Author: edsiper

include/fluent-bit/flb_http_server.h

@@ -22,6 +22,7 @@
 
 #ifndef FLB_HTTP_SERVER_H
 #define FLB_HTTP_SERVER_H
+
 #include "http_server/flb_hs.h"
 #include "http_server/flb_hs_utils.h"
 #include "http_server/flb_hs_endpoints.h"

include/fluent-bit/http_server/flb_hs.h

@@ -32,7 +32,7 @@
 struct flb_hs_buf {
     int users;
     flb_sds_t data;
-    char *raw_data;
+    void *raw_data;
     size_t raw_size;
     struct mk_list _head;
 };
@@ -41,6 +41,7 @@ struct flb_hs {
     mk_ctx_t *ctx;             /* Monkey HTTP Context */
     int vid;                   /* Virtual Host ID     */
     int qid_metrics;           /* Metrics Message Queue ID    */
+    int qid_metrics_v2;        /* Metrics Message Queue ID for /api/v2 */
     int qid_storage;           /* Storage Message Queue ID    */
     int qid_health;            /* health Message Queue ID    */
 
@@ -56,6 +57,7 @@ struct flb_hs *flb_hs_create(const char *listen, const char *tcp_port,
                              struct flb_config *config);
 int flb_hs_push_health_metrics(struct flb_hs *hs, void *data, size_t size);
 int flb_hs_push_pipeline_metrics(struct flb_hs *hs, void *data, size_t size);
+int flb_hs_push_metrics(struct flb_hs *hs, void *data, size_t size);
 int flb_hs_push_storage_metrics(struct flb_hs *hs, void *data, size_t size);
 
 int flb_hs_destroy(struct flb_hs *ctx);

src/flb_metrics_exporter.c

@@ -148,9 +148,17 @@ static int collect_outputs(msgpack_sbuffer *mp_sbuf, msgpack_packer *mp_pck,
 
 static int collect_metrics(struct flb_me *me)
 {
+    int ret;
     int keys;
+    char *buf_data;
+    size_t buf_size;
     struct flb_config *ctx = me->config;
+    struct cmt *cmt;
 
+    /*
+     * msgpack buffer for old-style /v1/metrics
+     * ----------------------------------------
+     */
     msgpack_sbuffer mp_sbuf;
     msgpack_packer mp_pck;
 
@@ -166,15 +174,36 @@ static int collect_metrics(struct flb_me *me)
     collect_filters(&mp_sbuf, &mp_pck, me->config);
     collect_outputs(&mp_sbuf, &mp_pck, me->config);
 
+    /*
+     * If the built-in HTTP server is enabled, push metrics and health checks
+     * ---------------------------------------------------------------------
+     */
+
 #ifdef FLB_HAVE_HTTP_SERVER
     if (ctx->http_server == FLB_TRUE) {
-        /* v1 metrics (old) */
+        /* /v1/metrics (old) */
         flb_hs_push_pipeline_metrics(ctx->http_ctx, mp_sbuf.data, mp_sbuf.size);
+
+        /* /v1/health */
         if (ctx->health_check == FLB_TRUE) {
             flb_hs_push_health_metrics(ctx->http_ctx, mp_sbuf.data, mp_sbuf.size);
         }
+
+        /* /v2/metrics: retrieve a CMetrics context with internal metrics */
+        cmt = flb_me_get_cmetrics(ctx);
+        if (cmt) {
+            /* encode context to msgpack */
+            ret = cmt_encode_msgpack_create(cmt, &buf_data, &buf_size);
+            if (ret == 0) {
+                flb_hs_push_metrics(ctx->http_ctx, buf_data, buf_size);
+                cmt_encode_msgpack_destroy(buf_data);
+            }
+            cmt_destroy(cmt);
+        }
     }
 #endif
+
+    /* destroy msgpack buffer for old-style /v1/metrics */
     msgpack_sbuffer_destroy(&mp_sbuf);