Commit Graph

16006 Commits

Author SHA1 Message Date
Daniel Barbero Martin 07ed6689d6 external alerts new filters pandora_enterprise#7933 2022-02-08 13:56:19 +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
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
Daniel Rodriguez f659016c6f Merge branch 'ent-3943-Plantillas-de-alerta-con-varios-horarios' into 'develop'
WIP #3943

Closes pandora_enterprise#3943

See merge request artica/pandorafms!4595
2022-02-08 11:29:34 +00:00
Luis 4eade30e48 Merge remote-tracking branch 'origin/develop' into ent-8552-fallo-subida-pspz-y-pspz2 2022-02-08 10:03:31 +01:00
Luis 611cac2340 Fix plugin registration pspz pspz2 2022-02-08 10:01:17 +01:00
Daniel Barbero Martin ba6d6f9107 calendar not editable pandora_enterprise#3943 2022-02-08 09:38:42 +01:00
artica b47003a7b4 Auto-updated build strings. 2022-02-08 01:00:17 +01:00
fbsanchez 3f52679969 removed policy stuff from api update_agent_field 2022-02-07 18:56:58 +01:00
fbsanchez d6b6357e98 removed policy stuff from api update_agent 2022-02-07 18:54:24 +01:00
Daniel Rodriguez 3fbbaf031c Merge branch 'ent-8273-modificar-item-last-value-en-reports' into 'develop'
Report item last value shows last value on selected interval

See merge request artica/pandorafms!4660
2022-02-07 17:22:11 +00:00
Jose Gonzalez 351b8fcb97 Fix 2022-02-07 16:44:21 +01:00
fbsanchez 838b6b30e9 php8 compatibility review 2022-02-07 14:32:59 +01:00
fbsanchez 849ab9820e php72 fallback compat 2022-02-07 13:58:42 +01:00
fbsanchez 331f8e8906 php8 incompatibility fixes 2022-02-07 13:48:25 +01:00
fbsanchez 412104300c php8 incompatibility fixes 2022-02-07 13:38:45 +01:00
fbsanchez aa2b08f516 php8 incompatibility fixes 2022-02-07 13:35:00 +01:00
Daniel Barbero Martin 0e0e737283 calendar not editable pandora_enterprise#3943 2022-02-07 13:07:48 +01:00
Daniel Maya 816bbf4d00 #8435 Added jquery mobile 1.5 2022-02-07 12:29:57 +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 4dbd7731c6 Merge remote-tracking branch 'origin/develop' into ent-7063-Informes-de-servicio-en-Meta 2022-02-07 08:03:12 +01:00
artica 11dc01c0c8 Auto-updated build strings. 2022-02-07 01:00:13 +01:00
artica c092748d0a Auto-updated build strings. 2022-02-06 01:00:16 +01:00
artica 2fc9625741 Auto-updated build strings. 2022-02-05 01:00:21 +01:00
fbsanchez e88152f596 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-04 13:53:48 +01:00
Daniel Barbero Martin d47190c234 report SLA services to metaconsole pandora_enterprise#7063 2022-02-04 13:44:20 +01:00
Jose Gonzalez 2d715827d2 Improve doc 2022-02-04 13:18:34 +01:00
Jose Gonzalez 46b115dc3c Audit log improved in Config 2022-02-04 13:13:42 +01:00
Daniel Barbero Martin 6f15d26af2 minor fix pandora_enterprise#3943 2022-02-04 09:48:10 +01:00
artica 887162322c Auto-updated build strings. 2022-02-04 01:00:21 +01:00
fbsanchez a298b25a38 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-03 17:55:34 +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 Rodriguez 1ba89e521e Merge branch 'ent-7301-mejora-informacion-console-task' into 'develop'
Ent 7301 mejora informacion console task

Closes pandora_enterprise#7301

See merge request artica/pandorafms!4667
2022-02-03 12:40:05 +00:00
Daniel Barbero Martin a359fd6828 bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 12:56:36 +01:00
Jose Gonzalez 2f356541ea Fixed alert management log 2022-02-03 12:54:50 +01:00
Daniel Rodriguez 3ef5c57c9e Merge branch 'ent-8501-Error-Metaconsola-y-consolas-visuales' into 'develop'
minor fix

