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

4423 Commits

Author SHA1 Message Date
Daniel Barbero Martin 4f46da6633 Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-18 10:17:19 +01:00
Daniel Maya 5ae7afccfc Fixed pandora_black in metaconsole 2 2022-01-17 11:32:51 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Calvo 8c86dbbc50 Fix meta alerts list action filter 2022-01-17 09:17:39 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
fbsanchez c3639a22fb vc php8 2022-01-11 14:36:05 +01:00
Daniel Rodriguez 7d51176641 Merge branch 'ent-7076-11432-Forzar-chequeos-remotos-en-Consolas-Visuales' into 'develop' 
Ent 7076 11432 forzar chequeos remotos en consolas visuales

See merge request artica/pandorafms!4598
 2022-01-11 10:09:35 +00:00
Jose Gonzalez f072585d5a Clean undefined messages for tree view 2022-01-07 10:39:03 +01:00
Daniel Rodriguez 6ff9c43f34 Merge branch 'ent-8085-cambio-de-skin-muestra-error' into 'develop' 
Fix error message when update skin

See merge request artica/pandorafms!4609
 2022-01-05 12:34:25 +00:00
Daniel Rodriguez 1612b5d063 Merge branch 'ent-7903-colores-distintos-en-estado-not-init-agentes-modulos-vista-tactical-view' into 'develop' 
Fix not init color

See merge request artica/pandorafms!4604
 2022-01-04 11:47:46 +00:00
Calvo 1d860420b8 Fix error message when update skin 2022-01-03 16:10:36 +01:00
Daniel Rodriguez be95c001ca Merge branch 'ent-8229-aparece-icono-de-politicas-en-buscador-general-open' into 'develop' 
Removed policies search in open gerneral search

See merge request artica/pandorafms!4603
 2021-12-28 13:31:25 +00:00
Daniel Rodriguez 10e282b76b Merge branch 'ent-8108-Error-en-la-vista-de-eventos-de-un-agente-concreto' into 'develop' 
fixed filter loaded from event graph on agent view

See merge request artica/pandorafms!4564
 2021-12-28 12:02:56 +00:00
Calvo f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
Calvo daf0b4e6e9 Fix alert view with default actions node and meta 2021-12-27 19:01:53 +01:00
Daniel Rodriguez 0ed9406796 Merge branch 'ent-8171-Filtro-Server-type-limitado-en-vista-Monitores-metaconsola' into 'develop' 
Ent 8171 filtro server type limitado en vista monitores metaconsola

See merge request artica/pandorafms!4574
 2021-12-27 17:09:29 +00:00
Daniel Rodriguez eb3d36489c Merge branch 'ent-8270-Fallos-al-borrar-relaciones-en-mapas-de-red' into 'develop' 
Ent 8270 fallos al borrar relaciones en mapas de red

See merge request artica/pandorafms!4566
 2021-12-27 16:17:09 +00:00
Daniel Rodriguez e0a925c2c1 Merge branch 'ent-8384-error-sql-ordenar-agent-id' into 'develop' 
Added php8 function and solve issue with agent id sorting in events

Closes pandora_enterprise#8384

See merge request artica/pandorafms!4592
 2021-12-23 12:19:24 +00:00
Daniel Rodriguez 7c09ce1a6d Merge branch 'ent-8295-Meter-spinner-en-visualizador-de-graficas-combinadas' into 'develop' 
Ent 8295 meter spinner en visualizador de graficas combinadas

See merge request artica/pandorafms!4563
 2021-12-23 12:13:05 +00:00
Daniel Maya 7767e9aae2 #8295 Fixed data 2021-12-21 15:22:22 +01:00
Daniel Maya db72cba1d2 #7076 Added force remote check 2021-12-21 09:33:55 +01:00
Jose Gonzalez 37675e0fce Added php8 function and solve issue with agent id sorting in events 2021-12-16 16:35:31 +01:00
Daniel Barbero Martin f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +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 Maya 57cd3d7309 #8171 Fixed server type in metaconsole 2021-12-07 16:21:20 +01:00
Daniel Maya fb80350f99 #8270 Fixed delete links 2021-12-02 13:46:29 +01: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
Daniel Maya ae0e4e2826 #8295 Added ajax call and spinner 2 2021-12-02 08:52:33 +01:00
Daniel Barbero Martin a02c8a7988 wip reports alert actions 2021-12-01 15:15:45 +01:00
alejandro.campos@artica.es da22381044 fixed filter loaded from event graph on agent view 2021-12-01 11:13:28 +01:00
Daniel Maya cacaaa89ae #8295 Added ajax call and spinner 2021-11-30 15:56:40 +01:00
Daniel Barbero Martin 40d801a947 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:16:19 +01:00
Daniel Rodriguez 75699cb8fc Merge branch 'ent-7844-revision-acl-enterprise-parte-3-fallos-actuales' into 'develop' 
Ent 7844 revision acl enterprise parte 3 fallos actuales

