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

1469 Commits

Author SHA1 Message Date
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez df03b77b60 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 12:57:37 +01:00
fbsanchez 146f3b44d9 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 11:30:39 +01:00
fbsanchez d18fffb0cb Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2020-11-25 12:07:53 +01:00
Daniel Rodriguez e8d628a049 Merge branch 'ent-6175-10434-problemas-con-la-creacion-y-asignacion-de-componentes-locales-en-el-campo-unit' into 'develop' 
Ent 6175 10434 problemas con la creacion y asignacion de componentes locales en el campo unit

See merge request artica/pandorafms!3452
 2020-11-20 13:23:12 +01:00
Daniel Rodriguez 01b315de3f Merge branch 'ent-#10872-GUARDIA-Problemas-menus-de-modulos' into 'develop' 
added check for element

See merge request artica/pandorafms!3577
 2020-11-04 16:40:36 +01:00
Daniel Rodriguez 4f3e09c6c3 Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop' 
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0

See merge request artica/pandorafms!3541
 2020-10-29 13:43:10 +01:00
alejandro-campos 315e522b2e added check for element 2020-10-27 12:01:38 +01:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
Daniel Maya 3c95d17482 Fixed new_agent 2020-10-20 16:15:42 +02:00
fbsanchez 5a5fb6eeea Allow define time start greater than time end in weekly planed downtimes 2020-10-07 14:49:46 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2020-10-02 14:56:07 +02:00
fbsanchez ea3f147bad minor fixes group selector 2020-10-02 14:31:41 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
 2020-09-30 18:38:27 +02:00
Daniel Rodriguez 311186a70a Merge branch 'ent-6328-Consola-movil-imagenes-rotas' into 'develop' 
fixed mobile console donut charts

See merge request artica/pandorafms!3470
 2020-09-30 13:19:06 +02:00
fbsanchez b7c2913071 Avoid create agent if no group is selected 2020-09-29 15:49:10 +02:00
fbsanchez d73c215b91 Avoid create agent if no group is selected 2020-09-29 15:48:20 +02:00
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 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
Daniel Barbero Martin c6165fbdee fixed mobile console donut charts 2020-09-21 15:13:07 +02:00
fbsanchez 4fb69f343a minor fix 2020-09-17 19:32:28 +02:00
fbsanchez 867fccf604 Custom id improvements 2020-09-17 14:38:01 +02:00
manuel.montes a70fc200b7 Fixed bug in unit field 2020-09-14 09:27:01 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
manuel.montes 05fadd167d Changed names 2020-09-01 12:30:55 +02:00
manuel.montes f477919433 Fixed entities in query 2020-08-28 13:56:15 +02:00
Daniel Rodriguez a123eaa18c Merge branch 'ent-5609-link-to-credential-store-from-remote-module-creation' into 'develop' 
Added link to credential store from module creation

See merge request artica/pandorafms!3363
 2020-08-07 09:45:43 +02:00
marcos 248c5936b6 fixed error with filter form 2020-08-07 09:19:46 +02:00
marcos bb2fb0c631 Merge remote-tracking branch 'origin/develop' into ent-6099-bug-al-duplicar-modulo 2020-08-07 08:47:11 +02:00
Daniel Rodriguez 7d69cbe65d Merge branch 'ent-5907-bug-status-modulo-prediccion' into 'develop' 
Solved issue with thresholds in prediction modules

Closes pandora_enterprise#5907

See merge request artica/pandorafms!3293
 2020-07-21 10:48:06 +02:00
Luis Calvo 37a97cd2ad Added link to credential store from module creation 2020-07-07 10:26:19 +02:00
marcos 4ad7735dd7 resolved error with duplucated modules 2020-07-06 10:09:36 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
Jose Gonzalez 599445ad4d Solved issue with thresholds in prediction modules 2020-06-09 16:05:24 +02:00
alejandro-campos 442b40ad97 Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas 2020-06-09 09:30:16 +02:00
Daniel Rodriguez 86afda25fe Merge branch 'ent-5673-Mala-visualizacion-de-modulos-con-caracteres-japones' into 'develop' 
Fixed errors encoding

See merge request artica/pandorafms!3234
 2020-06-02 17:24:11 +02:00
Daniel Rodriguez 2e79394288 Merge branch 'fix-disable-enable-agent' into 'develop' 
Fixed the problem that agents cannot be enabled/disabled with open version.

See merge request artica/pandorafms!3191
 2020-06-02 09:54:40 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
Daniel Barbero Martin db32fedde4 Fixed errors encoding 2020-05-25 17:06:20 +02:00
fbsanchez f3d9f2d75e Cluster view RC1 2020-05-22 13:13:19 +02:00
fbsanchez e66f33fd37 WIP Cluster references updated 2020-05-22 12:14:01 +02:00
Daniel Rodriguez b655094f3a Merge branch 'ent-5619-se-muestran-2-veces-el-mensaje-de-realizado' into 'develop' 
duplicated enable/disable message

See merge request artica/pandorafms!3128
 2020-05-08 15:38:24 +02:00
Junichi Satoh 788c39008e Fixed the problem that agent cannot be enabled/disabled with open version. 2020-04-30 15:50:45 +09:00
alejandro-campos 086bc28986 Changed target ip selector in WMI server policy modules 2020-04-27 17:27:54 +02:00
fbsanchez 5c405b1d32 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-08 10:18:13 +02:00
Luis bcd9aabcd8 Ent 5604 policy modules japanese bug 2020-04-02 14:30:02 +02:00