See merge request artica/pandorafms!4672
2022-02-03 10:19:45 +00:00
artica 7d405d8ded Auto-updated build strings. 2022-02-03 01:00:20 +01:00
Calvo 7fc62b4a2c Fix last value meta and status bug 2022-02-02 18:11:53 +01:00
Daniel Barbero Martin ee6ccb0757 translates pandora_enterprise#8516 2022-02-02 16:26:15 +01:00
Jose Gonzalez a438f2b1d3 Improved information console task 2022-02-02 15:04:07 +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 17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +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
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
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
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
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
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
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 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 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 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 7aab1fe052 Merge branch 'ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola' into 'develop'
bulk operations agents in meta #8290

See merge request artica/pandorafms!4645
2022-02-01 09:32:34 +00:00
fbsanchez 92a33bd6f0 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-01 09:44:57 +01:00
Calvo 34a9c2f1f2 Added token local user to allow enabling local auth at user level 2022-02-01 09:37:02 +01:00
Daniel Barbero Martin 5eb719ecaa Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-01 07:59:52 +01:00
artica 9e12abcfc6 Auto-updated build strings. 2022-02-01 01:00:17 +01:00
Calvo 83d490df5d Last value report meta with date before 2022-01-31 19:27:27 +01: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 9ad6b8abaa Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-01-31 08:05:42 +01:00
artica 73b754f52d Auto-updated build strings. 2022-01-31 01:00:10 +01:00
artica 8001f6b1f2 Auto-updated build strings. 2022-01-30 01:00:15 +01:00
artica 6ffef13b9a Auto-updated build strings. 2022-01-29 01:00:20 +01:00
Daniel Barbero Martin 392a9223e8 alert template schedule pandora_enterprise#3943 2022-01-28 14:06:31 +01:00
Daniel Maya cc7efec98a #8412 Fixed item group 2022-01-28 13:58:57 +01:00
fbsanchez afd0d58a7e Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-01-28 13:38:57 +01:00
Calvo 11dc743dac Planned downtime copy. 2022-01-28 10:59:08 +01:00
Daniel Barbero Martin 2e5f778703 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-01-28 07:58:58 +01:00
artica b23f101812 Auto-updated build strings. 2022-01-28 01:00:20 +01:00
fbsanchez 61605f6168 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-01-27 23:19:33 +01:00
fbsanchez e157b1102f Pandora WebSockets fix 2022-01-27 23:18:12 +01:00
Calvo a92fe64b64 WIP:Planned downtime copy. 2022-01-27 18:23:07 +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 Maya 152b19d937 Fixed inversal interval with string module 2022-01-27 16:58:29 +01:00
Calvo 615304712f Report item last value shows last value on selected interval 2022-01-27 14:05:36 +01:00
alejandro.campos@artica.es 4cf312f88e implemented api method 2022-01-27 13:23:12 +01:00
Daniel Maya 561589423d Fixed color of fictional node 2022-01-27 12:55:42 +01:00
Daniel Barbero Martin b8a3dccc8d Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-01-27 08:09:14 +01:00
Daniel Barbero Martin c597ca3629 Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-27 08:08:43 +01:00
artica 4da16bedf8 Auto-updated build strings. 2022-01-27 01:00:23 +01:00
fbsanchez b0824e048e some changes 2022-01-26 18:40:45 +01:00
fbsanchez 81b1454b2e minor fixes 2022-01-26 17:34:56 +01:00
Daniel Barbero Martin 89931ef564 alert template schedule #3943 2022-01-26 16:52:48 +01:00
fbsanchez e263d9a0c5 patterns for text inputs 2022-01-26 12:52:36 +01:00
Daniel Barbero Martin d76745cc9f chrome never autocomplete 2022-01-26 12:17:07 +01:00
Calvo 5b624fc388 Added searchbar to select multiple modules on custom graph 2022-01-26 11:52:49 +01:00
fbsanchez 9c09f43ad8 fix in recon definition 2022-01-26 11:48:07 +01:00
Daniel Barbero Martin 7b956d3ca1 select 2 never autocomplete 2022-01-26 09:14:19 +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
Daniel Barbero Martin 1a6127624e alert template schedule 2022-01-26 08:07:00 +01:00
artica 11e0c99e74 Auto-updated build strings. 2022-01-26 01:00:23 +01:00
Calvo f383586dcc WIP:Added searchbar to select multiple modules 2022-01-25 20:15:40 +01:00
Calvo 96d0194009 Merge remote-tracking branch 'origin/develop' into ent-8206-busqueda-de-modulos-en-graficas-personalizadas 2022-01-25 15:39:58 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
vgilc a32fe84ca0 Merge branch 'ent-8454-Error-SQL-en-bulk-operations-en-copia-de-modulos' into 'develop'
fixed bulk copy of modules with percent character

