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

2036 Commits

Author SHA1 Message Date
Pablo Aragon b18a689225 About meta and observer input password 2023-03-03 12:40:58 +01:00
daniel 6545bdbaf1 fixed styles 2023-03-02 14:25:52 +01:00
Jonathan d5cd9a0ab2 SNMP browser action buttons 2023-02-28 15:26:42 +01:00
Jose Gonzalez 114e9a366f Networkmap 2023-02-28 10:39:31 +01:00
Jose Gonzalez ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +01:00
daniel 76b2c8743b Merge remote-tracking branch 'origin/ent-9987-mejoras-de-la-vista-de-inventario' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2023-02-27 18:25:45 +01:00
alejandro.campos@artica.es 930879b295 updated underscore 2023-02-27 17:26:58 +01:00
Jose Gonzalez 5df442e83e Network maps improve 2023-02-27 16:37:00 +01:00
Daniel Cebrian 8a33756e3a #10324 added limit in modal title 2023-02-27 11:17:17 +01:00
Daniel Cebrian 4917b40d10 10324 fixed modal in filter title 2023-02-27 10:05:16 +01:00
Daniel Cebrian e76d8606dc #10324 added star in menu 2023-02-27 09:45:15 +01:00
Daniel Cebrian 032fcdeae4 #10324 added fav menu in reporting viewer 2023-02-24 10:23:14 +01:00
Jose Gonzalez 6a5c2c58c7 Fix tree view 2023-02-24 10:19:56 +01:00
Jonathan a09c423284 SNMP views fix 2023-02-23 17:09:58 +01:00
alejandro.campos@artica.es ed93f55048 updated jquery-ui library 2023-02-23 16:48:57 +01:00
Jose Gonzalez f08fc6a8b7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 14:31:59 +01:00
Jose Gonzalez d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
Jonathan 0fbf50673a Dashboard multiselect height + delete size modal 2023-02-23 10:11:35 +01:00
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
Pablo Aragon e7d6afd636 10488-Fix views reports 2023-02-22 10:35:33 +01:00
Pablo Aragon 95fb797a7e 10488-Fix views reports 2023-02-22 10:33:45 +01:00
Jonathan 05c2232daa Modals dashboard view fix 2023-02-21 17:07:03 +01:00
Pablo Aragon 57a6bf97b0 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 11:28:36 +01:00
Pablo Aragon 7ac794f5ff 10469-Fix omnishell view 2023-02-21 11:28:26 +01:00
Jonathan 005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Jose Gonzalez 98bd383141 Minor html and ui improvements 2023-02-20 11:49:54 +01:00
Daniel Cebrian ace67ba42d #9073 fixed bug when modal close 2023-02-17 14:22:41 +01:00
Daniel Cebrian 35a1a67006 #9073 refactoring 2023-02-17 12:53:35 +01:00
Daniel Cebrian 9a0dc247c0 #9073 added preview tip 2023-02-17 11:07:28 +01:00
Daniel Cebrian 0cee40e40a #9073 create button for preview tip 2023-02-16 18:13:34 +01:00
Daniel Cebrian dce5b07109 #9073 added control image and fixed bug with language filter 2023-02-16 16:14:50 +01:00
Jonathan f557309238 Button ok mesage too much agents 2023-02-16 09:09:40 +01:00
Daniel Cebrian d8cfc68585 #9073 order by language tips 2023-02-15 17:51:30 +01:00
Daniel Cebrian 8ea9a0fc7e #9073 added system system for edit images in edit tip 2023-02-15 16:41:14 +01:00
Daniel Cebrian 09d703f981 #9073 added images input in create tips 2023-02-15 11:58:34 +01:00
Daniel Maya cac9f67153 #10195 Fixed minimap drawing 2023-02-15 10:49:31 +01:00
Daniel Cebrian 5d6ac202df #9073 clear logs 2023-02-14 10:55:48 +01:00
Daniel Cebrian ad4750c409 #9073 fixed bug in firts tips 2023-02-14 10:55:01 +01:00
Daniel Cebrian dfb93d2cf5 #9073 added token for tips in user profile configuration 2023-02-14 10:34:08 +01:00
Daniel Cebrian 887d2f8f18 #9073 added counter round un footer 2023-02-13 16:21:37 +01:00
Pablo Aragon feb2f3ffa2 10092-Widget tree view, Not normal status 2023-02-13 15:03:23 +01:00
Daniel Cebrian 6619cf059d #9073 added design v1 2023-02-13 13:26:49 +01:00
Daniel Cebrian e62dee1c62 #9073 create files structure 2023-02-13 10:06:14 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Rafael Ameijeiras 616644c3cf Merge branch 'ent-10189-mejora-visual-para-el-boton-de-testeo-de-alertas-consola-sonora' into 'develop' 
blink button test sound events pandora_enterprise#10189

