From c0ebc5d283ecf485e239cecab458b7dfd7ac91cc Mon Sep 17 00:00:00 2001
From: Manuel Ceroni <46685230+manuelceroni@users.noreply.github.com>
Date: Mon, 20 Apr 2026 16:40:08 +0200
Subject: [PATCH] Reworked the Wazuh section in the asset details (#10289)

---
 http_src/utilities/table-utils.js             |  53 +++++----
 http_src/vue/page-asset-details.vue           | 101 +++++++++++++++++-
 http_src/vue/page-assets.vue                  |   1 +
 http_src/vue/table-with-config.vue            |   3 +-
 .../tables_config/wazuh_network_ifaces.json   |  48 +++++++++
 scripts/locales/en.lua                        |  19 +++-
 scripts/lua/modules/discover_utils.lua        |   2 +-
 7 files changed, 195 insertions(+), 32 deletions(-)
 create mode 100644 httpdocs/tables_config/wazuh_network_ifaces.json

diff --git a/http_src/utilities/table-utils.js b/http_src/utilities/table-utils.js
index 39a2c747fd..06db169571 100644
--- a/http_src/utilities/table-utils.js
+++ b/http_src/utilities/table-utils.js
@@ -9,7 +9,7 @@ import FormatterUtils from "./formatter-utils.js";
 
 const _i18n = (t) => i18n(t);
 
-async function build_table(http_prefix, table_id, f_map_columns, f_get_extra_params_obj, f_on_get_rows) {
+async function build_table(http_prefix, table_id, f_map_columns, f_get_extra_params_obj, f_on_get_rows, rows_data = null) {
 	let epoch_end = Number.parseInt(Date.now() / 1000);
 	let table_def_url = `${http_prefix}/tables_config/${table_id}.json?epoch_end=${epoch_end}`;
 	let table_def = await ntopng_utility.http_request(table_def_url, null, null, true);
@@ -39,7 +39,7 @@ async function build_table(http_prefix, table_id, f_map_columns, f_get_extra_par
 	const table_config = {
 		id: table_id,
 		columns: table_def.columns,
-		get_rows: get_rows_func(table_def, f_get_extra_params_obj, f_on_get_rows),
+		get_rows: get_rows_func(table_def, f_get_extra_params_obj, f_on_get_rows, rows_data),
 		get_column_id: get_column_id_func(table_def),
 		print_column_name: get_f_print_column_name(table_def),
 		print_html_row: get_f_print_html_row(table_def),
@@ -181,7 +181,7 @@ function get_f_print_v_node_buttons(list_or_array) {
 	};
 }
 
-function get_rows_func(table_def, f_get_extra_params_obj, f_on_get_rows) {
+function get_rows_func(table_def, f_get_extra_params_obj, f_on_get_rows, rows_data = null) {
 	let f_get_column_id = get_column_id_func(table_def);
 	return async (active_page, per_page, columns_wrap, map_search, first_get_rows) => {
 		let sort_column = columns_wrap.find((c) => c.sort != 0);
@@ -201,26 +201,35 @@ function get_rows_func(table_def, f_get_extra_params_obj, f_on_get_rows) {
 			let extra_params = f_get_extra_params_obj();
 			params = { ...params, ...extra_params, };
 		}
-		const url_params = ntopng_url_manager.obj_to_url_params(params);
-		const url = `${http_prefix}/${table_def.data_url}?${url_params}`;
-		let res = await ntopng_utility.http_request(url, null, null, true);
-		if (f_on_get_rows != null) {
-			f_on_get_rows(params);
+		let rows, query_info, total_rows;
+		if (rows_data == null) {
+			const url_params = ntopng_url_manager.obj_to_url_params(params);
+			const url = `${http_prefix}/${table_def.data_url}?${url_params}`;
+			let res = await ntopng_utility.http_request(url, null, null, true);
+			if (f_on_get_rows != null) {
+				f_on_get_rows(params);
+			}
+			rows = res.rsp;
+			
+			if (table_def.rsp_records_field != null) {
+				rows = res.rsp[table_def.rsp_records_field];
+			}
+			query_info = res.query_info;
+			if (table_def.rsp_query_info_field != null) {
+				query_info = res.rsp[table_def.rsp_query_info_field];
+			}
+			// fix server rest bug
+			if (res.recordsFiltered > res.recordsTotal) {
+				res.recordsTotal = res.recordsFiltered;
+			}
+			total_rows = res.recordsTotal;
 		}
-		let rows = res.rsp;
-		if (table_def.rsp_records_field != null) {
-			rows = res.rsp[table_def.rsp_records_field];
-		}
-		let query_info = res.query_info;
-		if (table_def.rsp_query_info_field != null) {
-			query_info = res.rsp[table_def.rsp_query_info_field];
-		}
-		// fix server rest bug
-		if (res.recordsFiltered > res.recordsTotal) {
-			res.recordsTotal = res.recordsFiltered;
-		}
-		return { total_rows: res.recordsTotal, rows, query_info };
-		// return { total_rows: 1, rows: [rows[0]], query_info };
+		else {
+		    rows = rows_data;
+     		query_info = null;
+     		total_rows = rows_data.length;
+ 		}
+		return { total_rows, rows, query_info };
 	}
 }
 
diff --git a/http_src/vue/page-asset-details.vue b/http_src/vue/page-asset-details.vue
index b267191c4f..93711d3156 100644
--- a/http_src/vue/page-asset-details.vue
+++ b/http_src/vue/page-asset-details.vue
@@ -1,5 +1,5 @@
 <!--
-  (C) 2013-22 - ntop.org
+  (C) 2013-26 - ntop.org
 -->
 
 <template>
@@ -13,23 +13,69 @@
                 </div>
             </div>
         </div>
+
+        <!-- Wazuh -->
+        <div v-if="wazuh_info_rows.length > 0" class="col-md-12 col-lg-12">
+            <div class="mt-4 card card-shadow">
+
+                <div class="card-header d-flex align-items-center gap-2 fw-semibold">
+                    <span>{{ _i18n('asset_details.wazuh_asset_information') }}</span>
+                </div>
+
+                <!-- Key-value rows (status, OS, CPU, RAM …) -->
+                <div class="card-body pb-0">
+                    <BootstrapTable
+                        :horizontal="true" :id="wazuh_table_id" :rows="wazuh_info_rows"
+                        :print_html_title="print_html_title" :print_html_row="print_stats_row">
+                    </BootstrapTable>
+                </div>
+
+                <!-- Network Interfaces sub-section -->
+                <template v-if="wazuh_ifaces_rows.length > 0">
+
+                    <!-- Section label -->
+                    <div class="card-body pt-2 pb-1">
+                        <div class="d-flex align-items-center gap-2 text-muted small fw-semibold text-uppercase mb-0">
+                            <i class="fas fa-network-wired"></i>
+                            <span>{{ _i18n('asset_details.wazuh_network_interfaces') }}</span>
+                            <hr class="flex-grow-1 my-0 ms-1">
+                        </div>
+                    </div>
+
+                    <!-- Interfaces table -->
+                    <div class="card-body pt-0 pb-0">
+                        <TableWithConfig table_config_id="wazuh_network_ifaces" :rows_data="wazuh_ifaces_rows" 
+                            :f_map_columns="map_ifaces_columns" :f_sort_rows="sort_ifaces_rows" :csrf="csrf">
+                        </TableWithConfig>
+                    </div>
+
+                </template>
+
+            </div>
+        </div>
+
     </div>
 </template>
 
 <script setup>
 import { ref, onMounted } from "vue";
 import { default as BootstrapTable } from "./bootstrap-table.vue";
+import { default as TableWithConfig } from "./table-with-config.vue";
+import { default as sortingFunctions } from "../utilities/sorting-utils.js";
+import formatterUtils from "../utilities/formatter-utils";
 
 const _i18n = (t) => i18n(t);
 
 const url = "/lua/pro/rest/v2/get/host/asset_details.lua";
 const table_id = ref('asset_details');
+const wazuh_table_id  = ref('wazuh_info');
 const props = defineProps({
     ifid: Number,
     csrf: String
 });
 
 const stats_rows = ref([]);
+const wazuh_info_rows = ref([]);
 
 const print_html_title = function (name) {
     return (name || "");
@@ -38,16 +84,61 @@ const print_html_title = function (name) {
 const print_stats_row = function (value) {
     let label = value.name || '';
     if (value.url && value.url != '')
-        label = `<a href="${http_prefix}${value.url}">${label}</>`
-
+        label = `<a href="${http_prefix}${value.url}">${label}</>`;
     return label;
-}
+};
+
+// Network Interfaces
+const wazuh_ifaces_rows = ref([]);
+
+const map_ifaces_columns = (columns) => {
+    let map_columns = 
+    {
+        "name": (value, row) => {
+            return value
+        },
+        "mac": (value, row) => {
+            return value
+        },
+        "state": (value, row) => {
+            return value
+        },
+        "sent": (value, row) => {
+            return formatterUtils.getFormatter("bytes")(value)
+        },
+        "rcvd": (value, row) => {
+            return formatterUtils.getFormatter("bytes")(value)
+        }
+    }
+    columns.forEach((c) => {
+        c.render_func = map_columns[c.data_field];
+    });
+    return columns;
+};
+
+const sort_ifaces_rows = (col, r0, r1) => {
+    if (col != null) {
+        if (col.id === 'name') 
+            return sortingFunctions.sortByName(r0.name,  r1.name,  col.sort);
+        if (col.id === 'mac')
+            return sortingFunctions.sortByMacAddress(r0.mac, r1.mac, col.sort);
+        if (col.id === 'state')
+            return sortingFunctions.sortByName(r0.state, r1.state, col.sort);
+        if (col.id === 'sent')
+            return sortingFunctions.sortByNumber(r0.sent, r1.sent, col.sort);
+        if (col.id === 'rcvd')
+            return sortingFunctions.sortByNumber(r0.rcvd, r1.rcvd, col.sort);
+    }
+    return 0;
+};
 
 onMounted(async () => {
     const extra_params = ntopng_url_manager.get_url_object();
     const url_params = ntopng_url_manager.obj_to_url_params(extra_params);
     const host_stats = await ntopng_utility.http_request(`${http_prefix}${url}?${url_params}`);
-    stats_rows.value = host_stats.host_info
+    stats_rows.value = host_stats.host_info || [];
+    wazuh_info_rows.value = host_stats.wazuh_info_rows || [];
+    wazuh_ifaces_rows.value = host_stats.wazuh_network_ifaces || [];
     $('#navbar_title').html("<i class='fas fa-laptop'></i> " + _i18n('asset_details.assets') + ": " + host_stats.host_name);
 });
 
diff --git a/http_src/vue/page-assets.vue b/http_src/vue/page-assets.vue
index 6e74b426cd..32a8050262 100644
--- a/http_src/vue/page-assets.vue
+++ b/http_src/vue/page-assets.vue
@@ -451,6 +451,7 @@ const exec_merge_wazuh = async function () {
                     modal_merge_wazuh_info.value.show_error(err);
                     return;
                 }
+                refresh_table()
                 modal_merge_wazuh_info.value.show_success(data.rsp);
             })
             .catch(err => console.error('Error during wazuh info merge:', err))
diff --git a/http_src/vue/table-with-config.vue b/http_src/vue/table-with-config.vue
index 9ae6188e34..8a49416611 100644
--- a/http_src/vue/table-with-config.vue
+++ b/http_src/vue/table-with-config.vue
@@ -39,6 +39,7 @@ const props = defineProps({
     display_message: Boolean,
     message_to_display: String,
     showLoading: Boolean,
+    rows_data: Array,
 });
 
 const table_config = ref({});
@@ -67,7 +68,7 @@ async function load_table() {
     if (table_config_id_2 == null) {
         table_config_id_2 = props.table_id;
     }
-    table_config.value = await TableUtils.build_table(http_prefix, table_config_id_2, props.f_map_columns, props.get_extra_params_obj);
+    table_config.value = await TableUtils.build_table(http_prefix, table_config_id_2, props.f_map_columns, props.get_extra_params_obj, null, props.rows_data);
     if (props.f_map_config != null) {
         table_config.value = props.f_map_config(table_config.value);
     }
diff --git a/httpdocs/tables_config/wazuh_network_ifaces.json b/httpdocs/tables_config/wazuh_network_ifaces.json
new file mode 100644
index 0000000000..af25ad86f0
--- /dev/null
+++ b/httpdocs/tables_config/wazuh_network_ifaces.json
@@ -0,0 +1,48 @@
+{
+    "id": "wazuh_network_ifaces",
+    "data_url": "",
+    "enable_search": true,
+    "paging": false,
+    "display_empty_rows": false,
+    "columns": [
+        {
+            "title_i18n": "asset_details.wazuh_iface_name",
+            "data_field": "name",
+            "sortable": true,
+            "min-width": "120px"
+        },
+        {
+            "title_i18n": "asset_details.wazuh_iface_mac",
+            "data_field": "mac",
+            "sortable": true,
+            "min-width": "150px"
+        },
+        {
+            "title_i18n": "asset_details.wazuh_iface_state",
+            "data_field": "state",
+            "sortable": true,
+            "min-width": "80px",
+            "class": [
+                "text-center"
+            ]
+        },
+        {
+            "title_i18n": "asset_details.wazuh_iface_tx",
+            "data_field": "sent",
+            "sortable": true,
+            "min-width": "100px",
+            "class": [
+                "text-end"
+            ]
+        },
+        {
+            "title_i18n": "asset_details.wazuh_iface_rx",
+            "data_field": "rcvd",
+            "sortable": true,
+            "min-width": "100px",
+            "class": [
+                "text-end"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua
index 96e17485dd..2b696c779d 100644
--- a/scripts/locales/en.lua
+++ b/scripts/locales/en.lua
@@ -529,12 +529,25 @@ local lang = {
     ["wazuh"] = "Wazuh",
     ["wazuh_always_connected"] = "Always connected",
     ["wazuh_asset_information"] = "Wazuh",
+    ["wazuh_cpu_cores"] = "CPU Cores",
+    ["wazuh_cpu"] = "CPU",
     ["wazuh_info_available"] = "Wazuh Agent Present",
-    ["wazuh_keepalive_dateadd"] = "Last Seen | First Seen",
+    ["wazuh_keepalive_dateadd"] = "Last Seen / First Seen",
+    ["wazuh_iface_name"] = "Name",
+    ["wazuh_iface_mac"] = "MAC",
+    ["wazuh_iface_state"] = "State",
+    ["wazuh_iface_tx"] = "Bytes Sent",
+    ["wazuh_iface_rx"] = "Bytes Received",
     ["wazuh_info_not_available"] = "Wazuh Agent Unavailable",
+    ["wazuh_network_interfaces"] = "Wazuh Network Interfaces",
+    ["wazuh_os_arch_platform"] = "Architecture / Platform",
+    ["wazuh_open_ports"] = "Open Ports",
     ["wazuh_os_name_version"] = "OS Name",
-    ["wazuh_os_arch_platform"] = "Architecture | Platform",
-    ["wazuh_status_version"] = " Status | Version",
+    ["wazuh_ram"] = "RAM",
+    ["wazuh_ram_free"] = "RAM Free",
+    ["wazuh_ram_total"] = "Total RAM",
+    ["wazuh_ram_usage"] = "RAM Usage",
+    ["wazuh_status_version"] = " Status / Version",
   },
   ["info"] = "Info",
   ["information"] = "Information",
diff --git a/scripts/lua/modules/discover_utils.lua b/scripts/lua/modules/discover_utils.lua
index 30d4de7052..d7fd6ed9b2 100644
--- a/scripts/lua/modules/discover_utils.lua
+++ b/scripts/lua/modules/discover_utils.lua
@@ -12,7 +12,7 @@ discover.debug = false
 
 discover.progress_string = "discovery.progess"
 
--- NOTE: keep in sync with ndpi_os_hint
+-- NOTE: keep in sync with ndpi_os_hint and wazuh_utils.wazuh_os_to_ntopng_os
 discover.osinfo = {
     [0] = {"Unknown", ''},
     [1] = {"Windows", '<i class=\'fab fa-windows fa-lg\'></i>'},