diff options
Diffstat (limited to '')
| -rw-r--r-- | src/collectors/systemd-journal.plugin/systemd-internals.h (renamed from collectors/systemd-journal.plugin/systemd-internals.h) | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/collectors/systemd-journal.plugin/systemd-internals.h b/src/collectors/systemd-journal.plugin/systemd-internals.h index e1ae44d4f..31acb2f20 100644 --- a/collectors/systemd-journal.plugin/systemd-internals.h +++ b/src/collectors/systemd-journal.plugin/systemd-internals.h @@ -83,12 +83,11 @@ struct journal_file { #define ND_SD_JOURNAL_OPEN_FLAGS (0) -#define JOURNAL_VS_REALTIME_DELTA_DEFAULT_UT (5 * USEC_PER_SEC) // assume always 5 seconds latency -#define JOURNAL_VS_REALTIME_DELTA_MAX_UT (2 * 60 * USEC_PER_SEC) // up to 2 minutes latency +#define JOURNAL_VS_REALTIME_DELTA_DEFAULT_UT (5 * USEC_PER_SEC) // assume a 5-seconds latency +#define JOURNAL_VS_REALTIME_DELTA_MAX_UT (2 * 60 * USEC_PER_SEC) // up to 2-minutes latency extern DICTIONARY *journal_files_registry; extern DICTIONARY *used_hashes_registry; -extern DICTIONARY *function_query_status_dict; extern DICTIONARY *boot_ids_to_first_ut; int journal_file_dict_items_backward_compar(const void *a, const void *b); @@ -115,31 +114,24 @@ usec_t journal_file_update_annotation_boot_id(sd_journal *j, struct journal_file #define MAX_JOURNAL_DIRECTORIES 100 struct journal_directory { - char *path; + STRING *path; }; extern struct journal_directory journal_directories[MAX_JOURNAL_DIRECTORIES]; void journal_init_files_and_directories(void); -void journal_init_query_status(void); -void function_systemd_journal(const char *transaction, char *function, int timeout, bool *cancelled); +void function_systemd_journal(const char *transaction, char *function, usec_t *stop_monotonic_ut, bool *cancelled, BUFFER *payload, HTTP_ACCESS access __maybe_unused, const char *source, void *data); void journal_file_update_header(const char *filename, struct journal_file *jf); -void netdata_systemd_journal_message_ids_init(void); -void netdata_systemd_journal_transform_message_id(FACETS *facets __maybe_unused, BUFFER *wb, FACETS_TRANSFORMATION_SCOPE scope __maybe_unused, void *data __maybe_unused); +void netdata_systemd_journal_annotations_init(void); +void netdata_systemd_journal_transform_message_id(FACETS *facets, BUFFER *wb, FACETS_TRANSFORMATION_SCOPE scope, void *data); void *journal_watcher_main(void *arg); +void journal_watcher_restart(void); #ifdef ENABLE_SYSTEMD_DBUS -void function_systemd_units(const char *transaction, char *function, int timeout, bool *cancelled); +void function_systemd_units(const char *transaction, char *function, usec_t *stop_monotonic_ut, bool *cancelled, BUFFER *payload, HTTP_ACCESS access __maybe_unused, const char *source, void *data); #endif -static inline void send_newline_and_flush(void) { - netdata_mutex_lock(&stdout_mutex); - fprintf(stdout, "\n"); - fflush(stdout); - netdata_mutex_unlock(&stdout_mutex); -} - static inline bool parse_journal_field(const char *data, size_t data_length, const char **key, size_t *key_length, const char **value, size_t *value_length) { const char *k = data; const char *equal = strchr(k, '='); @@ -159,4 +151,6 @@ static inline bool parse_journal_field(const char *data, size_t data_length, con return true; } +void systemd_journal_dyncfg_init(struct functions_evloop_globals *wg); + #endif //NETDATA_COLLECTORS_SYSTEMD_INTERNALS_H |