See merge request artica/pandorafms!5470
 2023-02-10 08:01:34 +00:00
alejandro.campos@artica.es 73db9c7088 fixed error in massive agent operations in metaconsole 2023-02-09 17:15:07 +01:00
Daniel Cebrian ea789804f4 #10190 fixed response option 2023-02-07 17:41:27 +01:00
Daniel Cebrian 6117e1741f #10190 added popup for edit events in sound console 2023-02-07 16:48:23 +01:00
Pablo Aragon 36fc9b2917 9987-New inventory view 2023-02-03 09:55:46 +01:00
Jose Gonzalez bd26aa8f8d Minor fixes 2023-02-01 15:31:02 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jonathan f0d20a5775 #10153 indexof pandora visual console 2023-01-31 10:47:31 +01:00
Jonathan 89442c3ef9 #10153 regenerate build:watch 2023-01-30 17:06:24 +01:00
Jose Gonzalez 6496c08f28 Polish TreeView 2023-01-30 13:39:27 +01:00
Rafael Ameijeiras 4984599132 Merge branch 'ent-9175-13829-visualizacion-de-contrasenas-en-texto-plano-dentro-del-inspector-onenet-pakistan' into 'develop' 
Ent 9175 13829 visualizacion de contrasenas en texto plano dentro del inspector onenet pakistan

See merge request artica/pandorafms!5392
 2023-01-30 11:24:39 +00:00
Jonathan b48cd3ff73 #10153 refresh visual console maintenanceMode 2023-01-30 10:48:10 +01:00
Jonathan be6c3e1602 #10153 refresh visual console maintenanceMode 2023-01-30 09:51:12 +01:00
daniel 69db3c8031 blink button test sound events pandora_enterprise#10189 2023-01-27 12:44:15 +01:00
Jose Gonzalez deb69a0659 Fix issue with info box messages 2023-01-26 16:00:08 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +01:00
daniel ddebce7a3c fix validate events pandora_enterprise#10175 2023-01-25 11:25:20 +01:00
Pablo Aragon a50f50d99e 9987 Commit provisional 2023-01-24 09:33:47 +01:00
Jose Gonzalez 6f4b55e076 WIP: TreeView improve 2023-01-19 23:26:26 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Daniel Maya 04e039c515 resolved conflict 2023-01-18 11:31:26 +01:00
Daniel Maya 0f42a5fa88 #9783 Fixed networkmap 4 2023-01-18 11:29:06 +01:00
Calvo d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Pablo Aragon 72acbae5a6 Hide module password value 2023-01-10 10:23:09 +01:00
Enrique Martin f8e3353836 Merge branch 'ent-9787-14480-ventana-de-informacion-de-evento-no-se-actualiza-estado-en-la-pestana-general' into 'develop' 
Ent 9787 14480 ventana de informacion de evento no se actualiza estado en la pestana general

See merge request artica/pandorafms!5379
 2023-01-05 11:50:48 +00:00
Jonathan e55d4f3019 #9787 Alert general Acknowledged recovery 2023-01-05 10:36:14 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Daniel Cebrian 49ebd5b576 fixed visual bug in calendar 2023-01-03 17:31:28 +01:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
Pablo Aragon ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +01:00
Rafael Ameijeiras fa034e4ae2 Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop' 
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas

See merge request artica/pandorafms!5359
 2022-12-28 09:42:23 +00:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01:00
daniel 69e3203317 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-27 09:06:20 +01:00
daniel 5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
Pablo Aragon 78c4f15c16 9994 Add trigger to id_module_group 2022-12-21 12:56:26 +01:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
alejandro.campos@artica.es 11c4319dd7 added link to node name 2022-12-16 11:19:23 +01:00
alejandro.campos@artica.es 69631da08a added link to node name 2022-12-16 11:17:47 +01:00
alejandro.campos@artica.es 38d279581a added link to node name 2022-12-16 11:09:04 +01:00
Daniel Barbero 62aea35d7b fixed js render 2022-12-16 10:38:37 +01:00
Rafael Ameijeiras 8a6e3e5e06 Merge branch 'ent-8854-13786-alertas-sonoras-en-metaconsola' into 'develop' 
add sound events to metaconsole pandora_enterprise#8854