See merge request artica/pandorafms!4356
 2021-11-29 11:36:52 +00: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
Calvo 4eccc2b612 Removed policies search in open gerneral search 2021-11-29 11:36:13 +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
Daniel Barbero Martin 960c2de6c3 wip reports alert actions 2021-11-26 14:06:10 +01:00
Daniel Barbero Martin cb0039d7a7 wip reports alert actions 2021-11-26 13:52:15 +01:00
Daniel Rodriguez fff8f910f8 Merge branch 'ent-8015-palabras-conflictivas' into 'develop' 
Removed some cheerful words in the project

Closes pandora_enterprise#8015

See merge request artica/pandorafms!4460
 2021-11-24 17:18:38 +00:00
Daniel Rodriguez eb4666e2c2 Merge branch 'ent-8294-Graficos-de-area-se-ven-como-graficos-de-linea' into 'develop' 
fix chart area

See merge request artica/pandorafms!4546
 2021-11-24 14:45:39 +00:00
Calvo d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00
Daniel Rodriguez 8ed3042f9a Merge branch 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' into 'develop' 
added resolution field in creation and update operations

See merge request artica/pandorafms!4534
 2021-11-24 11:20:18 +00:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-23 14:29:23 +01:00
Daniel Barbero Martin aae0016191 fix chart area 2021-11-23 13:14:56 +01:00
Jose Gonzalez 98f519958c Fix merge 2021-11-23 12:25:58 +01:00
Daniel Rodriguez 688ec5f7f9 Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop' 
Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu

See merge request artica/pandorafms!4505
 2021-11-22 15:54:05 +00:00
Daniel Rodriguez 60f051dca3 Merge branch 'ent-8143-Buscador-general-Errores-en-resultados-mostrados' into 'develop' 
fixed general search

See merge request artica/pandorafms!4520
 2021-11-22 15:50:25 +00:00
Daniel Maya c3295b8fd2 #8191 Fixed filter 2021-11-19 11:38:11 +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
Alejandro Campos fd01375efe Merge branch 'develop' into 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' 
# Conflicts:
#   pandora_console/operation/incidents/configure_integriaims_incident.php
 2021-11-17 09:48:16 +00:00
alejandro.campos@artica.es a842381754 minor change 2021-11-17 10:32:04 +01:00
alejandro.campos@artica.es 3f0fd30eb8 added resolution field in creation and update operations 2021-11-16 14:13:45 +01:00
Daniel Rodriguez 3e5b34325b Merge branch 'ent-8169-No-funciona-recursión-de-grupos-en-vista-de-Monitores-de-Metaconsola' into 'develop' 
Ent 8169 no funciona recursión de grupos en vista de monitores de metaconsola

See merge request artica/pandorafms!4513
 2021-11-16 09:12:40 +00:00
Calvo 9d3c691ad1 Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-15 18:33:35 +01:00
Daniel Maya efd8c8cab2 #8040 resolved conflict 2021-11-15 13:20:43 +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 eb9e73ecb0 Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop' 
Deleted and reubicated acl options

See merge request artica/pandorafms!4340
 2021-11-15 11:24:50 +00:00
Daniel Rodriguez eb39636c16 Merge branch 'ent-4710-Posibilidad-de-anadir-archivos-adjuntos-en-creacion-de-ticket-en-integracion-con-Integria' into 'develop' 
Ent 4710 posibilidad de anadir archivos adjuntos en creacion de ticket en integracion con integria

See merge request artica/pandorafms!4483
 2021-11-15 11:23:34 +00:00
Daniel Rodriguez e16a398c1a Merge branch 'ent-7900-trazas-en-estado-agente-y-pandora-alert' into 'develop' 
Deleted js traces

See merge request artica/pandorafms!4354
 2021-11-15 11:13:50 +00:00
Daniel Rodriguez 650607067e Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop' 
Include modules not init in total monitors count on tactical view

See merge request artica/pandorafms!4309
 2021-11-15 11:00:07 +00:00
Daniel Rodriguez b36318c450 Merge branch 'ent-7959-problemas-visualizacion-alertas-sonoras' into 'develop' 
Fixed visual issues and handle browser zoom

Closes pandora_enterprise#7959

See merge request artica/pandorafms!4484
 2021-11-15 10:12:37 +00:00
