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

28475 Commits

Author SHA1 Message Date
marcos 87eb16ef32 Merge remote-tracking branch 'origin/master' into ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli 2021-09-27 17:08:03 +02:00
Daniel Rodriguez 83703b88fa Merge branch 'ent-5171-mejora-logs-discovery' into 'develop' 
Discovery logs improvement

See merge request artica/pandorafms!4422
 2021-09-27 14:37:09 +00:00
Calvo 90ac62c0cc Fix recursion on networkmap nodes 2021-09-27 16:14:07 +02:00
Daniel Rodriguez 894cd0974f Merge branch 'ent-3407-Informes-en-IPAM' into 'develop' 
Ent 3407 informes en ipam

See merge request artica/pandorafms!4424
 2021-09-27 12:06:00 +00:00
marcos b332e59687 fixed minnor error with resource library url 2021-09-27 13:48:07 +02:00
Daniel Rodriguez c57c901e55 Merge branch 'ent-7068-funcionamiento-de-alertas-en-politicas' into 'develop' 
Added unlinked icon to alerts in unlinked module

See merge request artica/pandorafms!4426
 2021-09-27 10:09:30 +00:00
Daniel Rodriguez 4bd88e8afa Merge branch 'ent-7449-autorefresh-en-vistas-que-no-existen' into 'develop' 
Revomved autorefresh views than does not exists on meta

See merge request artica/pandorafms!4271
 2021-09-27 10:08:46 +00:00
Calvo 91cd12c715 fix networkmap node group recursion 2021-09-27 11:25:54 +02:00
Calvo 46136a66ca Merge remote-tracking branch 'origin/develop' into ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo 2021-09-27 10:40:50 +02:00
fbsanchez f7ec31cc72 Avoid MC process data in dataserver 2021-09-27 10:07:23 +02:00
artica b09febeee0 Auto-updated build strings. 2021-09-27 01:00:15 +02:00
artica 17ba73ad36 Auto-updated build strings. 2021-09-26 01:00:11 +02:00
artica 2cbe307a6f Auto-updated build strings. 2021-09-25 01:00:21 +02:00
Daniel Rodriguez a754b875c9 Merge branch 'ent-7976-GISS-Limite-de-licencia-en-metaconsola-para-UM' into 'develop' 
Ent 7976 giss limite de licencia en metaconsola para um

See merge request artica/pandorafms!4403
 2021-09-24 12:37:03 +00:00
alejandro.campos@artica.es 631edabdf9 added changes to mr 2021-09-24 11:42:40 +02:00
alejandro.campos@artica.es 9e0729574e Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-24 11:40:25 +02:00
Daniel Rodriguez 49961ed261 Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop' 
Ent 6296 10650 añadir widget de lista de servicios

See merge request artica/pandorafms!4355
 2021-09-24 09:09:28 +00:00
Daniel Rodriguez 19e1948062 Merge branch 'ent-7992-error-500-al-loguearse-en-la-consola' into 'develop' 
Removed automatic assignation of PHP configuration variables

See merge request artica/pandorafms!4411
 2021-09-24 07:15:06 +00:00
Daniel Rodriguez 4420ecec2c Merge branch 'ent-7514-pasar-networkmaps-a-open' into 'develop' 
Ent 7514 pasar networkmaps a open

Closes pandora_enterprise#7514

See merge request artica/pandorafms!4416
 2021-09-24 07:14:14 +00:00
Daniel Rodriguez 7bdb730abd Merge branch 'ent-8018-estilos-campos-seleccion-metaconsola' into 'develop' 
Fix select fields size

Closes pandora_enterprise#8018

See merge request artica/pandorafms!4418
 2021-09-24 07:12:52 +00:00
artica bc516889bf Auto-updated build strings. 2021-09-24 01:00:21 +02:00
Calvo 4a9f523468 Added unlinked icon to alerts in unlinked module 2021-09-23 19:02:31 +02:00
Jose Gonzalez de1bf03976 Clean logs 2021-09-23 17:19:47 +02:00
Jose Gonzalez 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Rodriguez 7a2c992c44 Merge branch 'ent-7952-comportamiento-extrano-procesamiento-dataserver' into 'develop' 
Do not search the agent name in tagente.direccion.

See merge request artica/pandorafms!4387
 2021-09-23 14:51:48 +00:00
Daniel Rodriguez 9852c711eb Merge branch 'ent-7330-nombre-alias-de-agentes-largos-se-ven-mal-en-sql-vertical-graph' into 'develop' 
fixed agent name flot-x-axis in sql vertical graph

See merge request artica/pandorafms!4339
 2021-09-23 13:48:14 +00:00
