1452 Commits

Author SHA1 Message Date
Jose Gonzalez
98f519958c Fix merge 2021-11-23 12:25:58 +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
Daniel Rodriguez
3c71ecfec2 Merge branch 'ent-8069-command-center-anadir-una-notificacion-si-la-cola-de-tareas-de-los-nodos-tiene-un-fallo-o-es' into 'develop'
Notifications if syncqueue exceeds limits in MC

See merge request artica/pandorafms!4515
2021-11-18 12:09:06 +00:00
Daniel Rodriguez
908bc22b33 Merge branch 'ent-8052-vista-de-datos-de-modulos-en-agente-tree-view-services-metaconsola' into 'develop'
Fix metaconsole services tree view agent module data popup

See merge request artica/pandorafms!4473
2021-11-17 15:15:13 +00:00
Daniel Rodriguez
9ba2169de3 Merge branch 'ent-8239-12653-GUARDIA-No-devuelve-valor-SNMP-Interface-wizard-cuando-se-ejecuta-a-traves-de-pandora-exec-proxy-satelite' into 'develop'
Ent 8239 12653 guardia no devuelve valor snmp interface wizard cuando se ejecuta a traves de pandora exec proxy satelite

See merge request artica/pandorafms!4530
2021-11-17 10:20:43 +00:00
Daniel Rodriguez
5264f39065 Merge branch 'ent-7912-12337-Fallo-filtrado-Tree-view-widget-en-Dashboards' into 'develop'
Ent 7912 12337 fallo filtrado tree view widget en dashboards

See merge request artica/pandorafms!4503
2021-11-16 13:15:47 +00:00
Daniel Rodriguez
f2b9d1fbd2 Merge branch 'ent-8134-Tree-View-Tags-Falla-la-búsqueda-por-módulos' into 'develop'
Ent 8134 tree view tags falla la búsqueda por módulos

See merge request artica/pandorafms!4500
2021-11-16 09:14:02 +00:00
Daniel Rodriguez
cd2f3b8a54 Merge branch 'ent-8098-Bug-en-filtro-de-Agents/Alerts' into 'develop'
Ent 8098 bug en filtro de agents/alerts

See merge request artica/pandorafms!4470
2021-11-15 11:18:27 +00:00
Daniel Rodriguez
34a8633aae Merge branch 'ent-7905-bug-visual-agents-alerts-black-theme' into 'develop'
Fixed issue with OK label

Closes pandora_enterprise#7905

See merge request artica/pandorafms!4480
2021-11-15 10:09:39 +00:00
alejandro.campos@artica.es
e3ba62b6b6 remove quotes from strings 2021-11-12 10:16:18 +01:00
alejandro.campos@artica.es
293cb43544 fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:32:48 +01:00
alejandro.campos@artica.es
49d9271b4e fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:25:44 +01:00
alejandro.campos@artica.es
6b724b7747 fixed missing name and current value in snmp interface wizard when using satellite 2021-11-11 15:20:21 +01:00
Daniel Barbero Martin
2d4c949113 add metaconsole calendars special days alerts 2021-11-08 13:07:31 +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 Barbero Martin
cd163a96ef wip special days alerts 2021-11-04 13:07:17 +01:00
Daniel Barbero Martin
c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin
f521dec4e2 wip special days alerts 2021-11-04 10:10:11 +01:00
Daniel Barbero Martin
bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin
fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
Daniel Barbero Martin
1e976a8605 alerts special days wip 2021-11-03 10:59:00 +01:00
Daniel Barbero Martin
25268ec9b4 color 2021-11-02 17:49:45 +01:00
fbsanchez
3a74a6ea42 custom val 2021-11-02 13:59:17 +01:00
fbsanchez
4f2bca1df4 Added sync status notifications 2021-11-02 13:51:30 +01:00
fbsanchez
976e881cb9 Message update notif.syncqueue.length 2021-11-02 12:48:48 +01:00
fbsanchez
7f35845944 Notifications if syncqueue exceeds limits in MC 2021-11-02 12:47:36 +01:00
Daniel Maya
2de38a915b #7912 Hidden agents without modules 2021-10-26 15:36:12 +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
Daniel Maya
030938c78e #8134 Fixed search module 2021-10-25 15:40:43 +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
Jose Gonzalez
dc3e690502 Fixed issue with OK label 2021-10-18 17:24:41 +02:00
Daniel Rodriguez
aa2eb08edb Merge branch 'ent-fix-snmp-interfaces-wizard' into 'develop'
Fixed SNMP interfaces wizard against 32bit counter devices.

See merge request artica/pandorafms!4348
2021-10-18 08:33:17 +00:00
Calvo
bd46cb7abc Fix metaconsole services tree view agent module data popup 2021-10-18 10:26:47 +02:00
Daniel Maya
a300ca5786 #8098 Fixed pagination 2021-10-14 11:33:06 +02:00
Jose Gonzalez
aafa979b4a Fixed name 2021-10-08 12:37:09 +02:00
Jose Gonzalez
2c22e53e9d Fixed Diagnostics 2021-10-07 14:20:59 +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
ce656997a5 Merge branch 'ent-8078-Los-tokens-de-selector-general-del-wizard-SNMP-no-funcionan' into 'develop'
fix block selector in snmp wizards

See merge request artica/pandorafms!4443
2021-10-06 12:28:40 +00:00
alejandro.campos@artica.es
4016d97c39 fix block selector in snmp wizards 2021-10-05 16:51:13 +02:00
Daniel Rodriguez
1595b99e09 Merge branch 'ent-7748-fallo-visual-en-snmp-interfaces-wizard' into 'develop'
fallo critico del swich regordete

See merge request artica/pandorafms!4288
2021-10-05 09:24:51 +00:00
fbsanchez
9dff230b65 Allow enable or disable cache in Entity and some minor fixes 2021-09-30 12:23:37 +02:00
Jose Gonzalez
8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Jose Gonzalez
0a0d055252 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-29 14:21:23 +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
Jose Gonzalez
1a884a9df6 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-28 11:33:48 +02:00
Calvo
46136a66ca Merge remote-tracking branch 'origin/develop' into ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo 2021-09-27 10:40:50 +02:00
Daniel Rodriguez
49961ed261 Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop'
Ent 6296 10650 añadir widget de lista de servicios

See merge request artica/pandorafms!4355
2021-09-24 09:09:28 +00:00
Jose Gonzalez
de1bf03976 Clean logs 2021-09-23 17:19:47 +02:00
Jose Gonzalez
7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00