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

25623 Commits

Author SHA1 Message Date
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
Daniel Rodriguez 4939d71420 Merge branch 'ent-6382-10451-Bug-en-chequeos-de-notificaciones-por-HA-+-ticket-guardia' into 'develop' 
fixed bug when node is disabled

See merge request artica/pandorafms!3484
 2020-09-29 12:43:59 +02:00
fbsanchez d5c0b23b3c FF keep counters fix 2020-09-29 12:30:56 +02:00
Daniel Rodriguez 89a7eb65b6 Merge branch 'ent-5317-9399-agente-proxy-no-puede-setear-puerto-de-escucha' into 'develop' 
Add proxy_address and proxy_port parameters to the agents.

See merge request artica/pandorafms!3482
 2020-09-29 11:06:29 +02:00
artica f9dfa8bbc3 Auto-updated build strings. 2020-09-29 01:00:20 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
fbsanchez d152ba2980 estado_agente prevent filter options overlapping 2020-09-28 16:11:26 +02:00
fbsanchez 12314d33c3 fixed direct html responses with sl2 2020-09-28 16:02:54 +02:00
fbsanchez 29ac13815a preload env required files (css,js) 2020-09-28 15:56:17 +02:00
fbsanchez d4e837b7e6 Group all management, "all" selected instead "none" if included 2020-09-28 15:47:38 +02:00
Daniel Rodriguez 8df5fab69f Merge branch 'ent-6022-uptime-incorrecto-en-politica-mejorada-windows' into 'develop' 
Ent 6022 uptime incorrecto en politica mejorada windows

See merge request artica/pandorafms!3315
 2020-09-28 10:39:59 +02:00
Daniel Rodriguez 6d319cbe5d Merge branch 'ent-5847-optimizacion-recomendada-Gautier' into 'develop' 
Added indexes

Closes pandora_enterprise#5847

See merge request artica/pandorafms!3462
 2020-09-28 08:39:31 +02:00
artica fe4916c0c3 Auto-updated build strings. 2020-09-28 01:00:14 +02:00
artica 0cbec13ec6 Auto-updated build strings. 2020-09-27 01:00:17 +02:00
artica bc7b0ae798 Auto-updated build strings. 2020-09-26 01:00:19 +02:00
Kevin b1c4a9890e Merge branch 'master' of brutus.artica.es:artica/pandorafms into ent-6022-uptime-incorrecto-en-politica-mejorada-windows 2020-09-25 11:46:08 +02:00
José González 0d8e2d5021 Merge branch 'develop' into 'ent-5847-optimizacion-recomendada-Gautier' 
# Conflicts:
#   pandora_console/extras/mr/42.sql

Solved conflicts.
 2020-09-25 11:27:41 +02:00
Daniel Rodriguez dfe397895d Merge branch 'ent-6104-increase-alert-command-fields-number' into 'develop' 
Increased number of max macro data fields from 15 to 20

See merge request artica/pandorafms!3412
 2020-09-25 10:47:36 +02:00
Luis ef043a169a Increased number of max macro data fields from 15 to 20 2020-09-25 10:47:36 +02:00
Daniel Rodriguez 5af6718941 Merge branch 'ent-6336-ifHCXXXX-nuevo-wizard-snmp-interfaces' into 'develop' 
Added x64 interface modules to wizard

See merge request artica/pandorafms!3478
 2020-09-25 10:46:39 +02:00
artica 6854c13aec Auto-updated build strings. 2020-09-25 01:00:51 +02:00
Daniel Rodriguez 7c38ee73a8 Merge branch 'ent-6177-mejoras-para-el-public-link-de-dashboards' into 'develop' 
Ent 6177 mejoras para el public link de dashboards

See merge request artica/pandorafms!3447
 2020-09-24 16:20:13 +02:00
Manuel Montes f78ae89a99 Ent 6177 mejoras para el public link de dashboards 2020-09-24 16:20:13 +02:00
alejandro-campos 4662fba06a fixed bug when node is disabled 2020-09-24 13:05:17 +02:00
Daniel Rodriguez 04215ba582 Merge branch 'ent-5435-9411-filtro-por-defecto-para-snmp-console' into 'develop' 
default values for date intervals (trap view)

See merge request artica/pandorafms!3469
 2020-09-24 10:57:43 +02:00
Daniel Rodriguez b3a29263e0 Merge branch 'ent-6338-Mensaje-perdida-conexion-aparece-siempre' into 'develop' 
Added lost connection data in stat_win file

Closes pandora_enterprise#6338

See merge request artica/pandorafms!3474
 2020-09-24 10:57:20 +02:00
Daniel Rodriguez 0c78b09891 Merge branch 'ent-6334-10699-10652-Wizard-WMI-SNMP-no-añade-modulos-o-incluye-los-que-quiera' into 'develop' 
fixed modules selection in agent wizard

