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

2028 Commits

Author SHA1 Message Date
Pablo Aragon bed1e34fd2 Dashboards widgets 2023-03-15 15:58:28 +01:00
Daniel Cebrian c346aefeaa #10685 changed in system fav, tips and Tactical group view 2023-03-15 12:46:09 +01:00
daniel cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 
Conflicts:
	pandora_console/extras/mr/62.sql
 2023-03-14 18:17:54 +01:00
daniel 423767a32a fixed styles 2023-03-14 17:27:01 +01:00
daniel c4f4d371cc fixed styles 2023-03-14 17:25:58 +01:00
Pablo Aragon 6e4fe7bc48 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 14:56:52 +01:00
Pablo Aragon 658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
Jose Gonzalez f0a424a493 Module manager fix 2023-03-14 08:04:05 +01:00
Pablo Aragon 51ab985784 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 16:14:02 +01:00
Pablo Aragon 6450100f23 Manage agent, setup view 2023-03-13 16:13:49 +01:00
Jose Gonzalez a7cfa310a3 Agents alias in header 2023-03-13 15:52:28 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel 8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Jose Gonzalez d4fa2831bf Inventory tab 2023-03-09 16:44:45 +01:00
daniel 1a63f8070a fixed styles 2023-03-09 15:06:03 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Jose Gonzalez c51c00f974 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:05:35 +01:00
Jose Gonzalez f5daa72c6b Scheduled downtime 2023-03-08 15:04:07 +01:00
Jose Gonzalez 0373cd3514 Scheduled downtime 2023-03-08 15:02:12 +01:00
Jonathan 91a708dfb8 SNMP Browser and agent module SNMP walk 2023-03-08 13:41:00 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
daniel 1db803b8f6 fixed styles 2023-03-07 12:59:34 +01:00
Jose Gonzalez 114e9a366f Networkmap 2023-02-28 10:39:31 +01:00
daniel f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
 2023-02-28 07:32:43 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Jose Gonzalez 70216262a9 Minor fixes 2023-02-24 12:05:53 +01:00
daniel fa81a4e744 restyling 2023-02-23 15:44:01 +01:00
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Jose Gonzalez 0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
Jose Gonzalez 2fd52eff48 Sprint 2025Feb Improve UI-UX and Resources views 2023-02-21 14:14:13 +01:00
Jose Gonzalez 13aa4e77f1 Fix minor issues 2023-02-20 17:49:02 +01:00
Jose Gonzalez a1bf42c9f9 Ticket 10470 Agent improvements 2023-02-17 14:21:29 +01:00
Jonathan 041ce5d5e8 Manage Agents delete and create required "primary group" 2023-02-16 10:59:45 +01:00
Jose Gonzalez be33b2f51a Several visual fixes for fit with mockups 2023-02-14 14:06:51 +01:00
Jose Gonzalez 1d682521e9 Minor fixes in agent/module view 2023-02-14 10:41:40 +01:00
Jose Gonzalez 8f65ee4fb8 Minor fix: search submit in module list 2023-02-14 07:52:13 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Daniel Cebrian bcfa977f56 #10335 fixed plugin select in edit modules in bulk 2023-02-08 15:23:13 +01:00
Jose Gonzalez 4d9c6ab33a Minor fixes 2023-02-08 12:58:23 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
Jose Gonzalez 3a741f8ed9 Update icons and improve tables 2023-02-07 16:22:52 +01:00
Jose Gonzalez ab1d2f38f6 Changed function name 2023-02-07 15:39:53 +01:00
Jose Gonzalez e99ad97e17 Fixes and improvements 2023-02-07 15:33:29 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Jose Gonzalez b9992c5a67 Minor fixes for solve visual issues 2023-02-03 12:37:09 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Rafael Ameijeiras 3bc593e58a Merge branch 'ent-10219-stored-cross-site-scripting-in-syslog-section' into 'develop' 
Ent 10219 stored cross site scripting in syslog section

