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

Minor SNMP timeseries fixes

Browse source
This commit is contained in:
Luca Deri 2023-12-21 22:10:44 +01:00
parent 55eaff90d8
commit 099558e124
4 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/lua/modules/timeseries_info.lua
View file

@ -1354,7 +1354,7 @@ local community_timeseries = {{
label = i18n('score_as_server')
}
}
}, -- os_details.lua (Operative System): --
}, -- os_details.lua (Operating System): --
{
schema = "os:traffic",
id = timeseries_id.os,
@ -2838,7 +2838,7 @@ local function choose_traffic_serie(tags, timeseries)
timeseries[#timeseries + 1] = {
schema = "snmp_if:traffic_min",
id = timeseries_id.snmp_interface,
label = i18n("graphs.traffic_rxtx"),
label = i18n("graphs.traffic_rxtx_snmp_min"),
priority = 2,
measure_unit = "bps",
scale = i18n("graphs.metric_labels.traffic"),
@ -2860,7 +2860,7 @@ local function choose_traffic_serie(tags, timeseries)
timeseries[#timeseries + 1] = {
schema = "snmp_if:traffic",
id = timeseries_id.snmp_interface,
label = i18n("graphs.traffic_per_minute"), --i18n("graphs.traffic_rxtx")
label = i18n("graphs.traffic_rxtx_snmp"), --i18n("graphs.traffic_rxtx")
priority = 2,
measure_unit = "bps",
scale = i18n("graphs.metric_labels.traffic"),
@ -2945,7 +2945,7 @@ local function add_top_flow_port_timeseries(tags, timeseries)
timeseries[#timeseries + 1] = {
schema = "snmp_if:traffic_min",
id = timeseries_id.flow_port,
label = i18n("graphs.traffic_per_minute"),--i18n("graphs.traffic_rxtx")
label = i18n("graphs.traffic_rxtx_snmp_min"),--i18n("graphs.traffic_rxtx")
priority = 2,
measure_unit = "bps",
scale = i18n("graphs.metric_labels.traffic"),
@ -2971,7 +2971,7 @@ local function add_top_flow_port_timeseries(tags, timeseries)
timeseries[#timeseries + 1] = {
schema = "flowdev_port:traffic",
id = timeseries_id.flow_port,
label = i18n("graphs.traffic_rxtx"),
label = i18n("graphs.traffic_rxtx_netflow"),
priority = 2,
measure_unit = "bps",
scale = i18n("graphs.metric_labels.traffic"),
@ -3104,8 +3104,7 @@ end
function timeseries_info.get_host_rules_schema(rule_type)
if rule_type == "host" then
local host_ts_enabled = ntop.getCache("ntopng.prefs.host_ndpi_timeseries_creation")
local has_top_protocols = host_ts_enabled == "both" or host_ts_enabled == "per_protocol" or host_ts_enabled ~=
"0"
local has_top_protocols = host_ts_enabled == "both" or host_ts_enabled == "per_protocol" or host_ts_enabled ~= "0"
local has_top_categories = host_ts_enabled == "both" or host_ts_enabled == "per_category"
local metric_list = {{
@ -3165,8 +3164,7 @@ function timeseries_info.get_host_rules_schema(rule_type)
return metric_list
elseif rule_type == "interface" then
local ifname_ts_enabled = ntop.getCache("ntopng.prefs.ifname_ndpi_timeseries_creation")
local has_top_protocols = ifname_ts_enabled == "both" or ifname_ts_enabled == "per_protocol" or
ifname_ts_enabled ~= "0"
local has_top_protocols = ifname_ts_enabled == "both" or ifname_ts_enabled == "per_protocol" or ifname_ts_enabled ~= "0"
local has_top_categories = ifname_ts_enabled == "both" or ifname_ts_enabled == "per_category"
local metric_list = {{