See merge request artica/pandorafms!4639
2022-01-25 10:41:43 +00:00
vgilc 6edc6c6d40 Merge branch 'ent-8437-SQL-Injection-en-API' into 'develop'
sanitize sql inputs

See merge request artica/pandorafms!4629
2022-01-25 10:30:01 +00:00
vgilc f2d0ecc304 Merge branch 'ent-7485-12717-incluir-botones-de-generacion-de-informe-en-vista-html' into 'develop'
Added combo with all export formats to report html view

See merge request artica/pandorafms!4638
2022-01-25 10:29:00 +00: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 b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop'
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
2022-01-25 10:27:25 +00:00
vgilc 6c2ada3948 Merge branch 'ent-8202-consolas-visuales-hbars' into 'develop'
Clean magic number and define dynamic width

Closes pandora_enterprise#8202

See merge request artica/pandorafms!4630
2022-01-25 10:26:14 +00:00
vgilc fa0e3c4abb Merge branch 'ent-8208-bug-filtros-en-vista-de-alertas' into 'develop'
Fix monitoring alert detail filter for defautl actions

See merge request artica/pandorafms!4558
2022-01-25 10:24:42 +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
alejandro.campos@artica.es e461bb955b fixed metaconsole count of not init modules 2022-01-25 10:30:04 +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
vgilc 26ef59d3b6 Merge branch 'ent-8426-Bug-al-editar-relación-en-mapa-de-red' into 'develop'
Ent 8426 bug al editar relación en mapa de red

See merge request artica/pandorafms!4636
2022-01-25 09:26:53 +00:00
vgilc d43b046253 Merge branch 'ent-8433-12934-Bug-en-filtro-de-eventos-con-mas-de-1-tag' into 'develop'
fixed event view filter

See merge request artica/pandorafms!4635
2022-01-25 09:25:47 +00:00
vgilc bf5e2096f8 Merge branch 'ent-8453-12981-Cálculo-de-SLA-en-módulo-con-dato-tipo-string' into 'develop'
Ent 8453 12981 cálculo de sla en módulo con dato tipo string

