Added interfaces to exporters/probes page (#8777)

http_src/vue/page-exporters.vue

@@ -175,6 +175,13 @@ const map_table_def_columns = (columns) => {
         "ntopng_interface": (value, row) => {
             return value
         },
+        "exporter_interfaces": (value, row) => {
+            if (!value) {
+                return '';
+            } else {
+                return formatterUtils.getFormatter("number")(value)
+            }
+        },
         "time_last_used": (value, row) => {
 	    if (!value)
                return '';
@@ -272,6 +279,8 @@ function columns_sorting(col, r0, r1) {
             return sortingFunctions.sortByIP(r0.probe_ip, r1.probe_ip, col.sort);
         } else if (col.id == "export_type") {
             return sortingFunctions.sortByName(r0.export_type, r1.export_type, col.sort);
+        } else if (col.id == "exporter_interfaces") {
+            return sortingFunctions.sortByNumber(r0.exporter_interfaces, r1.exporter_interfaces, col.sort);
         } else if (col.id == "time_last_used") {
             return sortingFunctions.sortByName(r0.name, r1.name, col.sort);
         } else if (col.id == "exported_flows") {

http_src/vue/page-probes.vue

@@ -158,6 +158,13 @@ const map_table_def_columns = (columns) => {
                 return formatterUtils.getFormatter("number")(value)
             }
         },
+        "exporters_interfaces": (value, row) => {
+            if (!value) {
+                return '';
+            } else {
+                return formatterUtils.getFormatter("number")(value)
+            }
+        },
         "dropped_flows": (value, row) => {
             let diff_value = value
             if (!first_open.value) {
@@ -285,6 +292,8 @@ function columns_sorting(col, r0, r1) {
             return sortingFunctions.sortByName(r0.ntopng_interface, r1.ntopng_interface, col.sort);
         } else if (col.id == "flow_exporters") {
             return sortingFunctions.sortByNumber(r0.flow_exporters, r1.flow_exporters, col.sort);
+        } else if (col.id == "exporters_interfaces") {
+            return sortingFunctions.sortByNumber(r0.exporters_interfaces, r1.exporters_interfaces, col.sort);
         } else if (col.id == "dropped_flows") {
             return sortingFunctions.sortByNumber(r0.dropped_flows, r1.dropped_flows, col.sort);
         } else if (col.id == "exported_flows") {

httpdocs/tables_config/exporters.json

@@ -57,6 +57,16 @@
 				"text-nowrap"
 			]
 		},
+		{
+			"id": "exporter_interfaces",
+			"title_i18n": "if_stats_overview.flow_exporters_interfaces_num",
+			"data_field": "exporter_interfaces",
+			"sortable": true,
+			"class": [
+				"text-center",
+				"text-nowrap"
+			]
+		},
 		{
 			"id": "time_last_used",
 			"title_i18n": "flow_devices.exporter_time_last_used",
@@ -86,5 +96,5 @@
 				"text-nowrap"
 			]
 		}
-    ]
-}
+	]
+}

httpdocs/tables_config/probes.json

@@ -59,6 +59,16 @@
 				"text-nowrap"
 			]
 		},
+		{
+			"id": "exporters_interfaces",
+			"title_i18n": "if_stats_overview.flow_exporters_interfaces_num",
+			"data_field": "exporters_interfaces",
+			"sortable": true,
+			"class": [
+				"text-center",
+				"text-nowrap"
+			]
+		},
 		{
 			"id": "exported_flows",
 			"title_i18n": "nprobe_exported_flows",

scripts/locales/en.lua

@@ -5106,6 +5106,7 @@ local lang = {
         ["exported_flows"] = "Exported Flows",
         ["family"] = "Family",
         ["flow_exporters_num"] = "Exporters",
+        ["flow_exporters_interfaces_num"] = "Interfaces",
         ["flows_export_statistics"] = "Flows Export Statistics",
         ["handled_logs"] = "Detected Events",
         ["has_traffic_directions"] = "with RX/TX Directions",

scripts/lua/rest/v2/get/interface/nprobes/data.lua

@@ -38,17 +38,27 @@ for interface_id, probes_list in pairs(ifstats.probes or {}) do
         local flow_drops = 0
         local exported_flows = 0
         local probe_interface
+        local num_ports = 0
         local flow_exporters_num = table.len(probe_info.exporters)
 
-	if probe_info["probe.mode"] == "packet_collection" then
+        if probe_info["probe.mode"] == "packet_collection" then
             flow_exporters_num = 1 -- Packet exporter
             flow_drops = probe_info["drops.elk_flow_drops"] + probe_info["drops.flow_collection_udp_socket_drops"] +
-                            probe_info["drops.export_queue_full"] + probe_info["drops.too_many_flows"] + probe_info["drops.flow_collection_drops"] +
-                            probe_info["drops.sflow_pkt_sample_drops"] + probe_info["drops.elk_flow_drops"]
+                probe_info["drops.export_queue_full"] + probe_info["drops.too_many_flows"] +
+                probe_info["drops.flow_collection_drops"] +
+                probe_info["drops.sflow_pkt_sample_drops"] + probe_info["drops.elk_flow_drops"]
             exported_flows = probe_info["zmq.num_flow_exports"]
             probe_interface = probe_info["remote.name"]
+            local ports_table = interface.getFlowDeviceInfo(probe_info["probe.uuid_num"], true)
+            for _, ports in pairs(ports_table or {}) do
+                num_ports = num_ports + table.len(ports)
+            end
         else
             for _, values in pairs(probe_info.exporters) do
+                local ports_table = interface.getFlowDeviceInfo(values.unique_source_id, true)
+                for _, ports in pairs(ports_table or {}) do
+                    num_ports = num_ports + table.len(ports)
+                end
                 flow_drops = flow_drops + values.num_drops
                 exported_flows = exported_flows + values.num_netflow_flows + values.num_sflow_flows
             end
@@ -65,18 +75,18 @@ for interface_id, probes_list in pairs(ifstats.probes or {}) do
             probe_edition = probe_info["probe.probe_edition"],
             probe_license = probe_info["probe.probe_license"] or i18n("if_stats_overview.no_license"),
             probe_maintenance = probe_info["probe.probe_maintenance"] or i18n("if_stats_overview.expired_maintenance"),
-	    probe_last_update = (probe_info["probe.last_update"] or 0),
+            probe_last_update = (probe_info["probe.last_update"] or 0),
             flow_exporters = flow_exporters_num,
+            exporters_interfaces = num_ports,
             dropped_flows = flow_drops,
-	    captured_packets = (probe_info["packets.total"] or 0),
-	    dropped_packets = (probe_info["packets.drops"] or 0),
+            captured_packets = (probe_info["packets.total"] or 0),
+            dropped_packets = (probe_info["packets.drops"] or 0),
             exported_flows = exported_flows,
             ntopng_interface = if_names[tostring(interface_id)],
             timeseries_enabled = timeseries_enabled,
             ifid = interface_id,
         }
     end
-
 end
 
 rest_utils.answer(rc, res)