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

31078 Commits

Author SHA1 Message Date
artica 225da0dac5 Auto-updated build strings. 2022-07-04 01:00:25 +02:00
artica 5ad9178bc4 Auto-updated build strings. 2022-07-03 01:00:26 +02:00
artica a8a1069aaa Auto-updated build strings. 2022-07-02 01:00:31 +02:00
Diego Muñoz-Reja 813ae6cb0b Merge branch 'ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales-2' into 'develop' 
fix error report top n pandora_enterprise#9129

See merge request artica/pandorafms!5001
 2022-07-01 12:11:08 +00:00
Daniel Barbero Martin de926b5677 fix error events pandora_enterprise#9245 2022-07-01 13:54:33 +02:00
Daniel Barbero Martin 8bb1263fa9 fix error report top n pandora_enterprise#9129 2022-07-01 13:37:39 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Jimmy Olano 2bf757a364 Merge branch 'ent-8252-12671-ordenar-campos-custom-fields-eventos' into 'develop' 
Ent 8252 12671 ordenar campos custom fields eventos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8252

See merge request artica/pandorafms!4948
 2022-07-01 11:01:57 +00:00
Diego Muñoz-Reja 488191d9d8 Merge branch 'ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales' into 'develop' 
top n regex pandora_enterprise#9129

See merge request artica/pandorafms!4989
 2022-07-01 10:57:20 +00:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' 
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302

See merge request artica/pandorafms!4949
 2022-07-01 10:47:27 +00:00
Daniel Maya b43b7b4fa5 #9226 Added tuser_task tables 2022-07-01 10:37:08 +02:00
artica 219d82c230 Auto-updated build strings. 2022-07-01 01:00:22 +02:00
Ramon Novoa 6e8a4abaae Generate events for pandora_db related problems. 
Generate events if pandora_db has never been run or has not been run for
more than 24 hours.
 2022-06-30 19:22:01 +02:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Diego Muñoz-Reja ef48206e7f Merge branch 'ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica' into 'develop' 
Ent 8763 g sanchez anadir filtro de grupos al widget de vista tactica

See merge request artica/pandorafms!4937
 2022-06-30 12:54:40 +00:00
Diego Muñoz-Reja 98189999e4 Merge branch 'ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard' into 'develop' 
add new widget color tabs module pandora_enterprise#8621

See merge request artica/pandorafms!4896
 2022-06-30 12:48:34 +00:00
Daniel Barbero Martin a92d50303d fix color tabs and block histogram pandora_enterprise#8621 2022-06-30 14:09:29 +02:00
José González d0622e7a3b Added Go Back input function 2022-06-30 13:41:56 +02:00
Daniel Barbero Martin 95fca17fa9 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-30 12:52:49 +02:00
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56:25 +02:00
Calvo fe46bb9235 Addded pandora_version and build_version globals 2022-06-30 11:24:17 +02:00
Jimmy Olano fb5dd4d557 Merge branch 'ent-8588-Diferencias-de-filtrado-en-vistas-similares-de-Pandora' into 'develop' 
fixed query filter

Ref pandora_enterprise#8588

See merge request artica/pandorafms!4895
 2022-06-29 23:54:48 +00:00
artica 87837d7c8f Auto-updated build strings. 2022-06-30 01:00:33 +02:00
Jimmy Olano efa0640d8c Merge branch 'ent-9121-13735-no-aparece-nombre-modulos-en-leyenda-seccion-graficas-dentro-del-agente-v762' into 'develop' 
legend combined graph module view pandora_enterprise#9121

pandora_enterprise#9121

See merge request artica/pandorafms!4986
 2022-06-29 22:37:25 +00:00
Jimmy Olano f07ed9e4e9 Merge branch 'ent-9125-Bug-a-la-hora-de-crear-gráficas-personalizadas-desde-el-agente' into 'develop' 
Ent 9125 bug a la hora de crear gráficas personalizadas desde el agente

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9125

See merge request artica/pandorafms!4946
 2022-06-29 22:25:00 +00:00
Jimmy Olano 1e832e9e8d Merge branch 'ent-9172-Edición-de-usuario-superadmin' into 'develop' 
Ent 9172 edición de usuario superadmin

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9172

See merge request artica/pandorafms!4985
 2022-06-29 17:55:51 +00:00
Jimmy Olano 2220125250 Merge branch 'ent-9213-widget-de-reports-en-dashboards' into 'develop' 
delete item into widget pandora_enterprise#9213

