syslog-ng-ctl: stats and get query now both supports prometheus and csv output formats

Signed-off-by: Hofi <hofione@gmail.com>

Author: HofiOne

lib/stats/stats-csv.c

@@ -25,6 +25,7 @@
 #include "stats/stats-registry.h"
 #include "stats/stats-cluster.h"
 #include "utf8utils.h"
+#include "scratch-buffers.h"
 
 #include <string.h>
 
@@ -58,16 +59,13 @@ stats_format_csv_escapevar(const gchar *var)
   return escaped_result;
 }
 
-static void
-stats_format_csv(StatsCluster *sc, gint type, StatsCounterItem *counter, gpointer user_data)
+GString *
+stats_csv_format_counter(StatsCluster *sc, gint type, StatsCounterItem *counter)
 {
-  gpointer *args = (gpointer *) user_data;
-  StatsCSVRecordFunc process_record = (StatsCSVRecordFunc) args[0];
-  gpointer process_record_arg = args[1];
   gchar *s_id, *s_instance, *tag_name;
   gchar buf[32];
   gchar state;
-  GString *csv = g_string_sized_new(512);
+  GString *csv = scratch_buffers_alloc();
 
   s_id = stats_format_csv_escapevar(sc->key.legacy.id);
   s_instance = stats_format_csv_escapevar(sc->key.legacy.instance);
@@ -80,14 +78,34 @@ stats_format_csv(StatsCluster *sc, gint type, StatsCounterItem *counter, gpointe
     state = 'a';
 
   tag_name = stats_format_csv_escapevar(stats_cluster_get_type_name(sc, type));
+
   g_string_printf(csv, "%s;%s;%s;%c;%s;%"G_GSIZE_FORMAT"\n",
                   stats_cluster_get_component_name(sc, buf, sizeof(buf)),
                   s_id, s_instance, state, tag_name, stats_counter_get(&sc->counter_group.counters[type]));
-  process_record(csv->str, process_record_arg);
-  g_string_free(csv, TRUE);
+
   g_free(tag_name);
   g_free(s_id);
   g_free(s_instance);
+
+  return csv;
+}
+
+static void
+stats_format_csv(StatsCluster *sc, gint type, StatsCounterItem *counter, gpointer user_data)
+{
+  gpointer *args = (gpointer *) user_data;
+  StatsCSVRecordFunc process_record = (StatsCSVRecordFunc) args[0];
+  gpointer process_record_arg = args[1];
+
+  ScratchBuffersMarker marker;
+  scratch_buffers_mark(&marker);
+
+  GString *record = stats_csv_format_counter(sc, type, counter);
+  if (!record)
+    return;
+
+  process_record(record->str, process_record_arg);
+  scratch_buffers_reclaim_marked(marker);
 }
 
 void

lib/stats/stats-csv.h

@@ -25,9 +25,12 @@
 #define STATS_CSV_H_INCLUDED 1
 
 #include "syslog-ng.h"
+#include "stats-cluster.h"
 
 typedef void (*StatsCSVRecordFunc)(const char *record, gpointer user_data);
 
+GString *stats_csv_format_counter(StatsCluster *sc, gint type, StatsCounterItem *counter);
+
 void stats_generate_csv(StatsCSVRecordFunc process_record, gpointer user_data, gboolean *cancelled);
 
 #endif

lib/stats/stats-query-commands.c

@@ -23,8 +23,11 @@
 
 #include "messages.h"
 #include "stats-query-commands.h"
+#include "stats-prometheus.h"
+#include "stats-csv.h"
 #include "stats/stats-query.h"
 #include "control/control-connection.h"
+#include "scratch-buffers.h"
 
 typedef enum _QueryCommand
 {
@@ -58,19 +61,54 @@ static gboolean
 _ctl_format_get(gpointer user_data)
 {
   gpointer *args = (gpointer *) user_data;
-  StatsCounterItem *ctr = (StatsCounterItem *) args[0];
-  GString *str = (GString *)args[1];
-  g_string_append_printf(str, "%s=%"G_GSIZE_FORMAT"\n", stats_counter_get_name(ctr), stats_counter_get(ctr));
+  StatsCluster *sc = (StatsCluster *) args[0];
+  gint type = GPOINTER_TO_INT(args[1]);
+  StatsCounterItem *ctr = (StatsCounterItem *) args[2];
+  const gchar *fmt = (const gchar *) args[3];
+  GString *str = (GString *)args[4];
+
+  if (g_str_equal(fmt, "kv"))
+    g_string_append_printf(str, "%s=%"G_GSIZE_FORMAT"\n", stats_counter_get_name(ctr), stats_counter_get(ctr));
+  else if (g_str_equal(fmt, "prometheus"))
+    {
+      ScratchBuffersMarker marker;
+      scratch_buffers_mark(&marker);
+
+      GString *record = stats_prometheus_format_counter(sc, type, ctr);
+      if (record == NULL)
+        return FALSE;
+
+      g_string_append(str, record->str);
+      scratch_buffers_reclaim_marked(marker);
+    }
+  else if (g_str_equal(fmt, "csv"))
+    {
+      ScratchBuffersMarker marker;
+      scratch_buffers_mark(&marker);
+
+      GString *record = stats_csv_format_counter(sc, type, ctr);
+      if (record == NULL)
+        return FALSE;
+
+      g_string_append(str, record->str);
+      scratch_buffers_reclaim_marked(marker);
+    }
+
   return TRUE;
 }
 
 static gboolean
 _ctl_format_name_without_value(gpointer user_data)
 {
   gpointer *args = (gpointer *) user_data;
-  StatsCounterItem *ctr = (StatsCounterItem *) args[0];
-  GString *str = (GString *)args[1];
+  //StatsCluster *sc = (StatsCluster *) args[0];
+  //gint type = (gint) args[1];
+  StatsCounterItem *ctr = (StatsCounterItem *) args[2];
+  //const gchar *fmt = (const gchar *) args[3];
+  GString *str = (GString *)args[4];
+
   g_string_append_printf(str, "%s\n", stats_counter_get_name(ctr));
+
   return TRUE;
 }
 
@@ -89,15 +127,15 @@ _ctl_format_get_sum(gpointer user_data)
 static gboolean
 _query_get(const gchar *output_fmt, const gchar *filter_expr, GString *result)
 {
-  return stats_query_get(filter_expr, _ctl_format_get, (gpointer)result);
+  return stats_query_get(filter_expr, _ctl_format_get, output_fmt, (gpointer)result);
 }
 
 static gboolean
 _query_get_and_reset(const gchar *output_fmt, const gchar *filter_expr, GString *result)
 {
   gboolean found_match;
 
-  found_match = stats_query_get_and_reset_counters(filter_expr, _ctl_format_get, (gpointer)result);
+  found_match = stats_query_get_and_reset_counters(filter_expr, _ctl_format_get, output_fmt, (gpointer)result);
   _append_reset_msg_if_found_matching_counters(found_match, result);
 
   return found_match;

lib/stats/stats-query.c

@@ -29,7 +29,8 @@
 
 #include <string.h>
 
-typedef void (*ProcessCounterCb)(StatsCounterItem *counter, gpointer user_data, StatsFormatCb format_cb,
+typedef void (*ProcessCounterCb)(StatsCluster *sc, gint type, StatsCounterItem *counter, gpointer user_data,
+                                 StatsFormatCb format_cb,
                                  gpointer result);
 
 static const gchar *
@@ -75,7 +76,7 @@ _process_counter_if_matching(StatsCluster *sc, gint type, StatsCounterItem *coun
         {
           *found = TRUE;
 
-          process_func(counter, process_func_user_data, format_cb, format_cb_user_data);
+          process_func(sc, type, counter, process_func_user_data, format_cb, format_cb_user_data);
           if (must_reset)
             stats_cluster_reset_counter_if_needed(sc, counter);
 
@@ -118,29 +119,32 @@ _process_matching_counters(const gchar *key_str, ProcessCounterCb process_func,
 }
 
 static void
-_format_selected_counter(StatsCounterItem *counter, gpointer user_data, StatsFormatCb format_cb, gpointer result)
+_format_selected_counter(StatsCluster *sc, gint type, StatsCounterItem *counter, gpointer user_data,
+                         StatsFormatCb format_cb, gpointer result)
 {
-  gpointer args[] = {counter, result};
+  gpointer args[] = {sc, GINT_TO_POINTER(type), counter, user_data, result};
   format_cb(args);
 }
 
 gboolean
-_stats_query_get(const gchar *expr, StatsFormatCb format_cb, gpointer result, gboolean must_reset)
+_stats_query_get(const gchar *expr, StatsFormatCb format_cb, const gchar *output_fmt, gpointer result,
+                 gboolean must_reset)
 {
   const gchar *key_str = _setup_filter_expression(expr);
-  return _process_matching_counters(key_str, _format_selected_counter, NULL, format_cb, result, must_reset);
+  return _process_matching_counters(key_str, _format_selected_counter, (gpointer) output_fmt, format_cb, result,
+                                    must_reset);
 }
 
 gboolean
-stats_query_get(const gchar *expr, StatsFormatCb format_cb, gpointer result)
+stats_query_get(const gchar *expr, StatsFormatCb format_cb, const gchar *output_fmt, gpointer result)
 {
-  return _stats_query_get(expr, format_cb, result, FALSE);
+  return _stats_query_get(expr, format_cb, output_fmt, result, FALSE);
 }
 
 gboolean
-stats_query_get_and_reset_counters(const gchar *expr, StatsFormatCb format_cb, gpointer result)
+stats_query_get_and_reset_counters(const gchar *expr, StatsFormatCb format_cb, const gchar *output_fmt, gpointer result)
 {
-  return _stats_query_get(expr, format_cb, result, TRUE);
+  return _stats_query_get(expr, format_cb, output_fmt, result, TRUE);
 }
 
 static gboolean
@@ -151,7 +155,8 @@ _is_timestamp(gchar *counter_name)
 }
 
 void
-_sum_selected_counters(StatsCounterItem *counter, gpointer user_data, StatsFormatCb format_cb, gpointer result)
+_sum_selected_counters(StatsCluster *sc, gint type, StatsCounterItem *counter, gpointer user_data,
+                       StatsFormatCb format_cb, gpointer result)
 {
   gpointer *args = (gpointer *) user_data;
   gint64 *sum = (gint64 *) args[1];

lib/stats/stats-query.h

@@ -31,8 +31,9 @@ typedef gboolean (*StatsFormatCb)(gpointer user_data);
 
 gboolean stats_query_list(const gchar *expr, StatsFormatCb format_cb, gpointer result);
 gboolean stats_query_list_and_reset_counters(const gchar *expr, StatsFormatCb format_cb, gpointer result);
-gboolean stats_query_get(const gchar *expr, StatsFormatCb format_cb, gpointer result);
-gboolean stats_query_get_and_reset_counters(const gchar *expr, StatsFormatCb format_cb, gpointer result);
+gboolean stats_query_get(const gchar *expr, StatsFormatCb format_cb, const gchar *output_fmt, gpointer result);
+gboolean stats_query_get_and_reset_counters(const gchar *expr, StatsFormatCb format_cb, const gchar *output_fmt,
+                                            gpointer result);
 gboolean stats_query_get_sum(const gchar *expr, StatsFormatCb format_cb, gpointer result);
 gboolean stats_query_get_sum_and_reset_counters(const gchar *expr, StatsFormatCb format_cb, gpointer result);