Alejandro Campos ca46285a0e Merge branch 'develop' into 'ent-3407-Informes-en-IPAM' 
# Conflicts:
#   pandora_console/extras/mr/50.sql
 2021-09-23 13:33:02 +00:00
Daniel Rodriguez 174f4cf5af Merge branch 'ent-8000bis-error-autenticacion-ldap' into 'develop' 
Fix LDAP authentication failure

Closes pandora_enterprise#8000

See merge request artica/pandorafms!4425
 2021-09-23 12:32:27 +00:00
Daniel Rodriguez ad8382003b Merge branch 'ent-8014-entities-en-tags' into 'develop' 
Fix entities

Closes pandora_enterprise#8014

See merge request artica/pandorafms!4420
 2021-09-23 10:33:30 +00:00
Daniel Rodriguez f60c41ff30 Merge branch 'ent-8011-replicacion-de-eventos-genera-conexiones-infinitas' into 'develop' 
Read event_replication from the database.

See merge request artica/pandorafms!4419
 2021-09-23 10:32:54 +00:00
Jose Gonzalez dee81f85ba Fix LDAP authentication failure 2021-09-23 11:22:15 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Daniel Maya 3f91fda888 Fixed module_details_window 2021-09-23 10:59:24 +02:00
Jose Gonzalez 5b40a4f700 Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-23 08:50:50 +02:00
artica 0e34c1275a Auto-updated build strings. 2021-09-23 01:00:21 +02:00
Calvo 8eababe2f6 Autorefresh changes on centralized node and metaconsole 2021-09-22 17:29:14 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Rodriguez 731c293b50 Merge branch 'ent-8000-error-autenticacion-ldap' into 'develop' 
Fix io_safe_output for ldap admin pass

Closes pandora_enterprise#8000

See merge request artica/pandorafms!4414
 2021-09-22 13:56:48 +00:00
Daniel Rodriguez 1aabb11c8c Merge branch 'ent-8032-giss-cambiar-comando-de-alerta-para-que-descarte-cualquier-string-que-no-parezca-una-direccion' into 'develop' 
Add simple email address validation.

See merge request artica/pandorafms!4417
 2021-09-22 12:33:18 +00:00
Daniel Rodriguez ea654fb323 Merge branch 'ent-7982-bug-en-edicion-de-correlacion-de-alertas' into 'develop' 
Ent 7982 bug en edicion de correlacion de alertas

See merge request artica/pandorafms!4398
 2021-09-22 12:32:23 +00:00
Jose Gonzalez 15ec0f4e4d Fix delete_files 2021-09-22 14:25:44 +02:00
fbsanchez f8ea92923a minor fixes 2021-09-22 11:44:32 +02:00
Calvo 641c42df91 Merge remote-tracking branch 'origin/develop' into ent-7449-autorefresh-en-vistas-que-no-existen 2021-09-22 11:39:44 +02:00
Daniel Rodriguez 42700e9033 Merge branch 'ent-7785-input-email-con-fondo-blanco-y-texto-negro' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4284
 2021-09-22 09:10:09 +00:00
Daniel Rodriguez ce286f2654 Merge branch 'ent-8003-bung-en-despliegue-de-tags-en-tree-view' into 'develop' 
Fix tag treeview level2

See merge request artica/pandorafms!4407
 2021-09-22 09:09:11 +00:00
Daniel Maya f3923326bc resolved conflict 2021-09-22 11:08:37 +02:00
Daniel Rodriguez c6e2fd6aa9 Merge branch 'ent-7993-bug-en-llamada-api-crear-alert-template-meta' into 'develop' 
API set create alert template metaconsole support

See merge request artica/pandorafms!4401
 2021-09-22 09:08:34 +00:00
Daniel Rodriguez 68b3255143 Merge branch 'ent-7583-traduccion-traduccion-del-apartado-de-la-consola-alerts-alert-correlation' into 'develop' 
Css content moved to js to allow translation

See merge request artica/pandorafms!4400
 2021-09-22 09:07:42 +00:00
Daniel Rodriguez 126030261b Merge branch 'ent-7969-Etiquetas-HTML-en-módulos-de-wizard-Consolas-Visuales' into 'develop' 
Ent 7969 etiquetas html en módulos de wizard consolas visuales

See merge request artica/pandorafms!4394
 2021-09-22 09:01:17 +00:00
Daniel Rodriguez 3338165dc3 Merge branch 'ent-7924-api-group-id-by-mname-falla-al-usar-url-encode-separator' into 'develop' 
Fix api group_id_by_name with url enconde separator

See merge request artica/pandorafms!4391
 2021-09-22 09:00:27 +00:00