vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-05 10:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Renamed behavior timeseries due to the change from counter to gauge ts

Browse source
This commit is contained in:
MatteoBiscosi 2021-07-05 15:45:43 +02:00
parent 5cbc7d64b3
commit 9d2139f453
6 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/lua/modules/graph_utils.lua
View file

@ -1089,8 +1089,8 @@ if ntop.isPro() then
{schema="iface:score_anomalies", label=i18n("graphs.iface_score_anomalies")},
{schema="iface:score_behavior", label=i18n("graphs.iface_score_behavior"), split_directions = true --[[ split RX and TX directions ]], first_timeseries_only = true, metrics_labels = {i18n("graphs.score"), i18n("graphs.lower_bound"), i18n("graphs.upper_bound")}},
{schema="iface:traffic_anomalies", label=i18n("graphs.iface_traffic_anomalies")},
{schema="iface:traffic_rx_behavior", label=i18n("graphs.iface_traffic_rx_behavior"), split_directions = true --[[ split RX and TX directions ]], first_timeseries_only = true, time_elapsed = iface_behavior_update_freq, value_formatter = {"NtopUtils.fbits_from_bytes", "NtopUtils.bytesToSize"}, metrics_labels = {i18n("graphs.traffic_rcvd"), i18n("graphs.lower_bound"), i18n("graphs.upper_bound")}},
{schema="iface:traffic_tx_behavior", label=i18n("graphs.iface_traffic_tx_behavior"), split_directions = true --[[ split RX and TX directions ]], first_timeseries_only = true, time_elapsed = iface_behavior_update_freq, value_formatter = {"NtopUtils.fbits_from_bytes", "NtopUtils.bytesToSize"}, metrics_labels = {i18n("graphs.traffic_sent"), i18n("graphs.lower_bound"), i18n("graphs.upper_bound")}},
{schema="iface:traffic_rx_behavior_v2", label=i18n("graphs.iface_traffic_rx_behavior"), split_directions = true --[[ split RX and TX directions ]], first_timeseries_only = true, time_elapsed = iface_behavior_update_freq, value_formatter = {"NtopUtils.fbits_from_bytes", "NtopUtils.bytesToSize"}, metrics_labels = {i18n("graphs.traffic_rcvd"), i18n("graphs.lower_bound"), i18n("graphs.upper_bound")}},
{schema="iface:traffic_tx_behavior_v2", label=i18n("graphs.iface_traffic_tx_behavior"), split_directions = true --[[ split RX and TX directions ]], first_timeseries_only = true, time_elapsed = iface_behavior_update_freq, value_formatter = {"NtopUtils.fbits_from_bytes", "NtopUtils.bytesToSize"}, metrics_labels = {i18n("graphs.traffic_sent"), i18n("graphs.lower_bound"), i18n("graphs.upper_bound")}},
}
default_timeseries = table.merge(pro_timeseries, default_timeseries)

12
scripts/lua/modules/timeseries/schemas/ts_5min.lua
View file

@ -603,7 +603,7 @@ if ntop.isPro() then
-- ##############################################
schema = ts_utils.newSchema("asn:traffic_tx_behavior", {step=300, metrics_type=ts_utils.metrics.gauge})
schema = ts_utils.newSchema("asn:traffic_tx_behavior_v2", {step=300, metrics_type=ts_utils.metrics.gauge})
schema:addTag("ifid")
schema:addTag("asn")
schema:addMetric("value")
@ -612,7 +612,7 @@ if ntop.isPro() then
-- ##############################################
schema = ts_utils.newSchema("asn:traffic_rx_behavior", {step=300, metrics_type=ts_utils.metrics.gauge})
schema = ts_utils.newSchema("asn:traffic_rx_behavior_v2", {step=300, metrics_type=ts_utils.metrics.gauge})
schema:addTag("ifid")
schema:addTag("asn")
schema:addMetric("value")
@ -644,7 +644,7 @@ if ntop.isPro() then
-- ##############################################
schema = ts_utils.newSchema("iface:traffic_tx_behavior", {step=300, metrics_type=ts_utils.metrics.gauge})
schema = ts_utils.newSchema("iface:traffic_tx_behavior_v2", {step=300, metrics_type=ts_utils.metrics.gauge})
schema:addTag("ifid")
schema:addMetric("value")
schema:addMetric("lower_bound")
@ -652,7 +652,7 @@ if ntop.isPro() then
-- ##############################################
schema = ts_utils.newSchema("iface:traffic_rx_behavior", {step=300, metrics_type=ts_utils.metrics.gauge})
schema = ts_utils.newSchema("iface:traffic_rx_behavior_v2", {step=300, metrics_type=ts_utils.metrics.gauge})
schema:addTag("ifid")
schema:addMetric("value")
schema:addMetric("lower_bound")
@ -683,7 +683,7 @@ if ntop.isPro() then
-- ##############################################
schema = ts_utils.newSchema("subnet:traffic_tx_behavior", {step=300, metrics_type=ts_utils.metrics.gauge})
schema = ts_utils.newSchema("subnet:traffic_tx_behavior_v2", {step=300, metrics_type=ts_utils.metrics.gauge})
schema:addTag("ifid")
schema:addTag("subnet")
schema:addMetric("value")
@ -692,7 +692,7 @@ if ntop.isPro() then
-- ##############################################
schema = ts_utils.newSchema("subnet:traffic_rx_behavior", {step=300, metrics_type=ts_utils.metrics.gauge})
schema = ts_utils.newSchema("subnet:traffic_rx_behavior_v2", {step=300, metrics_type=ts_utils.metrics.gauge})
schema:addTag("ifid")
schema:addTag("subnet")
schema:addMetric("value")

