Commit Graph

37294 Commits

Author SHA1 Message Date
Jonathan 607d7e36e5 #12341 enable invetory .vbs 2023-11-30 12:11:12 +01:00
Jonathan c41b360a6e #8365 merge conflict 2023-11-30 12:04:28 +01:00
Jorge Rincon 313407dcc5 Merge branch 'develop' into ent-12516-cambio-de-modelo-en-actualizaciones-solo-LTS-por-defecto-mostrar-informacion-sobre-versiones-en-warp-update 2023-11-30 11:53:35 +01:00
Jorge Rincon f9fd33fa2e #12516 Fixed set token configuration lts updates 2023-11-30 11:50:19 +01:00
Jonathan f600648cc0 #12341 fix agent_version 2023-11-30 11:43:54 +01:00
daniel 75606f679e Merge remote-tracking branch 'origin/develop' into ent-11681-15856-duplicidad-de-informacion-en-db-con-elementos-de-servicio-con-un-mismo-padre
Conflicts:
	pandora_console/extras/mr/67.sql
2023-11-30 11:27:20 +01:00
daniel 0d58aaf44d fix errors pandora_enterprise#12293 2023-11-30 10:25:16 +01:00
Rafael Ameijeiras 6a998c79ae Merge branch 'ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente' into 'develop'
Ent 12095 correlacion de alertas con field event user comment no funciona adecuadamente

See merge request artica/pandorafms!6639
2023-11-30 09:24:33 +00:00
Rafael Ameijeiras 57a9e6b3bf Merge branch 'ent-12188-script-mode-de-plugins-de-inventario-no-esta-funcionando' into 'develop'
add code lost inventory server pandora_enterprise#12188

See merge request artica/pandorafms!6667
2023-11-30 09:23:33 +00:00
Rafael Ameijeiras c60c75475b Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop'
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro

See merge request artica/pandorafms!6523
2023-11-30 09:23:16 +00:00
Rafael Ameijeiras 0957a87dcb Merge branch 'ent-11705-15916-campo-editable-en-vista-de-eventos' into 'develop'
Ent 11705 15916 campo editable en vista de eventos

See merge request artica/pandorafms!6486
2023-11-30 09:18:28 +00:00
daniel 817811ffac fix error update manager pandora_enterprise#12447 2023-11-30 10:13:18 +01:00
Rafael Ameijeiras 98d414f262 Merge branch 'ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards' into 'develop'
Ent 10983 Selector de rango de fechas para múltiples elementos a la vez en dashboards

See merge request artica/pandorafms!6413
2023-11-30 08:58:15 +00:00
Jonathan bac9d4b7a6 #12341 agent version when string have build 2023-11-30 09:38:12 +01:00
Jorge Rincon ac4b45646d #12516 Modal update lts added 2023-11-30 09:30:50 +01:00
Jonathan 1fc2c432e5 Merge branch 'develop' into ent-12341-agent-basic-options 2023-11-30 09:14:35 +01:00
Enrique Martin 76327c6d73 Fixed demo graphs generation 2023-11-30 08:54:21 +01:00
Jonathan b99c9240de #8365 NCM Merge conflict 2023-11-30 08:32:15 +01:00
Jonathan 75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
Jonathan e8272c0006 #11763 Fix merge conflict 2023-11-30 07:57:25 +01:00
artica 9d1e4b47ab Auto-updated build strings. 2023-11-30 01:00:25 +01:00
Daniel Rodriguez 7f4a928f35 Merge branch 'ent-12243-no-funciona-integracion-pandora-pitsm-a-nivel-usuario' into 'develop'
Hide test button and setup in ITSM pandora_enterprise#12243

