tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-27 20:58:53 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,402 Commits 34 Branches 30 Tags
Commit Graph

2031 Commits

Author SHA1 Message Date
Daniel Maya
d096fa263d #11914 Added log_alerts 2023-09-27 11:05:06 +02:00
alejandro.campos@artica.es
19a9f82fe1 gotty changes 2023-09-25 19:08:24 +02:00
daniel
91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-09-25 17:06:08 +02:00
Luis
086835765d Merge branch 'develop' into 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-09-25 14:08:43 +00:00
Jonathan
e5c5f91576 #11705 change name event_custom_id 2023-09-25 10:32:23 +02:00
Jonathan
79fe89c3c5 #11705 new custom_field tevento 2023-09-22 12:24:15 +02:00
Daniel Maya
d4e2fb4fea resolved conflict 2023-09-21 18:04:15 +02:00
alejandro.campos@artica.es
ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
felix.suarez
976a32617f Add logic to complex alerts 2023-09-20 08:18:39 -05:00
Félix Suárez
2de84982cf Updates to save new Complex templates 2023-09-20 08:16:22 -05:00
Daniel Maya
05320f7ad4 #11990 Fixed enable_horizontal_tree 2023-09-20 12:42:01 +02:00
Jorge Rincon
fece93d38b #11691 Added the Show unknowns in graph token in the item editor view when creating the report item. 2023-09-20 08:49:56 +02:00
Daniel Cebrian
cba3e39f6c Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-19 17:32:06 +02:00
Enrique Martin
7a725d0c16 Merge branch 'develop' into 'ent-11729-plugin-proxmox-discovery-disco' 
Conflicts:
   pandora_console/extras/mr/66.sql
 2023-09-19 08:42:38 +00:00
Daniel Cebrian
a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
Rafael Ameijeiras
ce38970c38 Merge branch 'ent-12007-16207-error-vmware-en-discovery-por-falta-de-atributo' into 'develop' 
Changed version for VMware discovery plugin

See merge request artica/pandorafms!6439
 2023-09-18 13:19:33 +00:00
alejandro.campos@artica.es
f410f09745 change mr 2023-09-14 10:43:35 +02:00
Enrique Martin
64effb2e91 Added Proxmox discovery APP to MR and pandoradb_data 2023-09-12 11:48:29 +02:00
Enrique Martin
6f5b20ac54 Changed version for VMware discovery plugin 2023-09-12 09:51:49 +02:00
Jorge Rincon
764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
Calvo
c4271bf737 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-07 17:58:27 +02:00
alejandro.campos@artica.es
318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
Daniel Cebrian
39a44828fc Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-07 13:55:48 +02:00
alejandro.campos@artica.es
f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
Daniel Cebrian
d8e0df1912 #10983 new function for get date parameter and added parent date in dashboard 2023-09-06 08:52:46 +02:00
daniel
fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Rafael Ameijeiras
f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop' 
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
 2023-09-05 07:50:45 +00:00
Daniel Cebrian
a417b15d6f Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-05 09:23:35 +02:00
Alejandro Campos
fa5af7efab Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-09-04 11:50:03 +00:00
daniel
1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Calvo
788b6f9c26 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-01 13:30:28 +02:00
Calvo
2fc08b7246 Added enable MADE option to modules and bulk op 2023-08-31 18:07:26 +02:00
Jonathan
84bb4780ca #10639 new datepicker style and save filter 2023-08-29 12:17:41 +02:00
Pablo Aragon
6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Daniel Cebrian
61839db7ff #11807 new report list of checks agent 2023-08-22 16:28:01 +02:00
Alejandro Campos
ad4a46d2b1 Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-08-22 08:43:10 +00:00
Pablo Aragon
ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +02:00
Jorge Rincon
76b3e1da4a #10065 Fixed query that adds private_filter_user field in the database 2023-08-21 13:29:58 +02:00
daniel
a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02:00
Daniel Cebrian
0696ca60da Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-18 14:48:47 +02:00
Jorge Rincon
3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
Jorge Rincon
baa63eac77 Merge branch develop into ent-11595-tip-de-bienvenida-planned-stops 2023-08-18 09:02:14 +02:00
Daniel Rodriguez
2e4c542f28 Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop' 
Ent 11636 snmp v2 hace que wizard no funcione

See merge request artica/pandorafms!6303
 2023-08-18 06:29:45 +00:00
Daniel Cebrian
9327d50306 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-17 08:26:58 +02:00
daniel
8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel
7baad52e79 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-16 08:18:05 +02:00
Jorge Rincon
ec738436eb #11881 the lts_name token is set empty 2023-08-14 13:54:09 +02:00
daniel
98a5355c94 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 13:33:35 +02:00
Jorge Rincon
1669859f03 #11881 lts_name token has been cleaned. 2023-08-14 13:18:31 +02:00
Jorge Rincon
3f0f6f8c44 Merge branch develop into ent-11843-advertencia-de-deprecado-de-discovery-y-marcar-las-tarea-antiguas-como-legacy. conflict is resolved 2023-08-14 11:25:11 +02:00