diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua index a77b7aff42..4cf3717de3 100644 --- a/scripts/locales/en.lua +++ b/scripts/locales/en.lua @@ -649,8 +649,8 @@ local lang = { ["nfq_flushed"] = "Interface %{name} packets queue flushed. Queue %{pct}%% full with %{tot} packets and %{dropped} drops.", ["ngi_trust_event"] = "Abnormal activity detected for device %{mac} at %{time}. [Last state: %{last_state}][Unchanged since: %{state_unchanged_since}][Abnormality grade: %{abnormality_grade}]", ["ngi_trust_event_released"] = "Device %{mac} state is back to normal at %{time}. [Last state: %{last_state}][Unchanged since: %{state_unchanged_since}][Abnormality grade: %{abnormality_grade}]", - ["no_influxdb"] = "Please enable timeseries dump to InfluxDB and then reload this page", ["no_clickhouse"] = "ClickHouse not enabled.", + ["no_influxdb"] = "Please enable timeseries dump to InfluxDB and then reload this page", ["ntopng_anomalous_termination"] = "Started after anomalous termination (bug report)", ["ntopng_start"] = "Started", ["ntopng_stop"] = "Stopped", @@ -726,6 +726,8 @@ local lang = { ["blocked_flow"] = "Flow Risk", ["broadcast_domain_too_large"] = "Broadcast domain", ["checks_calls_drops"] = "Checks Calls Dropped", + ["clickhouse_monitor"] = "ClickHouse monitor", + ["clickhouse_monitor_description"] = "Monitor the ClickHouse health", ["client_and_server_countries_blacklisted"] = "Client country %{cli_country} and server country %{srv_country} are blacklisted", ["client_country_blacklisted"] = "Client country %{country} is blacklisted", ["connection_issues"] = "TCP Issues", @@ -788,8 +790,6 @@ local lang = { ["influxdb_export_failure"] = "InfluxDB Export Failure", ["influxdb_monitor"] = "InfluxDB monitor", ["influxdb_monitor_description"] = "Monitor the InfluxDB health", - ["clickhouse_monitor"] = "ClickHouse monitor", - ["clickhouse_monitor_description"] = "Monitor the ClickHouse health", ["info"] = "Info", ["internal_issues"] = "Internal Issues", ["involving_msg"] = "Flow Alerts Involving", @@ -2198,6 +2198,7 @@ local lang = { ["client_nw_latency_ms"] = "Network RTT/2 client <-> nprobe (msec)", ["community_id"] = "Community ID", ["cumulative_icmp_type"] = "Cumulative OR of ICMP type packets", + ["device_name"] = "Device Name", ["dhcp_client_ip"] = "DHCP assigned client IPv4 address", ["dhcp_client_mac"] = "MAC of the DHCP client", ["dhcp_client_name"] = "DHCP client name", @@ -2485,6 +2486,8 @@ local lang = { ["packets_selected"] = "Number of pkts selected for sampling", ["payload_hash"] = "Initial flow payload hash", ["plugin_name"] = "Plugin name used by this flow (if any)", + ["policy_action"] = "Policy Action", + ["policy_id"] = "Policy Id", ["pop_user"] = "POP3 user login", ["post_napt_dst_transport_port"] = "Post NAPT Destination Transport Port", ["post_napt_src_transport_port"] = "Post NAPT Source Transport Port", @@ -5320,8 +5323,8 @@ local lang = { ["guide_snmp_page_message"] = "Visit page SNMP to add this host to the list of configured SNMP devices.", ["not_configured_as_snmp_device_message"] = "Host %{host_ip} has not been configured as an SNMP device.", ["showing_snmp_mib_info_default_community_message"] = "Showing SNMP MIB information retrieved using the default community '%{community}'", - ["snmp_device_not_found"] = "SNMP device \"%{host}\" cannot be found: perhaps it has been removed from the list of configured SNMP devices ?", ["snmp_device_interface_not_found"] = "SNMP device \"%{host}\" interface \"%{iface}\" cannot be found: perhaps it has been removed from the list of configured SNMP devices ?", + ["snmp_device_not_found"] = "SNMP device \"%{host}\" cannot be found: perhaps it has been removed from the list of configured SNMP devices ?", ["trying_to_retrive_message"] = "Trying to retrieve host SNMP MIB using the default community '%{community}'", ["unable_to_retrive_snmp_default_community_message"] = "Unable to retrieve host SNMP MIB using the default community '%{community}'.", }, @@ -5429,6 +5432,23 @@ local lang = { ["short_desc_influxdb_storage_utilization"] = "Total disk space used by InfluxDB.", ["value"] = "Value", ["write_througput"] = "Write Througput", + ["clickhouse"] = { + ["clickhouse_alert_size"] = "Alert Tables Size", + ["clickhouse_flows_size"] = "Flows Table Size", + ["clickhouse_health_green"] = "OK", + ["clickhouse_health_green_descr"] = "ClickHouse is working OK.", + ["clickhouse_health_red"] = "Persistence Issues", + ["clickhouse_health_red_descr"] = "Unable to query ClickHouse. Expect %{product} to malfunction.", + ["clickhouse_monitor"] = "ClickHouse Monitor", + ["clickhouse_monitor_description"] = "Monitor the ClickHouse health", + ["command_hits"] = "%{cmd} Calls", + ["commands"] = "Commands", + ["short_desc_clickhouse_alert_size"] = "Total size of the ClickHouse alert tables.", + ["short_desc_clickhouse_flows_size"] = "Total size of the ClickHouse flows table.", + ["short_desc_clickhouse_health"] = "Current ClickHouse health.", + ["top_clickhouse_commands"] = "Top Commands Calls", + ["tot_calls"] = "Total Calls", + }, ["redis"] = { ["command_hits"] = "%{cmd} Calls", ["commands"] = "Commands", @@ -5445,23 +5465,6 @@ local lang = { ["top_redis_commands"] = "Top Commands Calls", ["tot_calls"] = "Total Calls", }, - ["clickhouse"] = { - ["command_hits"] = "%{cmd} Calls", - ["commands"] = "Commands", - ["clickhouse_health_green"] = "OK", - ["clickhouse_health_green_descr"] = "ClickHouse is working OK.", - ["clickhouse_health_red"] = "Persistence Issues", - ["clickhouse_health_red_descr"] = "Unable to query ClickHouse. Expect %{product} to malfunction.", - ["clickhouse_flows_size"] = "Flows Table Size", - ["clickhouse_alert_size"] = "Alert Tables Size", - ["clickhouse_monitor"] = "ClickHouse Monitor", - ["clickhouse_monitor_description"] = "Monitor the ClickHouse health", - ["short_desc_clickhouse_health"] = "Current ClickHouse health.", - ["short_desc_clickhouse_alert_size"] = "Total size of the ClickHouse alert tables.", - ["short_desc_clickhouse_flows_size"] = "Total size of the ClickHouse flows table.", - ["top_clickhouse_commands"] = "Top Commands Calls", - ["tot_calls"] = "Total Calls", - }, }, ["tags"] = { ["acknowledged"] = "Acknowledged", diff --git a/scripts/lua/modules/flow_consts.lua b/scripts/lua/modules/flow_consts.lua index f57bb5c063..b8935c33a3 100644 --- a/scripts/lua/modules/flow_consts.lua +++ b/scripts/lua/modules/flow_consts.lua @@ -504,7 +504,10 @@ flow_consts.flow_fields_description = { ['SRC_OS_NAME'] = i18n("flow_fields_description.src_os_name"), ['SRC_SW_VERSION'] = i18n("flow_fields_description.src_sw_version"), ['SRC_INTF_NAME'] = i18n("flow_fields_description.src_intf_name"), - + ['POLICY_ID'] = i18n("flow_fields_description.policy_id"), + ['POLICY_ACTION'] = i18n("flow_fields_description.policy_action"), + ['DEVICE_NAME'] = i18n("flow_fields_description.device_name"), + -- Misc ["COMMUNITY_ID"] = i18n("flow_fields_description.community_id"), ["FLOW_VERDICT"] = i18n("flow_fields_description.flow_verdict"), diff --git a/scripts/lua/modules/template.lua b/scripts/lua/modules/template.lua index e2298b4bf6..783fba02ed 100644 --- a/scripts/lua/modules/template.lua +++ b/scripts/lua/modules/template.lua @@ -386,7 +386,7 @@ template = { ['SSDP_SERVER'] = NTOP_BASE_ID+468, ['SSDP_TYPE'] = NTOP_BASE_ID+469, ['SSDP_METHOD'] = NTOP_BASE_ID+470, - + -- NetBIOS ['NETBIOS_QUERY_NAME'] = NTOP_BASE_ID+464, ['NETBIOS_QUERY_TYPE'] = NTOP_BASE_ID+465, @@ -401,7 +401,10 @@ template = { ['SRC_USER'] = NTOP_BASE_ID+546, ['SRC_OS_NAME'] = NTOP_BASE_ID+547, ['SRC_SW_VERSION'] = NTOP_BASE_ID+548, - ['SRC_INTF_NAME'] = NTOP_BASE_ID+549, + ['SRC_INTF_NAME'] = NTOP_BASE_ID+549, + ['POLICY_ID'] = NTOP_BASE_ID+550, + ['POLICY_ACTION'] = NTOP_BASE_ID+551, + ['DEVICE_NAME'] = NTOP_BASE_ID+552, } -- template id to name