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

15893 Commits

Author SHA1 Message Date
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
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
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 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
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