See merge request artica/pandorafms!3472
 2020-09-24 10:56:51 +02:00
artica ba598d6d80 Auto-updated build strings. 2020-09-24 01:00:24 +02:00
Daniel Rodriguez 4d9956f4c5 Merge branch 'ent-6327-10666-Llamada-a-la-API-add-cluster-agent-no-funciona' into 'develop' 
fixed api calls

See merge request artica/pandorafms!3467
 2020-09-23 14:08:18 +02:00
Daniel Rodriguez 4880cbd29b Merge branch 'ent-6134-cambio-visual-en-checkbox-de-informes' into 'develop' 
Ent 6134 cambio visual en checkbox de informes

See merge request artica/pandorafms!3448
 2020-09-23 14:07:07 +02:00
Daniel Rodriguez f8bfd6c99b Merge branch 'ent-6119-cambiar-critical-warning-status-por-critical-warning-threshold' into 'develop' 
Ent 6119 cambiar critical warning status por critical warning threshold

See merge request artica/pandorafms!3423
 2020-09-23 14:06:09 +02:00
alejandro-campos a0dad4812e fixed error messages 2020-09-23 13:10:10 +02:00
Ramon Novoa f39be8f5b9 Add proxy_address and proxy_port parameters to the agents. 2020-09-23 12:04:55 +02:00
Daniel Rodriguez e00d403593 Merge branch 'ent-6262-UM-Operaciones-masivas' into 'develop' 
Ent 6262 um operaciones masivas

See merge request artica/pandorafms!3476
 2020-09-23 11:36:15 +02:00
Daniel Maya a07f1d891f Ent 6262 um operaciones masivas 2020-09-23 11:36:15 +02:00
alejandro-campos 86cf99ac81 fixed api call check when cluster id does not exist 2020-09-23 11:31:28 +02:00
Daniel Rodriguez a9a46ec3d2 Merge branch 'ent-5873-agente-para-macos-con-instalador-grafico' into 'develop' 
Ent 5873 agente para macos con instalador grafico

See merge request artica/pandorafms!3292
 2020-09-23 11:12:50 +02:00
Daniel Rodriguez d8daf9f063 Merge branch 'ent-6361-10708-bug-en-visualizacion-de-eventos-con-standar-user' into 'develop' 
fixes

See merge request artica/pandorafms!3468
 2020-09-23 09:42:20 +02:00
Daniel Rodriguez dadba4f81d Merge branch 'ent-6257-proyectos-imagenes-de-iso-de-demos-en-producto' into 'develop' 
Ent 6257 proyectos imagenes de iso de demos en producto

See merge request artica/pandorafms!3449
 2020-09-23 09:41:05 +02:00
Daniel Rodriguez 12bc9e2b4e Merge branch 'ent-6195-10482-entities-en-tabla-de-auditoria' into 'develop' 
Ent 6195 10482 entities en tabla de auditoria

See merge request artica/pandorafms!3411
 2020-09-23 09:38:29 +02:00
artica 0b6d87e317 Auto-updated build strings. 2020-09-23 01:00:23 +02:00
Luis Calvo a7db77d4fb Added x64 interface modules to wizard 2020-09-22 16:45:34 +02:00
Ramon Novoa 262655516e pandora_db only runs on the master server. 
Ref. pandora_enterprise#6315
 2020-09-22 12:17:29 +02:00
Daniel Rodriguez 1ca73c5456 Merge branch 'ent-5898-secciones-en-diagnostico-aparecen-2-veces' into 'develop' 
Ent 5898 secciones en diagnostico aparecen 2 veces

See merge request artica/pandorafms!3473
 2020-09-22 12:16:31 +02:00
Marcos Alconada a9b2c6beb8 Ent 5898 secciones en diagnostico aparecen 2 veces 2020-09-22 12:16:31 +02:00
Daniel Rodriguez bf1d3f4af3 Merge branch 'ent-6278-SQL-Injection-ajax-cg_items' into 'develop' 
Solved ajax sql injection

Closes pandora_enterprise#6278

See merge request artica/pandorafms!3465
 2020-09-22 12:15:43 +02:00
Daniel Rodriguez a38570c698 Merge branch 'ent-6237-10560-fallo-filtro-de-agentes-en-politicas-en-metaconsola' into 'develop' 
add condition

See merge request artica/pandorafms!3459
 2020-09-22 12:15:05 +02:00
Marcos Alconada 48e19f3b59 add condition 2020-09-22 12:15:05 +02:00
Daniel Rodriguez 49d8d1da9a Merge branch 'ent-6159-entities-al-exportar-ficheros-ptr-de-politicas' into 'develop' 
Ent 6159 entities al exportar ficheros ptr de politicas

See merge request artica/pandorafms!3414
 2020-09-22 12:14:19 +02:00