See merge request artica/pandorafms!5246
 2022-12-12 14:02:36 +00:00
Diego Muñoz-Reja 31919d4d2c Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop' 
Prepare download control

See merge request artica/pandorafms!5276
 2022-12-12 08:29:51 +00:00
Calvo c5c36dab8b Fix dashboard dialog tranlations and search bar size 2022-12-05 17:20:08 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com 79be611e91 CSS Styles 2022-12-02 14:26:05 +01:00
Calvo e0afcd0b85 WIP: Download wait message. datatables 2022-12-02 13:12:58 +01:00
Calvo d525cb594c WIP: Download wait message 2022-12-02 09:42:24 +01:00
Daniel Maya 8609028b4f #9937 Added ajax call 2022-11-30 14:40:41 +01:00
alejandro.campos@artica.es d564fc4022 fix reference error 2022-11-24 10:25:28 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com 21fbdb467e Datatables minor changes 2022-11-21 23:47:18 +01:00
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01:00
Luis 14745a9625 WIP:Prepare download control 2022-11-21 09:23:31 +01:00
jose.gonzalez@pandorafms.com 325bbea8db Agent view fixed and other minor fixes 2022-11-15 08:05:04 +01:00
Daniel Maya 53ef84c7e5 #9765 Fixed check connection 2022-11-08 08:20:32 +01:00
edu.corral 1ff9b8c420 ent 7914 time based status scaling components 2022-11-04 09:45:06 +01:00
Daniel Barbero ccc2e830f4 add sound events to metaconsole pandora_enterprise#8854 2022-11-03 15:12:50 +01:00
Daniel Rodriguez d99ccaba9e Merge branch 'ent-9729-xss-en-busqueda-de-libreria-de-modulos' into 'develop' 
Fix module library XSS

See merge request artica/pandorafms!5233
 2022-10-31 14:12:46 +00:00
Daniel Rodriguez 41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop' 
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
 2022-10-31 10:02:44 +00:00
Calvo 7bdf103725 Fix module library XSS 2022-10-31 10:19:13 +01:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-26 09:42:02 +02:00
Daniel Rodriguez b6a38e1b7a Merge branch 'ent-9671-faltan-opciones-masivas-en-operaciones-con-eventos' into 'develop' 
event multiple operations pandora_enterprise#9671

See merge request artica/pandorafms!5203
 2022-10-25 09:05:43 +00:00
Daniel Rodriguez a3dc8be0e5 Merge branch 'ent-9254-13891-encriptar-contrasenas-en-replicacion-de-bbdd' into 'develop' 
Ent 9254 13891 encriptar contrasenas en replicacion de bbdd

See merge request artica/pandorafms!5140
 2022-10-21 10:42:16 +00:00
Daniel Rodriguez 35fcfa275f Merge branch 'ent-9117-diferencia-de-estilos-en-mouseovers-del-tree-view-de-servicios' into 'develop' 
Ent 9117 diferencia de estilos en mouseovers del tree view de servicios

See merge request artica/pandorafms!5185
 2022-10-20 07:13:39 +00:00
Daniel Barbero 6ef3505eab event multiple operations pandora_enterprise#9671 2022-10-19 16:20:49 +02:00
Jimmy Olano aaedb39849 Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop' 
Fix planned downtime issues

Ref: pandora_enterprise#9392

See merge request artica/pandorafms!5166
 2022-10-19 11:00:04 +00:00
Daniel Barbero 40dc913aca Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 2022-10-18 12:53:28 +02:00
Daniel Rodriguez 38af75ccc1 Merge branch 'ent-9266-13916-formulario-de-registro-usuario-se-restablece-tras-error' into 'develop' 
Fix user form reset if profile fails

See merge request artica/pandorafms!5137
 2022-10-17 11:27:16 +00:00
Diego Muñoz-Reja 4c74f1bee7 Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop' 
fixed response events pandora_enterprise#9423

See merge request artica/pandorafms!5141
 2022-10-17 10:49:01 +00:00