Daniel Rodriguez ddb156564d Merge branch 'ent-7962-bug-visual-monitor-detail' into 'develop' 
Fixed tip position and code style

Closes pandora_enterprise#7962

See merge request artica/pandorafms!4488
 2021-11-15 10:10:53 +00:00
Daniel Rodriguez 6b68203811 Merge branch 'ent-4711-Posibilidad-de-ordenar-tickets-en-integracion-con-Integria' into 'develop' 
add sorting capability to integriaims ticket list

See merge request artica/pandorafms!4474
 2021-11-15 10:04:01 +00:00
alejandro.campos@artica.es 406a8b702b visual fixes 2021-11-12 13:30:33 +01:00
alejandro.campos@artica.es 546fcaa28f fixed general search 2021-11-04 18:07:39 +01: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 Rodriguez 56ae68a034 Merge branch 'ent-7951-Bloqueo-auto-creacion-usuarios-desde-nodo-en-entornos-centralizado' into 'develop' 
Ent 7951 bloqueo auto creacion usuarios desde nodo en entornos centralizado

See merge request artica/pandorafms!4487
 2021-11-03 09:34:49 +00:00
Daniel Maya 031e0a2cd7 #8169 Fixed group recursion with standar user 2021-11-02 11:08:15 +01:00
Calvo 1e51197afb Fix menu favourite GIS maps. services and dashboards large title 2021-10-27 19:39:18 +02:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +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
Jose Gonzalez 070c920e0e Fixed tip position and code style 2021-10-20 13:01:13 +02:00
alejandro.campos@artica.es e7d730ba0d fix bug with ldap login in metaconsole 2021-10-19 19:19:55 +02:00
Jose Gonzalez b61e7c6c58 Fixed visual with browsers with more zoom 2021-10-19 17:04:39 +02:00
Jose Gonzalez 9699b368ef Fixed visual issues and handle browser zoom 2021-10-19 16:56:54 +02:00
alejandro.campos@artica.es 0b033dae74 add capability to upload files in ticket creation and update on Integria integration system 2021-10-19 15:32:22 +02:00
Calvo 7daf138ef5 Fix recursion and filter on modules massive operations 2021-10-18 15:47:22 +02:00
alejandro.campos@artica.es 8db66c7e0e add sorting capability to integriaims ticket list 2021-10-18 11:45:48 +02:00
Daniel Rodriguez 92740cd86b Merge branch 'ent-8096-arreglos-black-theme' into 'develop' 
fixed visual black theme error

See merge request artica/pandorafms!4457
 2021-10-14 09:59:16 +00:00
fbsanchez 8652648824 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-08 15:51:05 +02:00
Jose Gonzalez 4331438765 Removed some cheerful words in the project 2021-10-08 11:13:28 +02:00
Daniel Rodriguez 16f2c776f2 Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop' 
show only events filter in acl groups

See merge request artica/pandorafms!4451
 2021-10-08 08:09:19 +00:00
marcos 85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
marcos 795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
marcos f42e57efbe show only events filter in acl groups 2021-10-06 17:11:45 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez 3ab921acbb Merge branch 'ent-7950-errores-en-log-viewer' into 'develop' 
Ent 7950 errores en log viewer

See merge request artica/pandorafms!4383
 2021-10-05 09:29:24 +00:00
Daniel Rodriguez a794f30141 Merge branch 'ent-8060-bug-modal-networkmaps' into 'develop' 
Fixed issue with node actions

Closes pandora_enterprise#8060

See merge request artica/pandorafms!4438
 2021-10-05 09:19:26 +00:00
Daniel Rodriguez d0e738e8fb Merge branch 'ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola' into 'develop' 
Ent 7937 mensaje this node is configured with centralized mode de nodo sale en metaconsola

See merge request artica/pandorafms!4409
 2021-10-05 09:18:41 +00:00
fbsanchez 31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop' 
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
 2021-10-01 12:48:09 +00:00
Jose Gonzalez 5eb66e5c6e Fixed issue with node actions 2021-10-01 14:05:41 +02:00
fbsanchez d322d23203 WIP NCM 2021-09-30 19:10:45 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez 8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola 
Conflicts:
	pandora_console/install.php
 2021-09-29 13:47:10 +02:00
Daniel Rodriguez 9beda8eada Merge branch 'ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo' into 'develop' 
Added checkbox for group recursion in network maps

See merge request artica/pandorafms!4297
 2021-09-28 10:18:19 +00:00
Luis 849ce30da5 Update pandora_networkmap.view.php 2021-09-28 08:50:00 +00:00