systemd-journal fixes (#15814)
Costa Tsaousis committed
Aug 15, 2023 at 22:41 UTC
32a08e7a730794044b8c0f5989e873742d7af9e9
3 files changed
+11
-5
collectors/apps.plugin/apps_plugin.c
+4
-1
@@ -16,6 +16,9 @@
16
fprintf(stdout, PLUGINSD_KEYWORD_FUNCTION " \"processes\" %d \"%s\"\n", PLUGINS_FUNCTIONS_TIMEOUT_DEFAULT, APPS_PLUGIN_PROCESSES_FUNCTION_DESCRIPTION); \
17
} while(0)
18
19
+#define APPS_PLUGIN_GLOBAL_FUNCTIONS() do { \
20
+ fprintf(stdout, PLUGINSD_KEYWORD_FUNCTION " GLOBAL \"processes\" %d \"%s\"\n", PLUGINS_FUNCTIONS_TIMEOUT_DEFAULT, APPS_PLUGIN_PROCESSES_FUNCTION_DESCRIPTION); \
21
+ } while(0)
22
23
// ----------------------------------------------------------------------------
24
// debugging
@@ -5687,7 +5690,7 @@ int main(int argc, char **argv) {
5690
netdata_thread_create(&reader_thread, "APPS_READER", NETDATA_THREAD_OPTION_DONT_LOG, reader_main, NULL);
5691
netdata_mutex_lock(&mutex);
5692
5690
- APPS_PLUGIN_FUNCTIONS();
5693
+ APPS_PLUGIN_GLOBAL_FUNCTIONS();
5694
5695
usec_t step = update_every * USEC_PER_SEC;
5696
global_iterations_counter = 1;
collectors/systemd-journal.plugin/systemd-journal.c
+1
-1
@@ -566,7 +566,7 @@ int main(int argc __maybe_unused, char **argv __maybe_unused) {
566
bool tty = isatty(fileno(stderr)) == 1;
567
568
netdata_mutex_lock(&mutex);
569
- fprintf(stdout, PLUGINSD_KEYWORD_FUNCTION " \"%s\" %d \"%s\"\n",
569
+ fprintf(stdout, PLUGINSD_KEYWORD_FUNCTION " GLOBAL \"%s\" %d \"%s\"\n",
570
SYSTEMD_JOURNAL_FUNCTION_NAME, SYSTEMD_JOURNAL_DEFAULT_TIMEOUT, SYSTEMD_JOURNAL_FUNCTION_DESCRIPTION);
571
572
heartbeat_t hb;
libnetdata/facets/facets.c
+6
-3
@@ -196,14 +196,14 @@ static void facet_value_insert_callback(const DICTIONARY_ITEM *item __maybe_unus
196
FACET_VALUE *v = value;
197
FACET_KEY *k = data;
198
199
+ if(!v->selected)
200
+ v->selected = k->default_selected_for_values;
201
+
202
if(v->name) {
203
// an actual value, not a filter
204
v->name = strdupz(v->name);
205
facet_value_is_used(k, v);
206
}
204
-
205
- if(!v->selected)
206
- v->selected = k->default_selected_for_values;
207
}
208
209
static bool facet_value_conflict_callback(const DICTIONARY_ITEM *item __maybe_unused, void *old_value, void *new_value, void *data) {
@@ -218,6 +218,9 @@ static bool facet_value_conflict_callback(const DICTIONARY_ITEM *item __maybe_un
218
if(v->name)
219
facet_value_is_used(k, v);
220
221
+ internal_fatal(v->name && strcmp(v->name, nv->name) != 0, "hash conflict: '%s' and '%s' have the same hash '%s'", v->name, nv->name,
222
+ dictionary_acquired_item_name(item));
223
+
224
return false;
225
}
226