tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,090 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

1190 Commits

Author SHA1 Message Date
Daniel Rodriguez 66504dd425 Merge branch 'ent-12934-cambio-sistema-despliegue-de-agentes' into 'develop' 
Ent 12934 Cambio sistema despliegue de agentes

See merge request artica/pandorafms!6962
 2024-04-05 09:56:40 +00:00
Pablo Aragon 3788ae1364 13224-Fix CHARACTER in DB 2024-04-02 12:33:27 +02:00
Daniel Cebrian 3db981ef62 Merge branch 'develop' into ent-12934-cambio-sistema-despliegue-de-agentes 2024-04-01 10:39:11 +02:00
Jonathan e4d26875ed Merge branch 'develop' into ent-13061-limitar-el-aviso-de-lts-versions-del-warp-offline 2024-03-26 08:20:48 +01:00
Jonathan 677eb81eb8 #13061 toekn lts message no show to individual users 2024-03-25 08:56:19 +01:00
Jonathan 8a29e03b58 #13061 toekn lts message no show to individual users 2024-03-25 08:32:56 +01:00
Daniel Cebrian b874f236ae Merge branch 'develop' into ent-12934-cambio-sistema-despliegue-de-agentes 2024-03-21 15:20:12 +01:00
Jonathan 424f365ea4 #12997 remove skins section 2024-03-19 13:35:53 +01:00
Rafael Ameijeiras 623095146e Merge branch 'ent-12594-mejorar-vista-de-scheduled-reports' into 'develop' 
Ent 12594 mejorar vista de scheduled reports

See merge request artica/pandorafms!6975
 2024-03-12 08:58:05 +00:00
Félix Suárez 747a63a2ba Add agent_disabled functionality 2024-03-06 09:41:48 -06:00
Rafael Ameijeiras 5941aac339 Merge branch 'ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD' into 'develop' 
visual changes in demo view

See merge request artica/pandorafms!6916
 2024-03-05 07:59:04 +00:00
Enrique Martin 3776f10bc7 Use external utility for agents deployment 2024-02-27 20:20:46 +01:00
Jonathan b4ad2b7584 #12594 schedule view 2024-02-27 19:15:50 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-02-27 17:27:10 +01:00
Enrique Martin 210ef60b69 Added MR changes 2024-02-27 14:18:00 +01:00
Rafael Ameijeiras d62407dd4a Merge branch 'ent-12075-registro-de-nodos-ha-en-metaconsola' into 'develop' 
Update database targets in HA environments using metaconsole

See merge request artica/pandorafms!6956
 2024-02-26 16:28:57 +00:00
Enrique Martin 78702547c8 Fixed table field 2024-02-23 14:23:22 +01:00
alejandro.campos@artica.es c9bde8d90a Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-23 11:14:17 +01:00
alejandro.campos@artica.es 8f02fe3d62 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-21 10:30:20 +01:00
Enrique Martin 5e49200f72 Update database targets in HA environments using metaconsole 2024-02-20 14:01:32 +01:00
alejandro.campos@artica.es df7435132a change regex search in events 2024-02-16 10:10:38 +01:00
alejandro.campos@artica.es 8ff87ec93a Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-13 09:36:36 +01:00
alejandro.campos@artica.es 731cc195ec fix safe mode recovery 2024-02-12 17:47:46 +01:00
alejandro.campos@artica.es ecfef0da29 several changes 2024-02-09 18:48:32 +01:00
daniel 54e4b8dbfa new api 2.0 2024-02-02 09:15:00 +01:00
daniel 00f9098f56 Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-01-25 15:57:20 +01:00
Daniel Cebrian fadb70d740 Merge branch 'develop' into ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos 2024-01-19 13:06:37 +01:00
Jonathan 72d34ef99b #12435 fix conflict merge develop 2024-01-08 13:14:07 +01:00
Daniel Cebrian 22baa45387 #12537 new icons for notifications 2024-01-03 11:39:15 +01:00
Calvo 421eb1fe23 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-19 18:59:07 +01:00
Calvo e41dc13ac2 WIP: Policy synthetic op: Creating modules 2023-12-19 18:37:49 +01:00
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop' 
implement demo data feature

See merge request artica/pandorafms!6606
 2023-12-19 15:40:09 +00:00
daniel 855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
 2023-12-19 09:39:24 +01:00
Daniel Rodriguez 348c48d974 Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop' 
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola

See merge request artica/pandorafms!6757
 2023-12-18 13:40:21 +00:00
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-18 10:54:27 +00:00
daniel 8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
Jonathan c6d29ea60e #12435 external link users fix 2023-12-14 16:59:39 +01:00
daniel 3cb4b5cce4 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/67.sql
	pandora_console/operation/menu.php
 2023-12-14 11:21:51 +01:00
daniel 2890fd3dab Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-14 11:05:29 +01:00
daniel 27d76a0890 fix error cv item module graph periodicity mode pandora_enterprise#9640 2023-12-14 11:03:45 +01:00
Daniel Cebrian 464ad467aa #12631 created new token Ignore unknown for agent and modules 2023-12-12 15:30:10 +01:00
Jonathan 78bb8e0bae #8365 ix merge conflict 2023-12-07 10:58:45 +01:00
miguel angel rasteu 0337afcdaf #12138 Fix SQL code 2023-12-07 10:21:57 +01:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-05 15:30:06 +00:00
Daniel Rodriguez 39c6420d2c Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop' 
Ent 11763 15982 regex en busqueda de eventos

See merge request artica/pandorafms!6512
 2023-12-01 08:44:46 +00:00
Jonathan c41b360a6e #8365 merge conflict 2023-11-30 12:04:28 +01:00
daniel d5c24609d6 add tables merge process pandora_enterprise#12352 2023-11-30 11:21:54 +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 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 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