From 965a310836e554615a3160681da6219f58bb1468 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 29 Aug 2024 14:04:45 +0300 Subject: [PATCH] stats: Remove event_exporter_transport_args and _transport_timeout settings These are handled by transport-specific settings now. --- src/stats/stats-metrics.c | 3 --- src/stats/stats-metrics.h | 8 -------- src/stats/stats-settings.c | 4 ---- src/stats/stats-settings.h | 2 -- 4 files changed, 17 deletions(-) diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c index f8a72ba844..b7b8491aac 100644 --- a/src/stats/stats-metrics.c +++ b/src/stats/stats-metrics.c @@ -45,8 +45,6 @@ static int stats_exporters_add_set(struct stats_metrics *metrics, &exporter, error_r) < 0) return -1; exporter->name = p_strdup(metrics->pool, set->name); - exporter->transport_args = p_strdup(metrics->pool, set->transport_args); - exporter->transport_timeout = set->transport_timeout; exporter->time_format = set->parsed_time_format; /* TODO: The following should be plugable. @@ -68,7 +66,6 @@ static int stats_exporters_add_set(struct stats_metrics *metrics, } exporter->transport = transport; - exporter->transport_args = set->transport_args; array_push_back(&metrics->exporters, &exporter); return 0; diff --git a/src/stats/stats-metrics.h b/src/stats/stats-metrics.h index 762f692c8f..18915e1d6e 100644 --- a/src/stats/stats-metrics.h +++ b/src/stats/stats-metrics.h @@ -28,14 +28,6 @@ struct event_exporter { /* mime type for the format */ const char *format_mime_type; - /* - * transport options - * - * the "how do we get the event to the external location" knobs - */ - const char *transport_args; - unsigned int transport_timeout; - const struct event_exporter_transport *transport; }; diff --git a/src/stats/stats-settings.c b/src/stats/stats-settings.c index d463ea5025..e8dcbec00b 100644 --- a/src/stats/stats-settings.c +++ b/src/stats/stats-settings.c @@ -70,8 +70,6 @@ const struct setting_keyvalue stats_service_settings_defaults[] = { static const struct setting_define stats_exporter_setting_defines[] = { DEF(STR, name), DEF(ENUM, driver), - DEF(STR, transport_args), - DEF(TIME_MSECS, transport_timeout), DEF(STR, format), DEF(STR, format_args), SETTING_DEFINE_LIST_END @@ -80,8 +78,6 @@ static const struct setting_define stats_exporter_setting_defines[] = { static const struct stats_exporter_settings stats_exporter_default_settings = { .name = "", .driver = "log:file:unix:http-post:drop", - .transport_args = "", - .transport_timeout = 250, /* ms */ .format = "", .format_args = "", }; diff --git a/src/stats/stats-settings.h b/src/stats/stats-settings.h index f74a8c4c11..7969f01c2a 100644 --- a/src/stats/stats-settings.h +++ b/src/stats/stats-settings.h @@ -67,8 +67,6 @@ struct stats_exporter_settings { const char *name; const char *driver; - const char *transport_args; - unsigned int transport_timeout; const char *format; const char *format_args; -- 2.47.3