See merge request artica/pandorafms!5464
 2023-02-02 10:02:32 +00:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez 0162767f6d Clean debug 2023-01-30 13:39:58 +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
Daniel Cebrian c2a16eb311 #10219 added db_escape_string_sql for control quotes 2023-01-26 16:34:35 +01:00
Daniel Cebrian 9282aa2319 #10219 fixed xss injection in syslog 2023-01-26 16:20:25 +01:00
Rafael Ameijeiras 7bdfb1a096 Merge branch 'ent-10055-introducir-aviso-de-borrado-de-modulos-hijos' into 'develop' 
Added child module delete warning

See merge request artica/pandorafms!5429
 2023-01-26 12:53:03 +00:00
Pablo Aragon 0ec58067ab 9220 Cast config['license_nms'] 2023-01-24 14:45:42 +01:00
Rafael Ameijeiras 2be4dc7960 Merge branch 'ent-9069-schedule-downtime-poner-decente-el-filtro' into 'develop' 
Ent 9069 schedule downtime poner decente el filtro

See merge request artica/pandorafms!5398
 2023-01-24 12:03:10 +00:00
Calvo 5d0826f412 Delete modules with children message 2023-01-24 12:26:49 +01:00
Pablo Aragon d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Calvo 8c071532e9 Added child module delete warning 2023-01-19 10:34:13 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Jose Gonzalez 8c1bd2c1ee Agent module manager fixed and improve action buttons 2023-01-17 15:21:07 +01:00
Jose Gonzalez 8c852fb3df Agent improvements 2023-01-16 01:28:53 +01:00
Calvo ce224d67ba Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2023-01-13 09:08:17 +01:00
Daniel Rodriguez 29624c92e8 Merge branch 'ent-9618-ver-la-ip-contra-la-que-se-esta-ejecutado-un-modulo-remoto-en-la-vista-de-agente' into 'develop' 
Ent 9618 ver la ip contra la que se esta ejecutado un modulo remoto en la vista de agente

See merge request artica/pandorafms!5393
 2023-01-12 12:25:35 +00:00
Pablo Aragon c503836634 Restrict access to collections with nms license 2023-01-12 12:28:40 +01:00
Daniel Cebrian 31d0cceecc #10131 fixed error 500 in module templates 2023-01-11 17:00:39 +01:00
Daniel Cebrian 0f7ffec6aa #9069 fixed style in SCHEDULED DOWNTIME form 2023-01-11 13:57:46 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 118099cd24 Minor fixes and solve issues with module templates 2023-01-11 13:02:18 +01:00
Jose Gonzalez 4cb5055488 TODO added 2023-01-10 15:16:58 +01:00
Daniel Cebrian df87c122af added ip in modules list 2023-01-10 10:50:47 +01:00
Pablo Aragon 72acbae5a6 Hide module password value 2023-01-10 10:23:09 +01:00
Jose Gonzalez 60685cdccc Table fixes 2023-01-10 10:18:37 +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
Jose Gonzalez 8728551c08 Agent details modules table upgraded 2023-01-04 15:46:32 +01:00
Jose Gonzalez 03226b1f23 Polishing agent main view 2023-01-02 16:50:13 +01:00
Calvo 566344ef0e Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 11:00:44 +01:00
Rafael Ameijeiras 7c0b6330bd Merge branch 'ent-9997-quitar-using-module-component-de-la-edicion-de-modulo' into 'develop' 
Ent 9997 quitar using module component de la edicion de modulo

See merge request artica/pandorafms!5354
 2022-12-28 09:49:42 +00: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
Rafael Ameijeiras db7205fed3 Merge branch 'ent-9996-descripcion-incorrecta-al-crear-modulo-ssh' into 'develop' 
Ent 9996 descripcion incorrecta al crear modulo ssh

See merge request artica/pandorafms!5351
 2022-12-28 09:37:04 +00:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01:00