Calvo 2251062d30 Fix user profile add bugs 2022-10-17 12:26:38 +02:00
Daniel Barbero 370852066f Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/functions_modules.php
 2022-10-14 11:46:20 +02:00
Daniel Barbero 004f5c4763 Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/include/visual-console-client/vc.main.min.js
	pandora_console/include/visual-console-client/vc.main.min.js.map
 2022-10-14 11:03:11 +02:00
Daniel Rodriguez 095732eab5 Merge branch 'ent-9467-no-se-pueden-cambiar-umbrales-warning-y-critical-en-ciertos-modulos' into 'develop' 
Ent 9467 no se pueden cambiar umbrales warning y critical en ciertos modulos

See merge request artica/pandorafms!5148
 2022-10-14 08:17:34 +00:00
Daniel Barbero 19cfc84a39 add mode maintenance VC pandora_enterprise#4822 2022-10-13 17:45:44 +02:00
Daniel Barbero 3099ffa7cb add mode maintenance VC pandora_enterprise#4822 2022-10-13 13:44:39 +02:00
Daniel Barbero 9c93a99fb2 add mode maintenance VC pandora_enterprise#4822 2022-10-13 11:03:49 +02:00
edu.corral 40c9ed762c ent 9117 mouseover service tree 2022-10-10 16:16:00 +02:00
Daniel Maya bf0d7ff687 #4043 added wizard snmp 2022-10-10 13:27:19 +02:00
Daniel Barbero ce823dca38 new widget grouped meter graphs pandora_enterprise#8620 2022-10-10 11:20:03 +02:00
Calvo b29f7eb160 Fix planned downtime issues 2022-09-30 14:54:16 +02:00
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop' 
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
 2022-09-29 12:36:37 +00:00
edu.corral b43d548312 ent 9467 warning and critical thresholds 2022-09-28 15:02:11 +02:00
Daniel Barbero 755432b381 Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo 2022-09-28 08:52:43 +02:00
Daniel Barbero fbce8b7533 fixed response events pandora_enterprise#9423 2022-09-27 09:51:37 +02:00
Daniel Barbero 225646cd9d fixed response events pandora_enterprise#9423 2022-09-23 13:55:01 +02:00
Daniel Maya 795308367f #9254 load password with ajax 2022-09-23 13:24:46 +02:00
edu.corral af7ad37b50 ent 8659 fullname event owner 2022-09-16 11:04:01 +02:00
Ramon Novoa 9f30d66328 Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien 2022-09-02 14:06:50 +02:00
Daniel Maya bb691c2e16 #8889 Fixed refresh and duplicate relations 2022-08-31 10:08:20 +02:00
Daniel Maya d3612439fb #8898 conflict resolved 2022-08-29 14:06:15 +02:00
alejandro.campos@artica.es de55200659 Merge remote-tracking branch 'origin/develop' into ent-5319-9412-mas-personalizacion-de-paradas-planificada 2022-08-29 10:06:41 +02:00
Daniel Maya cebaba4575 #8898 networkmap 2 2022-08-29 10:02:16 +02:00
Daniel Maya 16554cfc7a #8898 networkmap 2022-08-29 09:39:47 +02:00
Daniel Maya 182bb2d2c4 8898 Refresh time 2022-08-23 11:17:48 +02:00
Daniel Maya b58b0d6c51 #9348 fixed update relations 2022-08-17 12:52:02 +02:00
alejandro.campos@artica.es ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
Daniel Maya 6cf8fdad39 #9348 improved usability 2022-08-16 14:07:25 +02:00
Daniel Maya 4d7329f1fd #9347 central node deletion 2022-08-12 09:44:16 +02:00
Daniel Maya 2f9d1de8b4 #9343 Not closing the modal window 2022-08-11 12:46:25 +02:00
Daniel Maya 9b3661bca1 #9344 Fix fictional node 2022-08-10 13:59:48 +02:00
Daniel Barbero Martin e58bc4f96a move massive aperation edit agent pandora_enterprise#8564 2022-07-14 16:06:51 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02: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 c3dc1d820d Frontend changes 2022-06-28 17:24:49 +02: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 4ca27cd5a9 Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop' 
events sound pandora_enterprise#7960

See merge request artica/pandorafms!4923
 2022-06-28 13:47:05 +00:00
Daniel Barbero Martin 941d477403 fixed size modal pandora_enterprise#8827 2022-06-27 18:07:01 +02:00
Daniel Barbero Martin 1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/functions_events.php
 2022-06-27 16:07:19 +02:00
