Minor tweaks

backend/app/connectors/grafana/schema/dashboards.py

@@ -42,7 +42,7 @@ class WazuhDashboard(Enum):
     EDR_COMPLIANCE = ("Wazuh", "edr_compliance.json")
     EDR_AV_MALWARE_IOC = ("Wazuh", "edr_av_malware_ioc.json")
     EDR_AGENT_INVENTORY = ("Wazuh", "edr_agent_inventory.json")
-    EDR_AD_INVENOTRY = ("Wazuh", "edr_ad_inventory.json")
+    EDR_AD_INVENTORY = ("Wazuh", "edr_ad_inventory.json")
     EDR_SYSTEM_VULNERABILITIES_NEW = ("Wazuh", "edr_system_vulnerabilities_new.json")
 
 

backend/copilot.py

@@ -28,7 +28,6 @@
 from app.middleware.exception_handlers import custom_http_exception_handler
 from app.middleware.exception_handlers import validation_exception_handler
 from app.middleware.exception_handlers import value_error_handler
-from app.middleware.logger import log_requests
 
 # from app.routers import ask_socfortress
 from app.routers import active_response
@@ -75,6 +74,9 @@
 from app.schedulers.scheduler import get_scheduler_instance
 from app.schedulers.scheduler import init_scheduler
 
+# from app.middleware.logger import log_requests
+
+
 auth_handler = AuthHandler()
 # Get the `SERVER_IP` from the `.env` file
 load_dotenv()
@@ -103,7 +105,7 @@
 
 ################## ! Middleware LOGGING TO `log_entry` table ! ##################
 # Comment out logging for now, not sure I want to use it
-app.middleware("http")(log_requests)  # using the imported middleware
+# app.middleware("http")(log_requests)  # using the imported middleware
 
 
 ################## ! Exception Handlers ! ##################

frontend/src/components/customers/provision/CustomerProvisionWizard.vue

@@ -273,7 +273,7 @@ import {
 import isIP from "validator/es/lib/isIP"
 import isPort from "validator/es/lib/isPort"
 import isURL from "validator/es/lib/isURL"
-import { computed, onBeforeMount, ref, toRefs } from "vue"
+import { computed, onBeforeMount, ref, toRefs, watch } from "vue"
 
 const props = defineProps<{
 	customerCode: string
@@ -560,7 +560,14 @@ function toggleDashboards() {
 	if (allDashboardsSelected.value) {
 		form.value.dashboards_to_include.dashboards = []
 	} else {
-		form.value.dashboards_to_include.dashboards = dashboardOptions.value.map(o => o.value)
+		form.value.dashboards_to_include.dashboards = dashboardOptions.value
+			.filter(
+				o =>
+					!["EDR_WAZUH_INVENOTRY", "EDR_WAZUH_INVENTORY", "EDR_AGENT_INVENTORY"]
+						.map(d => d.toLowerCase())
+						.includes(o.value.toLowerCase())
+			)
+			.map(o => o.value)
 	}
 }
 
@@ -614,6 +621,20 @@ async function submit() {
 		})
 }
 
+function formPreset(step: number) {
+	switch (step) {
+		case 2:
+			if (!form.value.customer_index_name) {
+				form.value.customer_index_name = `wazuh-${form.value.customer_code}`
+			}
+			break
+	}
+}
+
+watch(current, val => {
+	formPreset(val)
+})
+
 onBeforeMount(() => {
 	getProvisioningDefaultSettings()
 	getSubscriptions()

frontend/src/components/incidentManagement/alerts/AlertsList.vue

@@ -150,14 +150,15 @@ import { computed, nextTick, onBeforeMount, provide, ref, watch } from "vue"
 import AlertItem from "./AlertItem.vue"
 import AlertsFilters from "./AlertsFilters.vue"
 
-const { highlight, preset, showFilters } = withDefaults(
-	defineProps<{
-		highlight?: string | null
-		preset?: AlertsListFilter[]
-		showFilters?: boolean
-	}>(),
-	{ showFilters: true }
-)
+const {
+	highlight,
+	preset,
+	showFilters = true
+} = defineProps<{
+	highlight?: string | null
+	preset?: AlertsListFilter[]
+	showFilters?: boolean
+}>()
 
 const FilterIcon = "carbon:filter-edit"
 const InfoIcon = "carbon:information"