Jonathan c89d80e7e7 #9997 Module agent on edit don't show template 2022-12-23 09:44:15 +01:00
Calvo b46f9c9319 Move inventory to open 2022-12-22 12:47:03 +01:00
Calvo 2ad8fac652 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-22 11:35:25 +01:00
Rafael Ameijeiras 925749dc5f Merge branch 'ent-9052-lista-de-modulos-de-un-agente-ordenar-filtros-y-controles' into 'develop' 
Ent 9052 lista de modulos de un agente ordenar filtros y controles

See merge request artica/pandorafms!5327
 2022-12-22 09:35:41 +00:00
Pablo Aragon d83abafaaa 9996 Edit description when create ssh module 2022-12-21 17:05:01 +01:00
Rafael Ameijeiras 9ad2556201 Merge branch 'ent-1270-borrado-de-modulos-hijos-automatico' into 'develop' 
Ent 1270 borrado de modulos hijos automatico

See merge request artica/pandorafms!5340
 2022-12-21 11:49:39 +00:00
Daniel Rodriguez cc2da2d4a4 Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop' 
implement cluster in open project

See merge request artica/pandorafms!5204
 2022-12-21 09:05:01 +00:00
Jonathan f62116bf92 #1270 deleche children modules on checked 2022-12-21 08:44:11 +01:00
Jose Gonzalez ffa4ec756c Agent Group icons adding 2022-12-20 17:22:35 +01:00
alejandro.campos@artica.es 47cb138d9b path fix 2022-12-20 14:15:33 +01:00
Jonathan e694d6468f 1270 Delete modules on cascade 2022-12-19 17:04:49 +01:00
Jose Gonzalez b0997850f4 Fix server type icon definition 2022-12-19 16:38:47 +01:00
Jose Gonzalez 977c358fa0 Grouped somethings 2022-12-19 15:08:53 +01:00
Calvo 63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +01:00
Jose Gonzalez fd48f54f66 Minor fix 2022-12-19 11:06:21 +01:00
jose.gonzalez@pandorafms.com 2b896bcd17 Minor fixes over module data tables 2022-12-16 12:55:56 +01:00
Alejandro Campos 960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2022-12-15 14:05:27 +00:00
jose.gonzalez@pandorafms.com 4fd0115d80 Adapt views 2022-12-15 12:42:35 +01:00
alejandro.campos@artica.es 2106cac36a minor fix 2022-12-14 11:23:32 +01:00
Pablo Aragon 030c50e533 9052 Edit styles of Manage agents / Modules 2022-12-12 18:53:11 +01:00
Rafael Ameijeiras 44655d7ae3 Merge branch 'ent-9152-Opcion-de-habilitar-modulos-en-grupos-en-la-vista-de-agente' into 'develop' 
add enable modules massive option

See merge request artica/pandorafms!5215
 2022-12-12 11:57:27 +00:00
jose.gonzalez@pandorafms.com 744a7b47fe Minor changes 2022-12-12 11:13:33 +01: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
Rafael Ameijeiras f9bb893aae Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop' 
implemented custom field

See merge request artica/pandorafms!5271
 2022-12-12 08:20:08 +00:00