See merge request artica/pandorafms!4642
2022-01-25 09:22:19 +00:00
Daniel Barbero Martin f19a823622 Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-25 08:05:00 +01:00
artica bdae223944 Auto-updated build strings. 2022-01-25 01:00:20 +01:00
Daniel Barbero Martin 83970932ce bulk operations agents in meta #8290 2022-01-24 16:57:42 +01:00
Daniel Barbero Martin 2fccdd12cb bulk operations agents in meta #8290 2022-01-24 12:19:09 +01:00
artica cc7b87344b Auto-updated build strings. 2022-01-24 01:00:16 +01:00
artica 0ca0123a27 Auto-updated build strings. 2022-01-23 01:00:17 +01:00
artica 4781c7f680 Auto-updated build strings. 2022-01-22 01:00:22 +01:00
fbsanchez 35184c4eb6 ws php8 2022-01-21 17:39:11 +01:00
Calvo 328a9db1fb Added select filtered modulo to custom graphs conf menu 2022-01-21 12:56:14 +01:00
Daniel Barbero Martin 7c2000c34d bulk operations agents in meta #8290 2022-01-21 11:49:30 +01:00
Daniel Barbero Martin 4e7afa7d0b Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-21 08:10:48 +01:00
artica 480d475a75 Auto-updated build strings. 2022-01-21 01:00:20 +01:00
Daniel Barbero Martin 87bfd08bb9 bulk operations agents in meta #8290 2022-01-20 16:52:14 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
artica 42d1ccbc13 Auto-updated build strings. 2022-01-20 01:00:18 +01:00
fbsanchez 28743dcb5d sizeof => count 2022-01-19 12:40:52 +01:00
Daniel Barbero Martin 6be6b1a95d add new macros #3763 2022-01-19 12:18:23 +01:00
Daniel Maya b01061fea1 Fixed module type 2022-01-19 11:48:20 +01:00
Daniel Barbero Martin a86ddc043f Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma 2022-01-19 09:56:50 +01:00
artica a8150e3cb5 Auto-updated build strings. 2022-01-19 01:00:19 +01:00
alejandro.campos@artica.es 5d59e1da3f fixed bulk copy of modules with percent character 2022-01-18 15:03:44 +01:00
Calvo c16499720e Added combo with all export formats to report html view 2022-01-18 14:54:10 +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
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
alejandro.campos@artica.es a751fd7077 fixed event view filter 2022-01-18 09:07:49 +01:00
artica 49bf10f0f8 Auto-updated build strings. 2022-01-18 01:00:39 +01:00
Jose Gonzalez 7a88e2db29 WIP: Testing Wordpress with prewebs 2022-01-17 17:15:37 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
artica 98660cd0e3 Auto-updated build strings. 2022-01-17 01:00:26 +01:00
artica 84c4b52d57 Auto-updated build strings. 2022-01-16 01:00:16 +01:00
artica e8b594a03b Auto-updated build strings. 2022-01-15 01:00:18 +01:00
Jose Gonzalez 0f549ce813 Fix issues with grid and background color 2022-01-14 13:56:08 +01:00
Daniel Maya 626431f27c Added check on agents without acl 2022-01-14 09:49:26 +01:00
artica 55f8f09894 Auto-updated build strings. 2022-01-14 01:00:19 +01:00
Jose Gonzalez b34b89f514 Clean magic number and define dynamic width 2022-01-13 17:45:16 +01:00
fbsanchez 2aad6404a2 php8 with php72 support 2022-01-13 13:48:25 +01:00
Daniel Rodriguez c6e2e45260 Merge branch 'ent-8369-10666-GUARDIA-Problemas-cluster-consola' into 'develop'
fixed problems in clusters

See merge request artica/pandorafms!4583
2022-01-13 12:42:50 +00:00
Jose Gonzalez f1fd4926a7 Merge branch 'ent-8409-bug-widget-agent-module-view' of brutus.artica.es:artica/pandorafms into ent-8409-bug-widget-agent-module-view 2022-01-13 13:15:39 +01:00
Jose Gonzalez 0c14b143d3 Fix entities 2022-01-13 13:15:25 +01:00
alejandro.campos@artica.es bc8460dedc minor fix 2022-01-13 12:58:19 +01:00
fbsanchez 32c0229966 php8 review 2022-01-13 12:43:55 +01:00
Jose Gonzalez 3596ee35df Perform correct visualization of information tiles 2022-01-13 12:30:04 +01:00
fbsanchez d8d5bb3a21 php8 vc review 2022-01-13 12:16:39 +01:00
fbsanchez edd24cd388 php8 vc context fixes 2022-01-13 11:47:49 +01:00
fbsanchez a728d384d7 php8 vc moved static created method to Model instead Item (for lines) 2022-01-13 11:43:33 +01:00
fbsanchez 59b0b71303 php8 vc Copy item 2022-01-13 11:31:11 +01:00
fbsanchez a1546ba080 vc php8 review 2022-01-13 10:47:53 +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
artica 22305d7221 Auto-updated build strings. 2022-01-13 01:00:20 +01:00
fbsanchez 7f574e1132 php8 visualconsoles review, warning! class and object missunderstanding here... 2022-01-12 20:46:46 +01:00
fbsanchez a58c6862e1 php8 visualconsoles review, warning! class and object missunderstanding here... 2022-01-12 20:46:19 +01:00
fbsanchez 8e5a0917ba php8 review + pdf images b64 fix 2022-01-12 19:43:33 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
alejandro.campos@artica.es c93a758111 sanitize sql inputs 2022-01-12 14:11:10 +01:00
Daniel Maya ffc468fce8 Added message 2022-01-12 13:59:46 +01:00
Jose Gonzalez 70d8c5177a Fix issues in node 2022-01-12 13:50:27 +01:00
Daniel Rodriguez 8e9c3184a8 Merge branch 'ent-8186-Bug-en-widget-General-visual-maps-report-Dashboard-metaconsola' into 'develop'
Ent 8186 bug en widget general visual maps report dashboard metaconsola

