From edf2be307960c381d09abb1639db69fd41c69317 Mon Sep 17 00:00:00 2001
From: GabrieleDeri <33870399+DGabri@users.noreply.github.com>
Date: Tue, 23 Jul 2024 17:18:24 +0200
Subject: [PATCH] Implemented: 8553, 8535, 8551, 8517 (#8555)

* Implemented: 8553, 8535, 8551, 8517

* Restore with origin
---
 http_src/vue/page-probes.vue                  |  2 +-
 httpdocs/tables_config/flow_historical.json   | 38 +++++++++----------
 scripts/locales/en.lua                        |  1 +
 scripts/lua/inc/menu.lua                      |  3 --
 .../lua/modules/alert_store/alert_store.lua   |  1 +
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/http_src/vue/page-probes.vue b/http_src/vue/page-probes.vue
index 1056bc3ae9..b3a4d9a356 100644
--- a/http_src/vue/page-probes.vue
+++ b/http_src/vue/page-probes.vue
@@ -154,4 +154,4 @@ function columns_sorting(col, r0, r1) {
         }
     }
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/httpdocs/tables_config/flow_historical.json b/httpdocs/tables_config/flow_historical.json
index 4d11560417..5c5615857a 100644
--- a/httpdocs/tables_config/flow_historical.json
+++ b/httpdocs/tables_config/flow_historical.json
@@ -109,6 +109,16 @@
 				"text-center"
 			]
 		},
+		{
+			"title_i18n": "db_search.alert_id",
+			"data_field": "alert_id",
+			"min-width": "80px",
+			"sortable": true,
+			"render_generic": "alert_id",
+			"class": [
+				"no-wrap"
+			]
+		},
 		{
 			"title_i18n": "flow",
 			"data_field": "flow",
@@ -119,6 +129,15 @@
 				"text-nowrap"
 			]
 		},
+		{
+			"title_i18n": "db_search.info",
+			"data_field": "info",
+			"min-width": "30px",
+			"sortable": true,
+			"class": [
+				"no-wrap"
+			]
+		},
 		{
 			"title_i18n": "db_search.vlan_id",
 			"data_field": "vlan_id",
@@ -189,16 +208,6 @@
 				"no-wrap"
 			]
 		},
-		{
-			"title_i18n": "db_search.alert_id",
-			"data_field": "alert_id",
-			"min-width": "150px",
-			"sortable": true,
-			"render_generic": "alert_id",
-			"class": [
-				"no-wrap"
-			]
-		},
 		{
 			"title_i18n": "db_search.flow_risk",
 			"data_field": "flow_risk",
@@ -268,15 +277,6 @@
 				"no-wrap"
 			]
 		},
-		{
-			"title_i18n": "db_search.info",
-			"data_field": "info",
-			"min-width": "180px",
-			"sortable": true,
-			"class": [
-				"no-wrap"
-			]
-		},
 		{
 			"title_i18n": "db_search.observation_point_id",
 			"data_field": "observation_point_id",
diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua
index 78789bc5e8..581394a193 100644
--- a/scripts/locales/en.lua
+++ b/scripts/locales/en.lua
@@ -3240,6 +3240,7 @@ local lang = {
     ["nprobe_instances"] = "nProbe Instances",
     ["ntopng_interface"] = "ntopng Interface",
     ["probes_overview"] = "Probes Overview",
+    ["exporters_menu_entry"] = "Probes",
     ["observation_point"] = "Observation Point",
     ["observation_point_x"] = "Observation Point %{observation_point}",
     ["observation_points"] = "Observation Points",
diff --git a/scripts/lua/inc/menu.lua b/scripts/lua/inc/menu.lua
index 700792774b..df7676c63d 100644
--- a/scripts/lua/inc/menu.lua
+++ b/scripts/lua/inc/menu.lua
@@ -408,9 +408,6 @@ else
         entries = {{
             entry = page_utils.menu_entries.nprobe,
             url = '/lua/pro/enterprise/nprobe.lua'
-        }, {
-            entry = page_utils.menu_entries.exporters,
-            url = '/lua/pro/enterprise/exporters.lua'
         }, {
             entry = page_utils.menu_entries.observation_points,
             hidden = (interface.getObsPointsInfo().numObsPoints or 0) == 0,
diff --git a/scripts/lua/modules/alert_store/alert_store.lua b/scripts/lua/modules/alert_store/alert_store.lua
index 8a674cffd9..8fe049691c 100644
--- a/scripts/lua/modules/alert_store/alert_store.lua
+++ b/scripts/lua/modules/alert_store/alert_store.lua
@@ -962,6 +962,7 @@ end
 -- ##############################################
 
 -- NOTE parameter 'filter' is ignored
+
 -- NOTE noLimit should be used only with small deltas between epoch_end - epoch_begin to not overload the db
 function alert_store:select_historical(filter, fields, download --[[ Available only with ClickHouse ]], noLimit)
     local table_name = self:get_table_name()