jose.gonzalez@pandorafms.com caad626c39 Minor changes 2022-12-10 14:39:17 +01:00
jose.gonzalez@pandorafms.com 5a2e969b85 Module type changes 2022-12-07 18:17:11 +01:00
jose.gonzalez@pandorafms.com e57f9b8794 Some changes 2022-12-05 17:31:08 +01:00
jose.gonzalez@pandorafms.com 912f1d0d7a Module manager upgrade 2022-12-05 13:39:51 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
Calvo 718be360d5 Download wait message 2022-12-02 15:40:47 +01:00
jose.gonzalez@pandorafms.com 4278ffff26 Module editor improvements 2022-12-02 14:25:22 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
jose.gonzalez@pandorafms.com 9d0f465874 Minor improvements 2022-11-24 10:00:42 +01:00
jose.gonzalez@pandorafms.com 6eb9319a7a Minor fixes 2022-11-23 17:42:53 +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
alejandro.campos@artica.es 767624b0c3 implemented link type custom field 2022-11-22 11:50:07 +01:00
jose.gonzalez@pandorafms.com 7dce208df9 Update breadcrumbs for Agents and other minor fixes 2022-11-21 23:45:07 +01:00
Jimmy Olano 0363e94e34 Merge branch 'ent-9466-minimizar-ventana-en-configuracion-de-agente-superpone-iconos' into 'develop' 
Ent 9466 minimizar ventana en configuracion de agente superpone iconos

#9466

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

See merge request artica/pandorafms!5222
 2022-11-21 15:22:38 +00:00
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01:00
alejandro.campos@artica.es c56787c459 visual fix 2022-11-21 09:55:35 +01:00
jose.gonzalez@pandorafms.com 88766eb7cc Fixed action-buttons 2022-11-16 16:04:22 +01:00
jose.gonzalez@pandorafms.com 6e41c4d1bb Agent changes 2022-11-16 12:24:11 +01:00
alejandro.campos@artica.es 5e510e7e12 implemented custom field 2022-11-16 10:28:50 +01:00
jose.gonzalez@pandorafms.com 03157caefe Redo agent edition-creation view 2022-11-15 16:02:40 +01:00
jose.gonzalez@pandorafms.com 325bbea8db Agent view fixed and other minor fixes 2022-11-15 08:05:04 +01:00
jose.gonzalez@pandorafms.com bf678b55dc Several views updated 2022-11-11 16:15:17 +01:00
jose.gonzalez@pandorafms.com 92dd21701f View changes 2022-11-04 13:00:00 +01:00
edu.corral 6a9e30ae6d ent 7914 status scaling 2022-11-02 12:53:14 +01:00
jose.gonzalez@pandorafms.com 195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
edu.corral d76d46c1ab ent 9466 tip icon fix 2022-10-27 13:00:39 +02:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
jose.gonzalez@pandorafms.com 5e4bf4863c Adapted views 2022-10-26 12:02:56 +02:00
alejandro.campos@artica.es 6dbc71713a add enable modules massive option 2022-10-25 15:52:30 +02:00
jose.gonzalez@pandorafms.com 13b0c7d0c8 Fixed views 2022-10-25 13:13:52 +02:00
jose.gonzalez@pandorafms.com 00de0faac3 Adapted views 2022-10-24 19:55:22 +02:00
edu.corral 66a5c8f7eb ent 7914 status scaling based on time 2022-10-24 18:04:04 +02:00
Calvo 183d1ae120 Fix vulnerabilies 2022-10-24 16:44:10 +02:00
jose.gonzalez@pandorafms.com 83de025bc9 Several adaptations 2022-10-21 13:47:41 +02:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +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
Calvo 11df57cd14 Fix planned downtime agent recursion bugs 2022-10-18 19:55:45 +02:00
Calvo 3f8e0f765a Fix adding agnents planned downtime 2022-10-18 09:52:08 +02:00
Jimmy Olano ff4cff6f7a Merge branch 'ent-9208-Codigo-depuracion-expuesto-a-clientes' into 'develop' 
Fix javascript injection in agent names

pandora_enterprise#9208

See merge request artica/pandorafms!5193
 2022-10-17 17:28:39 +00:00
Daniel Rodriguez af9084a4ef Merge branch 'ent-9322-token-unique-ip-da-problemas-a-la-hora-de-modificar-un-agente' into 'develop' 
Fix agent edtion unique ip issues

See merge request artica/pandorafms!5145
 2022-10-14 09:48:05 +00:00
