From 7f88b16eaf775f783017ff23aad18b2615440abd Mon Sep 17 00:00:00 2001 From: GabrieleDeri <33870399+DGabri@users.noreply.github.com> Date: Mon, 1 Sep 2025 10:30:50 +0200 Subject: [PATCH] Removed throughput timeseries, duplicate of traffic #9579 (#9581) --- scripts/callbacks/second/system/timeseries.lua | 3 +-- .../lua/modules/timeseries/schemas/ts_second.lua | 10 ---------- scripts/lua/modules/timeseries_info.lua | 14 -------------- scripts/lua/rest/v2/get/geo_map/hosts.lua | 3 +-- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/scripts/callbacks/second/system/timeseries.lua b/scripts/callbacks/second/system/timeseries.lua index d7671099cb..a95cf6f690 100644 --- a/scripts/callbacks/second/system/timeseries.lua +++ b/scripts/callbacks/second/system/timeseries.lua @@ -28,6 +28,7 @@ local num_runs = 60 local max_time = os.time() + 60 -- See SECOND_SCRIPT_DIR in PeriodicActivities.cpp for i = 1, num_runs do + local when = os.time() local check_view = false local view_id = nil local viewed_zmq_stats = { @@ -70,8 +71,6 @@ for i = 1, num_runs do bps = ifstats.stats.throughput_bps end - ts_utils.append("iface:throughput_bps", - {ifid = ifstats.id, bps = bps}, when) ts_utils.append("iface:throughput_pps", {ifid = ifstats.id, pps = pps}, when) ts_utils.append("iface:traffic", diff --git a/scripts/lua/modules/timeseries/schemas/ts_second.lua b/scripts/lua/modules/timeseries/schemas/ts_second.lua index 8a78bdc57a..8dec4013ab 100644 --- a/scripts/lua/modules/timeseries/schemas/ts_second.lua +++ b/scripts/lua/modules/timeseries/schemas/ts_second.lua @@ -41,16 +41,6 @@ schema:addTag("ifid") schema:addMetric("bytes_ipv4") schema:addMetric("bytes_ipv6") --- ############################################## - -schema = ts_utils.newSchema("iface:throughput_bps", { - step=1, - is_critical_ts=true, - metrics_type = ts_utils.metrics.gauge, - aggregation_function = ts_utils.aggregation.max -}) -schema:addTag("ifid") -schema:addMetric("bps") -- ############################################## diff --git a/scripts/lua/modules/timeseries_info.lua b/scripts/lua/modules/timeseries_info.lua index 9b62a39da7..1c21d83f3a 100644 --- a/scripts/lua/modules/timeseries_info.lua +++ b/scripts/lua/modules/timeseries_info.lua @@ -330,20 +330,6 @@ local community_timeseries = { } }, nedge_exclude = true - }, { - schema = "iface:throughput_bps", - id = timeseries_id.iface, - label = i18n("graphs.throughput_bps"), - description = i18n("graphs.metric_descr.iface_throughput_bps"), - priority = 0, - measure_unit = "bps", - scale = i18n("graphs.metric_labels.traffic"), - timeseries = { - bps = { - label = i18n('graphs.metric_labels.throughput'), - color = timeseries_info.get_timeseries_color('bytes') - } - } }, { schema = "iface:throughput_pps", id = timeseries_id.iface, diff --git a/scripts/lua/rest/v2/get/geo_map/hosts.lua b/scripts/lua/rest/v2/get/geo_map/hosts.lua index 92025484bf..b2df638570 100644 --- a/scripts/lua/rest/v2/get/geo_map/hosts.lua +++ b/scripts/lua/rest/v2/get/geo_map/hosts.lua @@ -92,8 +92,7 @@ if (data) and (data["hosts"]) then address .. "][Score: " .. value.score .. "]") goto skip_host end - tprint(value) - tprint("-------") + local host = { lat = value["latitude"], lng = value["longitude"],