Daniel Barbero Martin ebe5f0de7c Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-27 09:48:18 +02:00
Daniel Barbero Martin 24305b40b0 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
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
 2022-06-27 08:38:50 +02:00
Daniel Barbero Martin f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Barbero Martin 0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
Daniel Barbero Martin 4b00e8ee3c refactor events meta pandora_enterprise#9086 2022-06-22 10:29:19 +02:00
Daniel Barbero Martin 22717d169d Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/service_map.php
 2022-06-21 14:43:47 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
José González b871c1fb55 Added token view and generation in user views 2022-06-17 12:13:23 +02:00
Daniel Barbero Martin 6f49f63353 fixed VC pandora_enterprise#8888 2022-06-16 14:09:30 +02:00
Daniel Barbero Martin 8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
Daniel Barbero Martin 1bf1a83782 Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour 2022-06-15 19:49:31 +02:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Daniel Barbero Martin 5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-13 17:10:19 +02:00
Daniel Barbero Martin 5680b82563 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-13 08:16:40 +02:00
Daniel Rodriguez ad9a864b1c Merge branch 'ent-9116-13158-Nuevos-fallos-componentes-locales-con-politicas-con-macro' into 'develop' 
fixed macro default value not loading

See merge request artica/pandorafms!4941
 2022-06-09 07:32:18 +00:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Rodriguez bf7941ddd2 Merge branch 'ent-7757-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual-dashboard' into 'develop' 
Service tree view with local scope parents

See merge request artica/pandorafms!4826
 2022-06-07 10:47:26 +00:00
alejandro.campos@artica.es 7aa40617f8 fixed macro default value not loading 2022-06-07 11:20:51 +02:00
Daniel Rodriguez 8fcdb59ae8 Merge branch 'ent-7850-12225-Añadir-buscador-para-agentes-en-wizard-report' into 'develop' 
implemented text search of select inputs

See merge request artica/pandorafms!4831
 2022-06-02 08:31:58 +00:00
Daniel Barbero Martin 8e78110d5d events sound pandora_enterprise#7960 2022-05-30 17:47:28 +02:00
Daniel Barbero Martin 9d2c179423 add new widget color tabs module pandora_enterprise#8621 2022-05-19 18:00:49 +02:00
Daniel Barbero Martin c437b894a3 fixed modal size configuration widgets pandora_enterprise#8827 2022-05-18 12:55:10 +02:00
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
alejandro.campos@artica.es 4c988a2413 fixed creation of policy modules based on local components with macros 2022-05-05 13:59:35 +02:00
José González 3cd116f88b Fix issue with period selector 2022-04-25 10:33:33 +02:00
alejandro.campos@artica.es 9adb8bae1d minor fix 2022-04-25 10:16:18 +02:00
alejandro.campos@artica.es 0223dd27c7 implemented text search of select inputs 2022-04-21 16:56:08 +02:00
fbsanchez 78907e691c removed traces 2022-04-20 18:45:52 +02:00
fbsanchez 87cd23b08a a nice trick 2022-04-20 18:41:03 +02:00
fbsanchez 2ab1aa601c Service tree view with local scope parents 2022-04-20 14:10:23 +02:00
alejandro.campos@artica.es 6b708777f6 change email alert templates 2022-04-07 17:24:06 +02:00
Daniel Rodriguez 6ec51c0e97 Merge branch 'ent-8687-bugs-en-horario-de-alertas' into 'develop' 
fixed calendar templates alerts pandora_enterprise#8687

See merge request artica/pandorafms!4788
 2022-03-30 14:07:51 +00:00
Daniel Rodriguez 74e4461d8a Merge branch 'ent-8697-13244-no-funcionan-acciones-de-eventos-a-traves-de-un-dashboard' into 'develop' 
Fix dashboard events responses

See merge request artica/pandorafms!4759
 2022-03-30 07:45:07 +00:00
Daniel Rodriguez c2b2ab3394 Merge branch 'ent-8674-job-failed-244975' into 'develop' 
Missing network components

See merge request artica/pandorafms!4758
 2022-03-25 11:02:30 +00:00
Calvo 6ed8851188 Fix event list widget actions on dashboard 2022-03-24 18:52:06 +01:00
Daniel Rodriguez 38b71b3de7 Merge branch 'ent-7063-Informes-de-servicio-en-Meta' into 'develop' 
report SLA services to metaconsole pandora_enterprise#7063