jose.gonzalez@pandorafms.com fc37d9919c Fix javascript injection in agent names 2022-10-13 12:06:04 +02:00
Daniel Maya bf0d7ff687 #4043 added wizard snmp 2022-10-10 13:27:19 +02:00
Calvo b29f7eb160 Fix planned downtime issues 2022-09-30 14:54:16 +02:00
edu.corral b43d548312 ent 9467 warning and critical thresholds 2022-09-28 15:02:11 +02:00
Calvo bf5a5e16dc Fix agent edtion unique ip issues 2022-09-26 12:49:00 +02:00
Diego Muñoz-Reja 158af125e2 Merge branch 'ent-9169-13822-error-al-actualizar-informacion-de-un-agente-cuando-se-llega-al-maximo-de-agentes-de-un' into 'develop' 
Fix edit agent when group limit is reached

See merge request artica/pandorafms!5085
 2022-09-21 11:03:29 +00:00
Calvo 72e2b623b9 Move inventory to open 2022-09-16 11:45:03 +02:00
Calvo da0dad0148 WIP:Move inventory to open 2022-09-14 18:12:39 +02:00
Calvo ae4d320d78 Fix edit agent when group limit is reached 2022-09-07 11:15:07 +02:00
Daniel Barbero da0998e7c7 Merge remote-tracking branch 'origin/develop' into ent-7749-mover-operaciones-masivas-sobre-servicios-a-wizard-de-servicios-en-nodo 
Conflicts:
	pandora_console/godmode/menu.php
 2022-09-06 07:52:19 +02:00
Diego Muñoz-Reja deb7fa54ec Merge branch 'ent-7774-13106-Deshabilitar-modulos-mediante-paradas-planificada' into 'develop' 
implemented disable modules scheduled downtime

See merge request artica/pandorafms!5075
 2022-09-02 12:18:15 +00:00
Diego Muñoz-Reja 75720da969 Merge branch 'ent-9194-Bug-modulos-deshabilitados' into 'develop' 
fixed bug when disabling modules and disabled modules count

See merge request artica/pandorafms!5074
 2022-09-02 11:04:28 +00:00
Diego Muñoz-Reja 5276236c41 Merge branch 'ent-5319-9412-mas-personalizacion-de-paradas-planificada' into 'develop' 
implemented cron based scheduled downtimes

See merge request artica/pandorafms!5061
 2022-09-02 10:32:26 +00:00
alejandro.campos@artica.es a479ab84f7 implemented disable modules scheduled downtime 2022-08-31 16:14:38 +02:00
alejandro.campos@artica.es db88876748 fixed bug when disabling modules and disabled modules count 2022-08-30 14:58:19 +02:00
edu.corral 8c186bae9a ent 8862 visual bug agent manager slider 2022-08-29 13:13:59 +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
alejandro.campos@artica.es 9f28e6f7fb minor fix 2022-08-17 13:31:12 +02:00
alejandro.campos@artica.es ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
alejandro.campos@artica.es e6739e16b8 fixed 500 2022-08-16 11:56:05 +02:00
Jimmy Olano e8f84e6293 Merge branch 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' into 'develop' 
Added switch to agetn conf to avoid automatic Ip update

ref: pandora_enterprise#7683

See merge request artica/pandorafms!5019
 2022-08-11 14:55:40 +00:00
Luis de1977fec1 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-08-10 11:26:05 +00:00
Daniel Maya ea18fda67a #9151 resize multiselect 2022-08-08 12:04:29 +02:00
Calvo ced2a0837c Fix fixed ip switch issues 2022-08-08 10:23:11 +02:00
José González f1979e30c2 Fix URL Typo 2022-08-05 11:03:10 +02:00
Calvo 3ee8f6b431 Added switch to agetn conf to avoid automatic Ip update 2022-07-15 13:40:54 +02:00
Ramon Novoa 48b20b255b Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-09 12:05:24 +02:00
Daniel Rodriguez 336bc74d49 Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop' 
Ent 9021 proteccion en cascada bucle padre hijo

