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

Rename src_label/dst_label to cli_name/srv_name for consistency

Browse source
This commit is contained in:
Alfredo Cardigliano 2021-11-12 16:57:19 +01:00
parent ee1cdf4278
commit 5e93019917
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/lua/modules/alert_store/flow_alert_store.lua
View file

@ -481,7 +481,7 @@ function flow_alert_store:format_record(value, no_html)
}
if no_html then
flow_cli_ip["label"] = cli_label_long
flow_cli_ip["label"] = cli_name_long
else
-- Shortened label if necessary for UI purposes
flow_cli_ip["label"] = hostinfo2label(self:_alert2hostinfo(value, true --[[ As client --]]), true --[[ Show VLAN --]], true --[[ Shorten --]])
@ -505,7 +505,7 @@ function flow_alert_store:format_record(value, no_html)
}
if no_html then
flow_srv_ip["label"] = srv_label_long
flow_srv_ip["label"] = srv_name_long
else
-- Shortened label if necessary for UI purposes
flow_srv_ip["label"] = hostinfo2label(self:_alert2hostinfo(value, false --[[ As server --]]), true --[[ Show VLAN --]], true --[[ Shorten --]])

26
scripts/lua/modules/tag_utils.lua
View file

@ -74,6 +74,16 @@ tag_utils.defined_tags = {
i18n_label = i18n('db_search.tags.srv_ip'),
operators = {'eq', 'neq'}
},
cli_name = {
value_type = 'hostname',
i18n_label = i18n('db_search.tags.cli_name'),
operators = {'eq', 'neq'}
},
srv_name = {
value_type = 'hostname',
i18n_label = i18n('db_search.tags.srv_name'),
operators = {'eq', 'neq'}
},
src2dst_dscp = {
value_type = 'dscp_type',
i18n_label = i18n('db_search.tags.src2dst_dscp'),
@ -205,8 +215,8 @@ tag_utils.nindex_tags_to_where_v4 = {
["src2dst_dscp"] = "SRC2DST_DSCP",
["dst2src_dscp"] = "DST2SRC_DSCP",
["info"] = "INFO",
["srv_label"] = "DST_LABEL",
["cli_label"] = "SRC_LABEL",
["srv_name"] = "DST_LABEL",
["cli_name"] = "SRC_LABEL",
["cli_asn"] = "SRC_ASN",
["cli_asname"] = "SRC_ASNAME",
["srv_asn"] = "DST_ASN",
@ -242,8 +252,8 @@ tag_utils.db_columns_to_tags = {
["SRC2DST_DSCP"] = "src2dst_dscp",
["DST2SRC_DSCP"] = "dst2src_dscp",
["INFO"] = "info",
["DST_LABEL"] = "srv_label",
["SRC_LABEL"] = "cli_label",
["DST_LABEL"] = "srv_name",
["SRC_LABEL"] = "cli_name",
["SRC_ASN"] = "cli_asn",
["SRC_ASNAME"] = "cli_asname",
["DST_ASN"] = "srv_asn",
@ -335,8 +345,8 @@ tag_utils.extra_db_columns = {
["throughput"] = "(LAST_SEEN - FIRST_SEEN) as TIME_DELTA, (TOTAL_BYTES / (TIME_DELTA + 1)) * 8 as THROUGHPUT",
["ip_version"] = "IP_PROTOCOL_VERSION",
["vlan_id"] = "VLAN_ID",
["src_label"] = "SRC_LABEL",
["dst_label"] = "DST_LABEL",
["cli_name"] = "SRC_LABEL",
["srv_name"] = "DST_LABEL",
}
tag_utils.ordering_special_columns = {
@ -351,8 +361,8 @@ tag_utils.extra_where_tags = {
["srv_ip"] = {[4] = "IPV4_DST_ADDR", [6] = "IPV6_DST_ADDR"},
["cli_ip"] = {[4] = "IPV4_SRC_ADDR", [6] = "IPV6_SRC_ADDR"},
["l7proto"] = { "L7_PROTO_MASTER", "L7_PROTO" },
["src_label"] = "SRC_LABEL",
["dst_label"] = "DST_LABEL",
["cli_name"] = "SRC_LABEL",
["srv_name"] = "DST_LABEL",
}
-- #####################################