Commit Graph

29618 Commits

Author SHA1 Message Date
fbsanchez 8cbd45bd0a errata in main cicd (open) 2022-02-02 14:02:32 +01:00
Daniel Barbero Martin f342a218ba fix link pandora_enterprise#8518 2022-02-02 13:51:04 +01:00
fbsanchez 7b9790fa36 mig 6->7 alert_execution_Queue 2022-02-02 13:40:28 +01:00
fbsanchez cea110e209 Alert server improved 2022-02-02 13:37:45 +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
Jose Gonzalez bc6175abad Added audit log in massive operations 2022-02-02 12:45:43 +01:00
fbsanchez 460052b25f code style 2022-02-02 12:32:33 +01:00
fbsanchez 53149712f5 code style 2022-02-02 12:30:02 +01:00
fbsanchez d0ebb10925 exit 1 if installation is not successful 2022-02-02 12:12:41 +01:00
fbsanchez 17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
fbsanchez 5804d2f404 Alerts in slots 2022-02-02 11:29:25 +01:00
fbsanchez 9be6e8d935 exception handling and increased implicit wait (install_console) 2022-02-02 10:48:40 +01:00
Daniel Rodriguez 3e24773efa Merge branch 'ent-8441-12953-Estado-de-mapas-de-red-linkados' into 'develop'
Ent 8441 12953 estado de mapas de red linkados

See merge request artica/pandorafms!4658
2022-02-02 09:39:20 +00:00
Calvo f1dca5e525 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-02 10:38:53 +01:00
Daniel Rodriguez 77289f1775 Merge branch 'ent-8412-Bug-visual-en-item-Group-consolas-visuales' into 'develop'
Ent 8412 bug visual en item group consolas visuales

See merge request artica/pandorafms!4664
2022-02-02 09:38:23 +00:00
fbsanchez 32ffd3a336 some improvements 2022-02-02 10:37:57 +01:00
Daniel Rodriguez 6500358ffe Merge branch 'ent-8258-Conteo-erroneo-de-modulos-not-init-en-metaconsola' into 'develop'
fixed metaconsole count of not init modules

See merge request artica/pandorafms!4648
2022-02-02 09:37:53 +00: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
Calvo 293c1cfb3a Chaged to correct MR 2022-02-02 10:36:54 +01: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 Rodriguez 2ed2fdfd6c Merge branch 'ent-8276-copiado-paradas-planificadas' into 'develop'
Planned downtime copy.

See merge request artica/pandorafms!4662
2022-02-02 09:36:18 +00:00
Calvo fd75b5360f Last value report meta with date before 2022-02-02 10:32:46 +01:00
fbsanchez 934f2087fa dump html if python installation fails 2022-02-02 10:19:24 +01:00
Daniel Barbero Martin 5060d0b8f7 alert template schedule pandora_enterprise#3943 2022-02-02 10:09:31 +01:00
Daniel Barbero Martin b91109d747 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-02 08:06:05 +01:00
artica 1185111e19 Auto-updated build strings. 2022-02-02 01:00:21 +01:00
fbsanchez 8f364c3914 Some errata fix 2022-02-01 21:40:09 +01:00
alejandro.campos@artica.es 2bfd2e2611 minor fix 2022-02-01 17:13:13 +01:00
Daniel Barbero Martin b62566af49 alert template schedule pandora_enterprise#3943 2022-02-01 16:50:53 +01:00
fbsanchez 5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/pandoradb.sql
2022-02-01 15:16:21 +01:00
fbsanchez ead8b39146 some updates 2022-02-01 15:11:59 +01:00
Daniel Rodriguez 91797c7112 Merge branch 'ent-8470-POST-ocultar-comando-en-respuestas-de-eventos-2' into 'develop'
added token to display or hide command in event response execution

See merge request artica/pandorafms!4671
2022-02-01 13:42:14 +00:00
alejandro.campos@artica.es 74c2dafed0 added token to display or hide command in event response execution 2022-02-01 14:30:25 +01:00
Jose Gonzalez 615672629c Relocate constants 2022-02-01 14:01:38 +01:00
Luis f10f66edab Update functions_planned_downtimes.php 2022-02-01 12:53:57 +00:00
fbsanchez b15feab154 MySQL8 review for pandoradb.sql 2022-02-01 13:49:32 +01:00
José González 36bef528ab Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
# Conflicts:
#   pandora_console/godmode/massive/massive_delete_agents.php
2022-02-01 12:45:17 +00:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Daniel Barbero Martin a7da2faa32 alert template schedule pandora_enterprise#3943 2022-02-01 13:16:11 +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 Barbero Martin 645257f9dc alert template schedule pandora_enterprise#3943 2022-02-01 11:29:25 +01:00
Daniel Maya f4c92c4854 #7430 Fixed url 2022-02-01 11:17:20 +01:00
Daniel Rodriguez 4ba18dc52b Merge branch 'ent-8119-Llamada-a-la-API-nodo-centralizado' into 'develop'
implemented api method

See merge request artica/pandorafms!4659
2022-02-01 09:42:42 +00: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 Rodriguez 8c01afafdb Merge branch 'ent-8170-busqueda-de-tree-view-metaconsola-se-descuadra-con-baja-resolucion' into 'develop'
Fix tree view filter view on meta

See merge request artica/pandorafms!4649
2022-02-01 09:36:20 +00:00
Daniel Rodriguez 0e6e7b051d Merge branch 'ent-8502-12981-Cálculo-SLA-datos-string-parte-3' into 'develop'
Ent 8502 12981 cálculo sla datos string parte 3

See merge request artica/pandorafms!4661
2022-02-01 09:35:42 +00:00
Daniel Rodriguez 75f8c02eaf Merge branch 'ent-3763-Nuevas-macros-alertas' into 'develop'
add new macros #3763

See merge request artica/pandorafms!4640
2022-02-01 09:34:15 +00:00