See merge request artica/pandorafms!4921
 2022-06-09 07:34:40 +00:00
Calvo 5297123d17 Console changes for 8950 2022-06-08 13:10:01 +02:00
Daniel Rodriguez a2c1b38a3f Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop' 
fixed permissions in selectors

See merge request artica/pandorafms!4931
 2022-06-08 09:10:51 +00:00
Daniel Rodriguez b2acb41c10 Merge branch 'ent-8632-colocar-recursion-bien-modificar-agente' into 'develop' 
Fix recursion checkbox position

See merge request artica/pandorafms!4840
 2022-06-03 11:45:15 +00:00
alejandro.campos@artica.es 8b57e1dfb4 fixed permissions in selectors 2022-06-01 14:00:33 +02:00
Daniel Maya 79e7753cc8 #9021 Added offspring check 2022-05-30 11:29:17 +02:00
Daniel Maya 38088ca598 #8966 Fixed tags 2022-05-11 16:04:02 +02:00
José González 7c2625fddf Fix recursion checkbox position 2022-04-26 11:47:34 +02:00
Daniel Maya dcdcbfad88 #8786 Fixed delete address 2022-04-04 17:40:51 +02:00
Daniel Rodriguez de75277c8a Merge branch 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' into 'develop' 
Fix missing include

See merge request artica/pandorafms!4741
 2022-03-15 10:47:39 +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
Luis d1709a631c Merge branch 'develop' into 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' 
# Conflicts:
#   pandora_console/godmode/agentes/configurar_agente.php
 2022-03-10 10:55:12 +00:00
Daniel Rodriguez e637c74dbf Merge branch 'ent-8692-Faltan-iconos-de-configuración-del-agente-en-760' into 'develop' 
Ent 8692 faltan iconos de configuración del agente en 760

See merge request artica/pandorafms!4752
 2022-03-09 13:20:12 +00:00
Daniel Maya 29906b3c53 #8692 Fixed remote config 2 2022-03-09 13:55:49 +01: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 Maya 0a7238fe33 #8692 Fixed remote config 2022-03-09 12:06:21 +01: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 a34ba86129 Fix missing include 2022-03-04 15:26:47 +01:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop' 
some tools for policy-auto-application

See merge request artica/pandorafms!4526
 2022-03-01 12:53:36 +00:00
José González 95e8a10fe1 Clean traces 2022-02-25 08:31:14 +01:00
José González 08b393614a Fixed missing char 2022-02-24 14:55:47 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
Daniel Rodriguez 45b97be611 Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop' 
Added token local user to allow enabling local auth  at user level

See merge request artica/pandorafms!4668
 2022-02-18 11:04:06 +00:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +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
Daniel Rodriguez cbee39189f Merge branch 'ent-8559-no-aparece-webserver-module' into 'develop' 
Fixed issue with web_available token

Closes pandora_enterprise#8559

See merge request artica/pandorafms!4686
 2022-02-11 10:51:01 +00:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01: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
Daniel Barbero Martin 625438c1c3 clean file planned_downtime pandora_enterprise#5886 2022-02-09 10:51:18 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
Jose Gonzalez 995095afc7 Fixed issue with web_available token 2022-02-08 11:56:12 +01:00
fbsanchez e9249d550a removed policy stuff from configurar_agente 2022-02-07 18:53:31 +01:00
fbsanchez e1776d7994 removed collation from filtering 2022-02-04 13:26:03 +01:00
Daniel Barbero Martin 1146afe94c bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 13:52:40 +01:00
Daniel Barbero Martin a359fd6828 bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 12:56:36 +01:00
fbsanchez 17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
fbsanchez 5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Calvo 11dc743dac Planned downtime copy. 2022-01-28 10:59:08 +01:00
Calvo 0b119af949 WIP:Planned downtime copy. 2022-01-27 18:24:14 +01:00
Calvo a92fe64b64 WIP:Planned downtime copy. 2022-01-27 18:23:07 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Jose Gonzalez 6fb7f317a6 Fix issues with links 2022-01-17 17:13:29 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Daniel Rodriguez 0f82255904 Merge branch 'ent-8421-extension-antigua-backups' into 'develop' 
Ent 8421 extension antigua backups