See merge request artica/pandorafms!4626
2022-01-12 09:45:59 +00:00
Daniel Rodriguez 99a5935bd9 Merge branch 'ent-8256-Revision-de-la-llamada-API-get-events' into 'develop'
fixed get event api call

See merge request artica/pandorafms!4588
2022-01-12 09:43:48 +00:00
Daniel Rodriguez c04ebf42e4 Merge branch 'ent-8233-12588-Reports-Item-tipo-Increment-no-lee-datos-de-historico' into 'develop'
include historic db data in report

See merge request artica/pandorafms!4623
2022-01-12 09:41:59 +00:00
Daniel Rodriguez 199582b67a Merge branch 'ent-7886-servidores-sin-nombre-en-notificaciones-de-bola' into 'develop'
Missing server names in constant to name translation

See merge request artica/pandorafms!4620
2022-01-12 09:39:01 +00:00
artica f10c1d3017 Auto-updated build strings. 2022-01-12 01:00:57 +01:00
fbsanchez ef1d9d5468 added server string to transactional and satellite 2022-01-11 17:22:44 +01:00
Daniel Rodriguez cd073ef4e3 Merge branch 'ent-8263-Fallo-interpretacion-grupos-en-Consola-Visual' into 'develop'
Ent 8263 fallo interpretacion grupos en consola visual

See merge request artica/pandorafms!4550
2022-01-11 15:39:43 +00:00
Jose Gonzalez 9519e00992 Fix issues with select agents modules control 2022-01-11 16:06:58 +01:00
Daniel Rodriguez db4d9928b4 Merge branch 'ent-8122-bug-visual-widget-show-top-agents-modules' into 'develop'
Fixed visual issue

Closes pandora_enterprise#8122

See merge request artica/pandorafms!4619
2022-01-11 14:59:38 +00:00
Daniel Maya 191f17b7d6 Fixed url in metaconsole 2022-01-11 15:40:49 +01:00
alejandro.campos@artica.es 8123d9e44b fixed alias filter in get events api method (metaconsole) 2022-01-11 15:26:31 +01:00
fbsanchez c7b3a63288 vc php8 2022-01-11 14:48:44 +01:00
fbsanchez 92186aa15f vc php8 2022-01-11 14:46:57 +01:00
fbsanchez c3639a22fb vc php8 2022-01-11 14:36:05 +01:00
fbsanchez 3b6f5bd02f services php8 2022-01-11 14:30:59 +01:00
fbsanchez 7ebd6a5f74 php8 warnings cleanup 2022-01-11 12:08:41 +01:00
fbsanchez b731a05bb3 networkmaps php8 2022-01-11 11:24: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 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
fbsanchez 5a761059ea Networkmap php8 fix 2022-01-11 11:00:54 +01:00
alejandro.campos@artica.es 5749eda8c3 include historic db data in report 2022-01-11 09:13:25 +01:00
artica 1afcf787b0 Auto-updated build strings. 2022-01-11 01:00:19 +01:00
fbsanchez 58ba683005 Super 8 2022-01-10 20:52:29 +01:00
Daniel Maya f5e165f253 Fixed alert fired 2022-01-10 15:26:07 +01:00
fbsanchez 856f8bf6b1 Missing server names in constant to name translation 2022-01-10 10:44:36 +01:00
Jose Gonzalez 4ce90a70eb Fixed visual issue 2022-01-10 10:22:59 +01:00
artica cc58138f11 Auto-updated build strings. 2022-01-10 01:00:15 +01:00
artica 9b48d43374 Auto-updated build strings. 2022-01-09 01:00:16 +01:00
artica 18909156dd Auto-updated build strings. 2022-01-08 01:00:19 +01:00
Jose Gonzalez 4f52e1192c Fixed missing code 2022-01-07 12:22:15 +01:00
Jose Gonzalez f072585d5a Clean undefined messages for tree view 2022-01-07 10:39:03 +01:00
artica 2b560d8806 Auto-updated build strings. 2022-01-07 01:00:18 +01:00
Jose Gonzalez 8cdf1acd42 Fix issue with modules 2022-01-06 16:23:13 +01:00
artica f44803eec2 Auto-updated build strings. 2022-01-06 01:00:19 +01:00
alejandro.campos@artica.es 9390a25367 minor fix 2022-01-05 18:02:28 +01:00
Jose Gonzalez 1e92ad99ad Fix merge 2022-01-05 11:14:04 +01:00
Jose Gonzalez 32a98ee5ae Regenerate DB Backup Manager 2022-01-05 11:08:49 +01:00
artica 68e63bd5fb Auto-updated build strings. 2022-01-05 01:00:20 +01:00
Jose Gonzalez 2219659130 Added feature for passwords handle 2022-01-04 17:52:56 +01: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
Daniel Rodriguez 2e2cad7235 Merge branch 'ent-8141-cluster-view-fallos-visuales' into 'develop'
Fix Cluster visual bugs

