Merge pull request #129 from MrAnno/fix-stats-assert

stats-query: fix assert and showing timestamps
axoflow · May 28, 2024 · 26ea041 · 26ea041
2 parents 883ad51 + d7a8263
commit 26ea041
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/lib/stats/stats-query.c b/lib/stats/stats-query.c
@@ -94,7 +94,8 @@ _process_counter_if_matching(StatsCluster *sc, gint type, StatsCounterItem *coun
 static void
 _process_counters(StatsCluster *sc, gpointer user_data /*, gboolean* cancelled */)
 {
-  stats_cluster_foreach_counter(sc, _process_counter_if_matching, user_data /*, cancelled*/);
+  if (stats_cluster_key_is_legacy(&sc->key))
+    stats_cluster_foreach_counter(sc, _process_counter_if_matching, user_data /*, cancelled*/);
 }
 
 static gboolean

diff --git a/lib/stats/stats-registry.c b/lib/stats/stats-registry.c
@@ -295,6 +295,7 @@ stats_register_associated_counter(StatsCluster *sc, gint type, StatsCounterItem
   g_assert(sc->dynamic);
 
   *counter = stats_cluster_track_counter(sc, type);
+  _update_counter_name_if_needed(*counter, sc, type);
 }
 
 void

diff --git a/news/bugfix-129-2.md b/news/bugfix-129-2.md
@@ -0,0 +1 @@
+`syslog-ng-ctl query`: show timestamps and fix `g_pattern_spec_match_string` assert
diff --git a/news/bugfix-129.md b/news/bugfix-129.md
@@ -0,0 +1,3 @@
+`syslog-ng-ctl query`: fix showing Prometheus metrics as unnamed values
+
+`none.value=726685`
-Original file line number
+Diff line change
@@ Expand Up @@
       g_assert(sc->dynamic);
       *counter = stats_cluster_track_counter(sc, type);
+      _update_counter_name_if_needed(*counter, sc, type);
     }
     void
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		`syslog-ng-ctl query`: show timestamps and fix `g_pattern_spec_match_string` assert
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		`syslog-ng-ctl query`: fix showing Prometheus metrics as unnamed values

		`none.value=726685`