See merge request artica/pandorafms!6629
2023-11-29 17:52:26 +00:00
felix.suarez dbd7de857b Capture security and system events on windows. 2023-11-29 11:44:02 -06:00
alejandro.campos@artica.es dc2ac2a1b3 implement load demo data 2023-11-29 18:13:56 +01:00
felix.suarez 8940e2b9aa Automatically apply log collection 2023-11-29 11:13:09 -06:00
alejandro.campos@artica.es 17ed07e83a Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-11-29 18:09:49 +01:00
alejandro.campos@artica.es ca17eef68a implement load demo data 2023-11-29 18:09:32 +01:00
Enrique Martin 50ab2841e7 Removed some elements from network map PRD 2023-11-29 18:02:33 +01:00
Enrique Martin 93e79b51eb Changed traps chance 2023-11-29 17:30:57 +01:00
alejandro.campos@artica.es 86ba16c270 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-11-29 16:58:25 +01:00
alejandro.campos@artica.es a290203847 implement demo data load 2023-11-29 16:57:38 +01:00
Jonathan 7a5201db4f #8365 NCM V3 Minor fix 2023-11-29 16:31:06 +01:00
daniel db89c72be5 fix error empty clusters pandora_enterprise#12511 2023-11-29 16:00:46 +01:00
Daniel Cebrian c0218ad75c Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-11-29 15:45:07 +01:00
Daniel Maya 544997d30c Merge branch 'develop' into ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente 2023-11-29 15:44:04 +01:00
Diego Muñoz-Reja eebab43e36 Merge branch 'ent-11907-incluir-distro-y-version-en-about-y-diagnostic-info' into 'develop'
Ent 11907 incluir distro y version en about y diagnostic info

See merge request artica/pandorafms!6420
2023-11-29 14:34:05 +00:00
Jorge Rincon 38a79fa6a6 #12516 fixed modal body padding 2023-11-29 15:30:41 +01:00
Rafael Ameijeiras e46fc163a9 Merge branch 'ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo' into 'develop'
Ent 12451 nuevas alertas por defecto de telegram y vonage con mensaje erroneo

See merge request artica/pandorafms!6664
2023-11-29 14:27:28 +00:00
Rafael Ameijeiras 60d9fffe22 Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop'
Ent 12137 propuesta de refactoring visual de vista ppal de agente

See merge request artica/pandorafms!6520
2023-11-29 14:26:53 +00:00
Rafael Ameijeiras 0ca92d7080 Merge branch 'ent-12250-informe-detallado-de-seguridad' into 'develop'
Ent 12250 Informe detallado de seguridad

See merge request artica/pandorafms!6660
2023-11-29 14:25:00 +00:00
Rafael Ameijeiras 33ca5ab4ab Merge branch 'ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer' into 'develop'
Ent 12424 aviso en thresholds de tipo percentage que no deberia aparecer

See merge request artica/pandorafms!6651
2023-11-29 14:23:32 +00:00
Rafael Ameijeiras 2e0d732eb9 Merge branch 'ent-12498-widget-top-n-of-agent-modules-no-muestra-resultados-de-todos-los-agentes' into 'develop'
Ent 12498 Widget TOP N of Agent Modules no muestra resultados de TODOS los agentes

See merge request artica/pandorafms!6695
2023-11-29 14:22:48 +00:00
Jonathan f50dade117 #12533 send events groupid widget 2023-11-29 15:08:22 +01:00
Jorge Rincon e5ccd88f61 #12558 fixed SQL error when copying web module server status in debug_content field 2023-11-29 15:03:08 +01:00
daniel dcb04a64ee fix delete conf agents pandora_enterprise#12293 2023-11-29 14:30:45 +01:00
Jorge Rincon df76a5194c #12561 information for LTS versions in Warp Update 2023-11-29 13:40:38 +01:00
Enrique Martin 8e1d30adfe Fixed reports PRD 2023-11-29 13:31:39 +01:00
Enrique Martin 9bb47fc12f Fixed custom report PRD file 2023-11-29 11:57:34 +01:00
daniel 1bacc36bc0 Merge remote-tracking branch 'origin/develop' into ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db 2023-11-29 11:56:51 +01:00
Jonathan 4c25e4cab1 #12440 add operation/events/events check readonly 2023-11-29 11:55:59 +01:00