See merge request artica/pandorafms!4678
 2022-03-23 10:44:01 +00:00
Calvo 174f6dce51 Fix dashboard event list, Removed missing debugger in code 2022-03-22 18:02:53 +01:00
Daniel Barbero Martin 0a5a07537d fixed CV in console mobile metaconsole pandora_enterprise#8676 2022-03-22 12:31:30 +01:00
Daniel Barbero Martin 2e083c06d7 add report services sla to wizard metaconsole pandora_enterprise#7063 2022-03-22 11:32:44 +01:00
Luis ba6a56b9fc WIP: event dashboard responses 2022-03-21 18:15:58 +01:00
Daniel Barbero Martin aec87c8839 fixed calendar templates alerts pandora_enterprise#8687 2022-03-21 13:28:53 +01:00
Daniel Barbero Martin 76d8918a4e fixed CV in console mobile metaconsole #8676 2022-03-21 10:04:11 +01:00
Daniel Barbero Martin e5f8e32a9e fixed CV in console mobile metaconsole #8676 2022-03-18 13:07:29 +01:00
Daniel Barbero Martin 6c4d2f2b31 fixed CV in console mobile metaconsole #8676 2022-03-15 18:12:01 +01:00
Daniel Barbero Martin 9e07afdab2 fixed CV in console mobile metaconsole #8676 2022-03-15 11:39:57 +01:00
fbsanchez 58a473276f js module fixes 2022-03-14 12:10:30 +01:00
Daniel Rodriguez 601cd1cba4 Merge branch 'ent-8656-post-busqueda-no-funciona-al-cambiar-owner-de-un-evento' into 'develop' 
Fix select2 search on extended events dialog

See merge request artica/pandorafms!4738
 2022-03-11 12:41:22 +00:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' 
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
 2022-03-11 08:51:33 +00:00
Daniel Barbero Martin 7ffca83b29 fixed error massive operation agents #2152 2022-03-10 20:06:45 +01:00
Daniel Rodriguez edd76aa959 Merge branch 'ent-8591-envio-de-feedback-no-funciona' into 'develop' 
Fix error/success from send feedback dialog

See merge request artica/pandorafms!4713
 2022-03-10 13:53:40 +00:00
Daniel Rodriguez 09ba16c593 Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop' 
clean file planned_downtime pandora_enterprise#5886

See merge request artica/pandorafms!4688
 2022-03-09 12:48:47 +00:00
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios 
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
 2022-03-09 09:28:08 +01:00
Calvo 433b4dda62 Fix select2 search on extended events dialog 2022-03-03 18:37:33 +01:00
Calvo 3e6a6445b1 Fix error/success from send feedback dialog 2022-02-22 17:29:17 +01:00
Calvo b67683adff Fix agent modules selector on meta for dashboards 2022-02-21 16:38:09 +01:00
Calvo 8d293c4777 Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-18 12:26:13 +01:00
Calvo a642f88364 Multiselect filtered revomed all/common modules select and added switch 2022-02-16 12:26:22 +01:00
Calvo 9d4eda381b Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-15 17:44:34 +01:00
Calvo e2b3cd2dab Visual changes on dashboard agent/modules configuration menu 2022-02-15 17:36:00 +01:00
fbsanchez 1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
 2022-02-15 17:32:10 +01:00
fbsanchez 7c11a01b85 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 2022-02-15 14:32:50 +01:00
Daniel Rodriguez 6abd7212e6 Merge branch 'ent-7573-Problemas-integracion-Module-Library-vs-Wordpress' into 'develop' 
Ent 7573 problemas integracion module library vs wordpress

Closes pandora_enterprise#7573

See merge request artica/pandorafms!4634
 2022-02-15 10:19:49 +00:00
fbsanchez 9ba2eb0c74 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
 2022-02-10 18:52:51 +01:00