See merge request artica/pandorafms!4987
 2022-06-29 16:32:49 +00:00
Daniel Maya ebe1965ca0 #8763 Fixed height 2022-06-29 17:31:46 +02:00
Daniel Maya 547962c83a Merge branch 'develop' into ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica 2022-06-29 17:27:25 +02:00
Diego Muñoz-Reja bc6f234029 Merge branch 'ent-9093-Harce-mas-grande-el-selector-acciones-alertas' into 'develop' 
Resized alert action list and refactor

See merge request artica/pandorafms!4980
 2022-06-29 14:50:37 +00:00
Diego Muñoz-Reja 0d8cfc3986 Merge branch 'ent-9147-13774-Lista-elementos-consola-visual-falla-con-muchos-elementos' into 'develop' 
fixed vc elements edition

See merge request artica/pandorafms!4963
 2022-06-29 14:36:41 +00:00
Diego Muñoz-Reja b9b074404c Merge branch 'ent-9158-Reloj-digital-en-consola-visual-se-descuadra-al-cambiar-de-tamaño' into 'develop' 
Ent 9158 reloj digital en consola visual se descuadra al cambiar de tamaño

See merge request artica/pandorafms!4965
 2022-06-29 14:13:24 +00:00
Diego Muñoz-Reja a2125580d9 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' into 'develop' 
Improved error message

See merge request artica/pandorafms!4939
 2022-06-29 14:01:49 +00:00
Daniel Maya 43b2a3d47e #9140 Fixed comments 2022-06-29 15:34:09 +02:00
Daniel Barbero Martin 2ff94b319c Merge remote-tracking branch 'origin/develop' into ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales 2022-06-29 13:54:27 +02:00
José González 7edcd3b0a6 Improve code and fix update alerts 2022-06-29 11:05:50 +02:00
José González ca0763f379 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' of https://brutus.artica.es:8081/artica/pandorafms into ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager 2022-06-29 10:20:31 +02:00
José González ef3dd0e741 Improved error message 2022-06-29 10:20:17 +02:00
Daniel Barbero Martin e3dfbf2bb2 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-29 09:14:17 +02:00
Jimmy Olano f48d3a9849 Merge branch 'ent-8984-13630-Cuenta-de-plantillas-de-alerta-no-coincide' into 'develop' 
Ent 8984 13630 cuenta de plantillas de alerta no coincide

See merge request artica/pandorafms!4902
 2022-06-29 02:40:08 +00:00
Jimmy Olano 5f5ca9ac13 Merge branch 'ent-9009-dashboards-widget-Estado-del-Módulo-pone-icono-inexistente' into 'develop' 
Ent 9009 dashboards widget estado del módulo pone icono inexistente

See merge request artica/pandorafms!4900
 2022-06-29 01:18:35 +00:00
Jimmy Olano aeb40bacc9 Merge branch 'ent-9101-13724-Fallo-operator-read-en-dashboard' into 'develop' 
Ent 9101 13724 fallo operator read en dashboard

See merge request artica/pandorafms!4945
 2022-06-29 01:11:44 +00:00
artica 87db3d57b5 Auto-updated build strings. 2022-06-29 01:00:36 +02:00
Daniel Barbero Martin c2c519694a size modal form widget pandora_enterprise#8621 2022-06-28 17:49:58 +02:00
Diego Muñoz-Reja 9120eb44c5 Merge branch 'ent-9231-grave-problema-seguridad-vista-de-eventos-metaconsola' into 'develop' 
fix events pandora_enterprise#9231

See merge request artica/pandorafms!4990
 2022-06-28 15:37:46 +00:00
Diego Muñoz-Reja 4d48bdec36 Merge branch 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' into 'develop' 
Changed strings and improve code

See merge request artica/pandorafms!4935
 2022-06-28 15:22:08 +00:00
Diego Muñoz-Reja b73389fff0 Merge branch 'ent-9033-Vista-de-eventos-Validar-eventos-repetidos' into 'develop' 
Ent 9033 vista de eventos validar eventos repetidos

See merge request artica/pandorafms!4953
 2022-06-28 15:17:13 +00:00
Daniel Barbero Martin 867c6a1415 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-28 17:02:01 +02:00
Daniel Barbero Martin 0957dd338f fix events pandora_enterprise#9231 2022-06-28 16:56:25 +02:00
José González 2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' 
# Conflicts:
#   pandora_console/index.php
 2022-06-28 14:39:37 +00:00