12
scripts/lua/modules/timeseries/ts_utils_core.lua
View file

@ -829,20 +829,20 @@ function ts_utils.getPossiblyChangedSchemas()
"iface:score_behavior",
"iface:score_anomalies",
"iface:traffic_anomalies",
"iface:traffic_rx_behavior",
"iface:traffic_tx_behavior",
"iface:traffic_rx_behavior_v2",
"iface:traffic_tx_behavior_v2",
"subnet:score_anomalies",
"subnet:traffic_tx_behavior",
"subnet:traffic_rx_behavior",
"subnet:traffic_tx_behavior_v2",
"subnet:traffic_rx_behavior_v2",
"subnet:traffic_anomalies",
"subnet:score_behavior",
"asn:score_anomalies",
"asn:score_behavior",
"asn:traffic_anomalies",
"asn:traffic_rx_behavior",
"asn:traffic_tx_behavior",
"asn:traffic_rx_behavior_v2",
"asn:traffic_tx_behavior_v2",
-- Host timeseries
"host:contacts", -- split in "as_client" and "as_server"

12
scripts/lua/modules/ts_5min_dump_utils.lua
View file

@ -84,13 +84,13 @@ function ts_dump.subnet_update_rrds(when, ifstats, verbose)
anomaly=anomaly}, when)
-- Traffic Behaviour
ts_utils.append("subnet:traffic_rx_behavior",
ts_utils.append("subnet:traffic_rx_behavior_v2",
{ifid=ifstats.id, subnet=subnet,
value=sstats["traffic_rx_behavior"]["value"],
lower_bound = sstats["traffic_rx_behavior"]["lower_bound"],
upper_bound = sstats["traffic_rx_behavior"]["upper_bound"]}, when)
ts_utils.append("subnet:traffic_tx_behavior",
ts_utils.append("subnet:traffic_tx_behavior_v2",
{ifid=ifstats.id, subnet=subnet,
value=sstats["traffic_tx_behavior"]["value"],
lower_bound=sstats["traffic_tx_behavior"]["lower_bound"],
@ -135,11 +135,11 @@ function ts_dump.iface_update_stats_rrds(when, ifstats, verbose)
ts_utils.append("iface:score_anomalies", {ifid=ifstats.id, anomaly=anomaly}, when)
-- Traffic Behaviour
ts_utils.append("iface:traffic_rx_behavior", {ifid=ifstats.id,
ts_utils.append("iface:traffic_rx_behavior_v2", {ifid=ifstats.id,
value=ifstats["traffic_rx_behavior"]["value"], lower_bound=ifstats["traffic_rx_behavior"]["lower_bound"],
upper_bound=ifstats["traffic_rx_behavior"]["upper_bound"]}, when)
ts_utils.append("iface:traffic_tx_behavior", {ifid=ifstats.id,
ts_utils.append("iface:traffic_tx_behavior_v2", {ifid=ifstats.id,
value=ifstats["traffic_tx_behavior"]["value"], lower_bound=ifstats["traffic_tx_behavior"]["lower_bound"],
upper_bound=ifstats["traffic_tx_behavior"]["upper_bound"]}, when)
@ -236,13 +236,13 @@ function ts_dump.asn_update_rrds(when, ifstats, verbose)
anomaly=anomaly}, when)
-- Traffic Behaviour
ts_utils.append("asn:traffic_rx_behavior",
ts_utils.append("asn:traffic_rx_behavior_v2",
{ifid=ifstats.id, asn=asn,
value=asn_stats["traffic_rx_behavior"]["value"],
lower_bound=asn_stats["traffic_rx_behavior"]["lower_bound"],
upper_bound = asn_stats["traffic_rx_behavior"]["upper_bound"]}, when)
ts_utils.append("asn:traffic_tx_behavior",
ts_utils.append("asn:traffic_tx_behavior_v2",
{ifid=ifstats.id, asn=asn,
value=asn_stats["traffic_tx_behavior"]["value"],
lower_bound=asn_stats["traffic_tx_behavior"]["lower_bound"],