Daniel Barbero Martin b56c9e6529 new modal planned_downtime resume agents/modules pandora_enterprise#5886 2022-02-09 14:57:36 +01:00
Jose Gonzalez 3d4146c926 Minor fix 2022-02-08 17:54:37 +01:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
fbsanchez 331f8e8906 php8 incompatibility fixes 2022-02-07 13:48:25 +01:00
Daniel Barbero Martin 0e0e737283 calendar not editable pandora_enterprise#3943 2022-02-07 13:07:48 +01:00
Daniel Barbero Martin dca70fa8ec Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-07 08:04:36 +01:00
Daniel Barbero Martin 6f15d26af2 minor fix pandora_enterprise#3943 2022-02-04 09:48:10 +01:00
Daniel Barbero Martin a359fd6828 bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 12:56:36 +01:00
Daniel Barbero Martin c971ed6dd5 alert template schedule pandora_enterprise#3943 2022-02-02 13:18:16 +01:00
Daniel Barbero Martin 3d951749f5 alert template schedule pandora_enterprise#3943 2022-02-02 13:03:52 +01:00
Daniel Rodriguez 110052a21f Merge branch 'ent-8428-12919-visualizacion-agentes-en-operaciones-masivas-de-modulos' into 'develop' 
Ent 8428 12919 visualizacion agentes en operaciones masivas de modulos

See merge request artica/pandorafms!4666
 2022-02-02 09:37:15 +00:00
Daniel Rodriguez 1ff1e2b3fd Merge branch 'ent-8507-13049-Bug-al-crear-modulo-de-prediccion' into 'develop' 
fix in prediction modules creation

See merge request artica/pandorafms!4665
 2022-02-02 09:36:45 +00:00
Daniel Barbero Martin 5060d0b8f7 alert template schedule pandora_enterprise#3943 2022-02-02 10:09:31 +01:00
Daniel Barbero Martin b62566af49 alert template schedule pandora_enterprise#3943 2022-02-01 16:50:53 +01:00
Daniel Barbero Martin 0a4d6cfd31 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-02-01 11:36:33 +01:00
Daniel Rodriguez d21d65a7ac Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop' 
Added select filtered modulo to custom graphs conf menu

See merge request artica/pandorafms!4647
 2022-02-01 09:38:12 +00:00
Daniel Barbero Martin 15ada66942 alert template schedule pandora_enterprise#3943 2022-01-31 16:50:48 +01:00
alejandro.campos@artica.es 2b6a9f0277 show agent and module name tip 2022-01-31 15:43:56 +01:00
Daniel Barbero Martin c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
alejandro.campos@artica.es b9c78bbfb1 show agent and module name tip 2022-01-31 13:18:26 +01:00
alejandro.campos@artica.es e56512246b fix in prediction modules creation 2022-01-31 11:35:53 +01:00
Daniel Barbero Martin 392a9223e8 alert template schedule pandora_enterprise#3943 2022-01-28 14:06:31 +01:00
alejandro.campos@artica.es d210390a3d truncate texts in module massive operations 2022-01-27 17:30:20 +01:00
Daniel Barbero Martin a4f092f0a0 alert template schedule pandora_enterprise#3943 2022-01-27 17:02:24 +01:00
Daniel Barbero Martin 9f01029520 Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-26 08:12:20 +01:00
Daniel Barbero Martin 74f73e2004 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-26 08:10:40 +01:00
Calvo f383586dcc WIP:Added searchbar to select multiple modules 2022-01-25 20:15:40 +01:00
vgilc 4b85e93490 Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop' 
Ent 8222 nueva grafica desde la vista de modulos histograma

See merge request artica/pandorafms!4637
 2022-01-25 10:28:18 +00:00
vgilc ea122aae3e Merge branch 'ent-8387-Bug-visual-al-intentar-linkar-a-un-agente-sin-permisos' into 'develop' 
Ent 8387 bug visual al intentar linkar a un agente sin permisos

See merge request artica/pandorafms!4632
 2022-01-25 10:22:42 +00:00
Daniel Barbero Martin 2519335637 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-25 10:40:37 +01:00
Daniel Barbero Martin 9a799a838d Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-25 10:34:43 +01:00
vgilc 6749090cc6 Merge branch 'ent-8409-bug-widget-agent-module-view' into 'develop' 
Fix issue with modules

Closes pandora_enterprise#8409

See merge request artica/pandorafms!4616
 2022-01-25 09:28:12 +00:00