Closes pandora_enterprise#8421

See merge request artica/pandorafms!4614
 2022-01-11 10:10:29 +00:00
Daniel Rodriguez eb9d1ff70d Merge branch 'ent-8430-mensaje-erroneo-al-cambiar-thresholds-modulo-snmp' into 'develop' 
Fix wrong error message when changing editing snmp modules

See merge request artica/pandorafms!4612
 2022-01-07 11:59:56 +00:00
Daniel Rodriguez e1a1281985 Merge branch 'ent-8363-edicion-de-paradas-planificadas' into 'develop' 
Fix module edidtion on alerts only planned downtime

See merge request artica/pandorafms!4608
 2022-01-05 12:33:11 +00:00
Jose Gonzalez 1e92ad99ad Fix merge 2022-01-05 11:14:04 +01:00
Calvo 14c860aec6 Fix wrong error message when changing editing snmp modules 2022-01-04 17:50:27 +01:00
Calvo d8ab5c1e7f Fix module edidtion on alerts only planned downtime 2022-01-03 11:42:06 +01:00
Calvo e4804db8cb Planned downtime monthly same day on different hours fix 2021-12-29 18:27:18 +01:00
Jose Gonzalez e9b619f507 Fix issue with output 2021-12-24 12:08:25 +01:00
Daniel Rodriguez 7f78a5b514 Merge branch 'ent-8179-Mensaje-anti-hacking-al-intentar-eliminar-modulos' into 'develop' 
minor fix

See merge request artica/pandorafms!4562
 2021-12-23 12:16:54 +00: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 c773f5abd2 Merge branch 'ent-8321-formularios-modulos-de-tendencias-ticket-7456' into 'develop' 
Ent 8321 formularios modulos de tendencias ticket 7456

See merge request artica/pandorafms!4565
 2021-12-13 16:14:15 +00:00
Calvo 6c94cc5e15 Fix visual bug 2021-12-13 12:00:24 +01:00
Calvo f6c0f50a90 Added missin param and Fixed error message and default interval 2021-12-10 18:00:33 +01:00
Calvo f382a5bf15 Fix trending module bugs 2021-12-03 11:02:11 +01:00
Calvo 7139b9e1b1 Switch prediction module to prediction planning 2021-12-03 10:38:25 +01: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
Calvo 66c4087679 Added module interval control and percentage checkbox 2021-12-02 14:12:19 +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
Calvo a38503491a Wip: trending prediction modules 2021-12-01 11:34:11 +01:00
alejandro.campos@artica.es bca8f6f1c0 minor fix 2021-11-30 14:08:12 +01:00
Calvo 136ad128f9 Added help tip to percentage token 2021-11-30 12:12:24 +01:00
Calvo 7d8a5b029e Changed radio buttons to select on prediction modules 2021-11-29 14:45:19 +01:00
fbsanchez 5197d08aa3 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/install.php
 2021-11-29 09:54:55 +01:00
Calvo 54755db59b Control inverse and percentege cannot be selected at same time 2021-11-26 11:55:38 +01:00
Daniel Rodriguez 137b3b132f Merge branch 'ent-8296-12744-Problemas-Create-a-new-webserver-module' into 'develop' 
Ent 8296 12744 problemas create a new webserver module

See merge request artica/pandorafms!4554
 2021-11-26 10:49:03 +00:00
alejandro.campos@artica.es d94ed13f76 minor fixes 2021-11-25 15:03:46 +01:00
alejandro.campos@artica.es 6469f8053d minor fixes 2021-11-25 15:00:57 +01:00