See merge request artica/pandorafms!4606
2022-01-04 11:46:45 +00:00
artica 13c3a6f27d Auto-updated build strings. 2022-01-04 01:00:18 +01:00
Daniel Rodriguez 8efea9f44c Merge branch 'ent-7251-no-generar-notificaciones-con-servidores-deshabilitados' into 'develop'
Recovered servers fix

See merge request artica/pandorafms!4594
2022-01-03 14:19:57 +00:00
artica 31885b1ca9 Auto-updated build strings. 2022-01-03 01:00:15 +01:00
artica 8e82247c45 Auto-updated build strings. 2022-01-02 01:00:14 +01:00
artica 1f3fb9dfea Auto-updated build strings. 2022-01-01 01:00:16 +01:00
artica 8908e5c1b3 Auto-updated build strings. 2021-12-31 01:00:16 +01:00
Calvo 3cee99cbed Fix Cluster visual bugs 2021-12-30 18:26:59 +01:00
artica d16734cced Auto-updated build strings. 2021-12-30 01:00:15 +01:00
artica d46435a0ad Auto-updated build strings. 2021-12-29 01:00:16 +01:00
Daniel Rodriguez 26fa203bcd Merge branch 'ent-8199-Donut-graph-Consolas-visuales' into 'develop'
Ent 8199 donut graph consolas visuales

See merge request artica/pandorafms!4591
2021-12-28 12:38:09 +00:00
Calvo f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
artica 6cfd091d0e Auto-updated build strings. 2021-12-28 01:00:17 +01:00
Calvo daf0b4e6e9 Fix alert view with default actions node and meta 2021-12-27 19:01:53 +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 Rodriguez 3f57c260ba Merge branch 'ent-8322-Interfaces-no-aplica-los-valores-seleccionados-en-la-configuracion-general' into 'develop'
fixed interface wizard selectors

See merge request artica/pandorafms!4576
2021-12-27 14:08:52 +00:00
Daniel Rodriguez 5e2fc45673 Merge branch 'ent-7879-command-center-nodos-en-diferentes-versiones' into 'develop'
Warn if different MR on centralised environments

See merge request artica/pandorafms!4593
2021-12-27 13:33:06 +00:00
Daniel Rodriguez c7fa90d84a Merge branch 'ent-8383-vodat-Automatic-combined-graphs-no-funcionan-bien-plantillas-de-informe' into 'develop'
fixed automatic graph templates reports #8383

See merge request artica/pandorafms!4587
2021-12-27 10:25:49 +00:00
Calvo 1dec1e468c Merge remote-tracking branch 'origin/develop' into ent-8208-bug-filtros-en-vista-de-alertas 2021-12-27 10:44:25 +01:00