Daniel Barbero Martin 2fccdd12cb bulk operations agents in meta #8290 2022-01-24 12:19:09 +01:00
Daniel Barbero Martin 7c2000c34d bulk operations agents in meta #8290 2022-01-21 11:49:30 +01:00
Daniel Barbero Martin 87bfd08bb9 bulk operations agents in meta #8290 2022-01-20 16:52:14 +01:00
Daniel Barbero Martin 6be6b1a95d add new macros #3763 2022-01-19 12:18:23 +01:00
Daniel Barbero Martin a0a74cf7bb add new chart histogram 2022-01-18 13:01:49 +01:00
Daniel Maya b2fe6780ac Fixed links in networkmaps 2022-01-18 11:39:37 +01:00
Jose Gonzalez 7a88e2db29 WIP: Testing Wordpress with prewebs 2022-01-17 17:15:37 +01:00
Daniel Maya 626431f27c Added check on agents without acl 2022-01-14 09:49:26 +01:00
José González f18e0693da Merge branch 'develop' into 'ent-8409-bug-widget-agent-module-view' 
# Resolve Conflicts:
#   pandora_console/include/javascript/pandora_dashboards.js
 2022-01-13 08:58:21 +00:00
Daniel Maya ffc468fce8 Added message 2022-01-12 13:59:46 +01:00
Jose Gonzalez 9519e00992 Fix issues with select agents modules control 2022-01-11 16:06:58 +01:00
Jose Gonzalez f072585d5a Clean undefined messages for tree view 2022-01-07 10:39:03 +01:00
Jose Gonzalez 8cdf1acd42 Fix issue with modules 2022-01-06 16:23:13 +01:00
Daniel Rodriguez a89d3b2b25 Merge branch 'ent-8232-plugin-de-servidor-con-el-token-hide-habilitado' into 'develop' 
Ent 8232 plugin de servidor con el token hide habilitado

See merge request artica/pandorafms!4567
 2021-12-27 17:00:32 +00:00
Daniel Barbero Martin a803b5fa90 WIP #3943 2021-12-17 13:38:53 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Rodriguez c3f9ed1bf2 Merge branch 'ent-8042-agrupacion-eventos-no-funcionan-bien-comentarios' into 'develop' 
Added feature for read comments in grouped events

Closes pandora_enterprise#8042

See merge request artica/pandorafms!4467
 2021-12-07 16:51:07 +00:00
fbsanchez 3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-03 10:24:01 +01:00
Daniel Maya 6ead6b8a48 #8232 Fixed value in password 2021-12-03 09:22:39 +01:00
Daniel Rodriguez 69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop' 
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
 2021-12-02 10:51:57 +00:00
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
Jose Gonzalez 7918b883aa Set the last grouped comments to last events fired 2021-11-29 16:12:15 +01:00
Daniel Maya c289f67395 #8307 Added contextmenu in supernet map 2021-11-29 15:54:45 +01:00
Daniel Rodriguez 198959f6cb Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop' 
Unify search criteria case insensitive

See merge request artica/pandorafms!4496
 2021-11-29 11:08:00 +00:00
fbsanchez 9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
Calvo 5464a73a12 Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor 2021-11-24 13:28:36 +01:00
Calvo 4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +01:00
fbsanchez ce00d59f00 ncm2 2021-11-23 20:31:04 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
fbsanchez 8346a233be NCM2 2021-11-18 19:49:57 +01:00
fbsanchez 75f4e86f9e Code highlight 2021-11-16 14:05:02 +01:00
Daniel Rodriguez d094987eda Merge branch 'ent-8063-recursion-y-filtro-en-operaciones-masivas-de-modulos' into 'develop' 
Fix recursion and filter on modules massive operations

See merge request artica/pandorafms!4477
 2021-11-15 11:29:33 +00:00
Daniel Rodriguez 9b55ade1bb Merge branch 'ent-7997-fallo-visualizacion-vista-de-arbol-de-servicios' into 'develop' 
Fix services tree empty leaf visual bug

See merge request artica/pandorafms!4410
 2021-11-15 10:24:57 +00:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin 1e976a8605 alerts special days wip 2021-11-03 10:59:00 +01:00
Daniel Barbero Martin 89680907fd wip special days 2021-10-29 13:45:18 +02:00
Daniel Barbero Martin c2cce3990a special days template alerts 2021-10-28 17:30:03 +02:00
Daniel Rodriguez e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop' 
NCM

See merge request artica/pandorafms!4434
 2021-10-26 08:21:01 +00:00
alejandro.campos@artica.es aa24bf545c fixed ipam supernet tree view when there is no data show 2021-10-25 12:14:21 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
Calvo f1f984614f Unify search criteria case insensitive 2021-10-22 12:02:31 +02:00