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

12815 Commits

Author SHA1 Message Date
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
enriquecd f4b36a941c Change data precision visual styles token tooltip - #1634 2018-02-07 13:32:55 +01:00
enriquecd 6851af5943 Show correct info in visual console static graphs tooltips - #1634 2018-02-07 12:46:29 +01:00
artica 520e968500 Auto-updated build strings. 2018-02-07 00:01:14 +01:00
enriquecd 16f5b047d6 Filter config_prepare_session when use F5 balancer - #1882 2018-02-06 17:10:59 +01:00
enriquecd 5c0f0de1e4 Add module critical instructions when create an event - #1862 2018-02-06 16:01:32 +01:00
vgilc 26de4f6517 Merge branch 'ent-1644-fallo-en-ayuda-de-agent-mode' into 'develop' 
Fixed module definition help and add autodisable mode to bulk operations

See merge request artica/pandorafms!1129
 2018-02-06 12:17:14 +01:00
fermin831 d625652f9a Removed unwanted git merge traces (sorry) 2018-02-06 12:06:21 +01:00
fermin831 378186cadf Merge branch 'develop' into ent-1644-fallo-en-ayuda-de-agent-mode 
Conflicts:
	pandora_console/include/help/en/help_module_definition.php
	pandora_console/include/help/es/help_module_definition.php
	pandora_console/include/help/ja/help_module_definition.php
 2018-02-06 12:01:33 +01:00
vgilc fe4b1da1e3 Merge branch '1709-REDIRIS-Permitir-cambiar-links-en-pantalla-de-login' into 'develop' 
Make help and support links in login page customizables - #1709

See merge request artica/pandorafms!1201
 2018-02-06 11:57:23 +01:00
vgilc ae9db8bfd8 Merge branch '1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1' into 'develop' 
Change system audit log extended info to table format with change info - #1571

See merge request artica/pandorafms!1115
 2018-02-06 11:56:48 +01:00
vgilc b6d145992c Merge branch '1699-Ordenar-alfabéticamente-los-grupos-de-agentes' into 'develop' 
Alphabetic order in group selects - #1699

See merge request artica/pandorafms!1197
 2018-02-06 11:56:17 +01:00
vgilc 6194f84f13 Merge branch '1403-Db-changes-for-clocks-in-visual-console-MR' into 'develop' 
MR 12 changes for animation clock ticket - #1403

See merge request artica/pandorafms!1274
 2018-02-06 11:02:05 +01:00
vgilc acd1d97a94 Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-dbchanges' into 'develop' 
Db changes for clocks in visual console - #1403

See merge request artica/pandorafms!1150
 2018-02-06 11:01:45 +01:00
enriquecd 65dccd3935 MR 12 changes for cnimation clock ticket - #1403 2018-02-06 10:52:49 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-02-06 10:46:59 +01:00
enriquecd bf1ad29b6b Merge branch 'develop' into 1699-Ordenar-alfabéticamente-los-grupos-de-agentes 
Conflicts:
	pandora_console/include/functions_users.php
 2018-02-06 10:43:33 +01:00
danielmaya fb39c1e39b Updated current_package_enterprise 719 and MR12 2018-02-06 10:27:07 +01:00
vgilc 0f01fcbd20 Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop' 
Added type graph selection in container graph

See merge request artica/pandorafms!1113
 2018-02-06 09:55:36 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
artica be5adb4635 Auto-updated build strings. 2018-02-06 00:01:13 +01:00
vgilc 024367d601 Merge branch '1758-Error-tamaño-al-crear-elemento-de-imagen-en-consola-visual-dev' into 'develop' 
Fixed element size of type icon, group and static graph

See merge request artica/pandorafms!1247
 2018-02-05 16:39:02 +01:00
vgilc 48b6dc56fd Merge branch '1676-Tags-y-vista-de-alertas-2' into 'develop' 
Show all alerts when select all tags filter - #1676

See merge request artica/pandorafms!1271
 2018-02-05 15:57:40 +01:00
vgilc 160daa836c Merge branch 'develop' into '1758-Error-tamaño-al-crear-elemento-de-imagen-en-consola-visual-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2018-02-05 15:55:56 +01:00
vgilc ce43dd91d8 Merge branch '1301-Macro-para-nombre-de-evento-dev' into 'develop' 
Added _event_description_ in help_alert_macros.php

See merge request artica/pandorafms!1110
 2018-02-05 15:42:14 +01:00
enriquecd 064a9d58b9 Show all alerts when select all tags filter - #1676 2018-02-05 15:30:28 +01:00
danielmaya da8c1e4f46 resolved conflicts 2018-02-05 09:41:27 +01:00
artica b819f76c58 Auto-updated build strings. 2018-02-05 00:01:13 +01:00
artica 084bea27cc Auto-updated build strings. 2018-02-04 00:01:13 +01:00
artica 0614e5a492 Auto-updated build strings. 2018-02-03 00:01:14 +01:00
enriquecd d59289db62 Change builder style - #1748 2018-02-02 14:56:33 +01:00
enriquecd 47f0a90cab Show not init monitors - #1748 2018-02-02 14:10:03 +01:00
enriquecd 768e6e605f Fix bugs - #1748 2018-02-02 13:05:36 +01:00
danielmaya 1f47f2f1a9 Added refresh in cluster_view 2018-02-02 11:49:53 +01:00
artica 3c6e71dbed Auto-updated build strings. 2018-02-02 00:01:18 +01:00
enriquecd 88fddf3032 Add permissions - #1748 2018-02-01 17:49:37 +01:00
enriquecd e1669ded9d Change branch to enterprise - #1748 2018-02-01 11:35:23 +01:00
enriquecd 389c6aeada Change last update text when not init - #1748 2018-02-01 10:54:17 +01:00
enriquecd 4858213fd1 Add tcp port to AA modules - #1748 2018-02-01 10:42:11 +01:00
artica 0d944f0322 Auto-updated build strings. 2018-02-01 00:01:13 +01:00
enriquecd dcb7c92cea Add search bar to cluster list - #1748 2018-01-31 19:41:56 +01:00
danielmaya 3c1025a146 Changes visual style in cluster map and added autorefresh 2018-01-31 16:40:38 +01:00
enriquecd ee4db9b01b Fix bugs view and wizard - #1748 2018-01-31 15:39:06 +01:00
vgilc 3cad7be4a5 Merge branch '1749-sistena-cache-de-acl-s-de-la-consola' into 'develop' 
Modified users_get_groups

See merge request artica/pandorafms!1244
 2018-01-31 15:15:50 +01:00
enriquecd f9edfcb893 finalized Wizard, new styles, editor mode - #1748 2018-01-31 14:42:37 +01:00
daniel f3239b46a3 add propagate groups in list events 2018-01-31 12:39:25 +01:00
artica 3235215547 Auto-updated build strings. 2018-01-31 00:01:14 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola 
Conflicts:
	pandora_console/include/functions_users.php
 2018-01-30 17:56:30 +01:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00
enriquecd b07021f6bc Merge branch 'clusters' of https://192.168.50.5:8081/artica/pandorafms into clusters 2018-01-30 17:40:21 +01:00
enriquecd 2b446a681d Popup when click modules in cluster view, new images, filter modules - #1748 2018-01-30 17:38:29 +01:00
danielmaya f3e44b0c09 Updated visual style in clustermap 2018-01-30 13:48:11 +01:00
artica 2065207661 Auto-updated build strings. 2018-01-30 00:01:14 +01:00
enriquecd f83e093091 Ending creator wizard, fix cluster list, change data modules on update - #1748 2018-01-29 19:15:28 +01:00
vgilc e29b8f86bd Merge branch 'add-japanese-help' into 'develop' 
Update Japanese help

See merge request artica/pandorafms!1254
 2018-01-29 17:31:23 +01:00
danielmaya 13884a44d6 Added clustermap 2018-01-29 16:48:21 +01:00
enriquecd 95ff0e5d2a Wizard and cluster delete - #1748 2018-01-29 16:25:08 +01:00
enriquecd 1895c454c9 Add data to tagente_module, change view, and fix - #1748 2018-01-29 15:18:05 +01:00
vgilc 0da39d386b Merge branch '1678-Qr-de-vista-de-agente-que-redireccione-a-vista-escritorio-en-modo-escritorio-del-navegador-movil' into 'develop' 
Redirect to desktop version pandora when scan agent view QR with a mobilephone…

See merge request artica/pandorafms!1165
 2018-01-29 13:38:25 +01:00
vgilc c9074ecbd3 Merge branch '1745-Mejora-visual-en-el-pop-up-de-ayuda-dev' into 'develop' 
Fixed link to official documentation

See merge request artica/pandorafms!1224
 2018-01-29 13:36:39 +01:00
vgilc 7b20e43141 Merge branch '1746-Mejora-visual-en-el-popup-de-warning-en-el-header-dev' into 'develop' 
Fixed messages in warning popup

See merge request artica/pandorafms!1227
 2018-01-29 13:36:06 +01:00
vgilc b0fc04c8f3 Merge branch '1751-Posición-de-los-agentes-en-el-mapa-de-red-dev' into 'develop' 
Fixed raw_text in networkmap

See merge request artica/pandorafms!1238
 2018-01-29 13:35:20 +01:00
vgilc d9825c08b5 Merge branch '1660-WUX-stats-charts-dev' into 'develop' 
Fixed jquery error

See merge request artica/pandorafms!1151
 2018-01-29 13:31:19 +01:00
vgilc 618498dc65 Merge branch '1672-Letrero-de-página-de-inicio-de-sesión-de-la-consola-no-permite-meter-letras-en-minúsuclas' into 'develop' 
Show real case in login page titles - #1672

See merge request artica/pandorafms!1166
 2018-01-29 13:30:45 +01:00
vgilc 2a7bcb4bc2 Merge branch '1673-elemento-group-en-modo-show-statistics-no-muestra-cartel-dev' into 'develop' 
Fixed group status icon

See merge request artica/pandorafms!1178
 2018-01-29 13:30:10 +01:00
vgilc bc6b660592 Merge branch '1674-Sincronizacion-de-agentes-inmediata-con-metaconsola-en-operación-masiva' into 'develop' 
Update metaconsole after agent bulk operations for update - #1674

See merge request artica/pandorafms!1174
 2018-01-29 13:29:40 +01:00
vgilc 61ce7237c3 Merge branch '1688-Error-en-API-al-habilitar-alertas' into 'develop' 
Add new function enable alert by alias - #1688

See merge request artica/pandorafms!1177
 2018-01-29 13:25:54 +01:00
vgilc 2e486ffac0 Merge branch '1727-Gráficas-horizontales-texto' into 'develop' 
Fix hbar grpahs label - #1727

See merge request artica/pandorafms!1246
 2018-01-29 13:25:04 +01:00
vgilc 482204b525 Merge branch '1734-No-se-pueden-ver-opciones-avanzadas-en-módulos-generic_data_string' into 'develop' 
Fix advanced options toggle for data string modules - #1734

See merge request artica/pandorafms!1237
 2018-01-29 13:24:37 +01:00
vgilc dc5840b844 Merge branch '1736-Consola-visual-Previsualización-background-no-carga-imagen-en-meta-dev' into 'develop' 
Fixed background preimage in visual console

See merge request artica/pandorafms!1243
 2018-01-29 13:23:46 +01:00
vgilc d82ce632bd Merge branch '1740-Iconos-de-grupos-aumentan-de-tamaño-en-consola-visuales-de-meta' into 'develop' 
Fix group elements size in editor mode for metaconsole when set to 0px - #1740

See merge request artica/pandorafms!1241
 2018-01-29 13:23:11 +01:00
vgilc ffc9a44f8d Merge branch '1747-Error-Mapas-de-red-Pandora-Open-dev' into 'develop' 
deleted column of nodes in pandora open

See merge request artica/pandorafms!1242
 2018-01-29 13:22:34 +01:00
vgilc 862242bf00 Merge branch '1782-Fallo-en-enlaces-de-nodos-en-mapas-de-red-dev' into 'develop' 
Fixed colour link and delete link

See merge request artica/pandorafms!1258
 2018-01-29 13:19:27 +01:00
vgilc deeb7ac77d Merge branch '1815-SLA_tiempos_en_desconocido' into 'develop' 
Revised: dbuncompress

See merge request artica/pandorafms!1263
 2018-01-29 13:00:33 +01:00
vgilc 9d4521e5e5 Merge branch '1374-Nombre-predeterminado-para-custom-graphs-4597-com1' into 'develop' 
Show graph name in custom graph items for report list - #1374

See merge request artica/pandorafms!1203
 2018-01-29 12:59:22 +01:00
vgilc 94e2e0b908 Merge branch 'fix-module-graph-decimals' into 'develop' 
Resolve: "Fix module graph decimals"

See merge request artica/pandorafms!1121
 2018-01-29 12:58:13 +01:00
vgilc 86a581ec02 Merge branch '1420-Formato-en-footer-y-header-de-PDF-4649-com1' into 'develop' 
Add tinymce buttons to header a footer editor in visual styles - #1420

See merge request artica/pandorafms!1189
 2018-01-29 12:55:49 +01:00
vgilc 5a198404b7 Merge branch '1525-Imagenes-WUX-no-salen-bien-en-histórico-4776-pelayo' into 'develop' 
Fix history data dialog for base 64 images on modules view - #1525

See merge request artica/pandorafms!1107
 2018-01-29 12:55:14 +01:00
vgilc 1558dee350 Merge branch '1634-Static-graphs-siempre-muestran-5-decimales-4908-media' into 'develop' 
Limit static graphs decimal numbers to show in visual console with data…

See merge request artica/pandorafms!1209
 2018-01-29 12:53:53 +01:00
vgilc 717ecb6adc Merge branch '1638-Si-creamos-una-gráfica-combinada-con-un-intervalo-pequeño-sale-vacía-dev' into 'develop' 
Fixed interval when the period is less than resolution in custom graph

See merge request artica/pandorafms!1118
 2018-01-29 12:53:27 +01:00
vgilc c5d778fd14 Merge branch '1650-Public-url-rompe-vista-móvil-si-no-acaba-en-/-dev' into 'develop' 
Added help_tip in public url

See merge request artica/pandorafms!1125
 2018-01-29 12:53:02 +01:00
vgilc 34ccc01c7b Merge branch '1656-Group-recursion-no-funciona-correctamente-en-operaciones-masivas-dev' into 'develop' 
Fixed group recursion in bulk operation

See merge request artica/pandorafms!1133
 2018-01-29 12:52:35 +01:00
vgilc 8ec7d21932 Merge branch '1723-Etiquetas-en-datos-largos-(vista-de-módulos)-dev' into 'develop' 
Fixed tag i in status monitor data

See merge request artica/pandorafms!1228
 2018-01-29 12:51:24 +01:00
vgilc 6703f49607 Merge branch '1756-Añadir-gráfico-en-los-correos-de-alertas-de-módulos-tipo-string-dev' into 'develop' 
Added string graph in mail

See merge request artica/pandorafms!1250
 2018-01-29 12:50:57 +01:00
vgilc 1b7b17d28f Merge branch '1676-Tags-y-vista-de-alertas' into 'develop' 
Fix tag filter in alert view - #1676

See merge request artica/pandorafms!1171
 2018-01-29 12:48:31 +01:00
vgilc 8f2a29ae3c Merge branch '1738-Problema_en_event.build_query.php_CDE' into 'develop' 
fixed warnings php in log pandora

See merge request artica/pandorafms!1234
 2018-01-29 12:47:19 +01:00
enriquecd 190425ce5d Insert filter type dataa module - #1748 2018-01-29 11:47:26 +01:00
enriquecd b4ac21f969 Change insert data module - #1748 2018-01-29 11:46:20 +01:00
enriquecd b208651bb0 Change module data insert - #1748 2018-01-29 11:44:08 +01:00
vgilc 3f32fb709d Merge branch '1766-Content-Type-cambia-por-defecto-a-Text/plain-en-las-acciones-de-email-dev' into 'develop' 
Fixed text/html option in alert action

See merge request artica/pandorafms!1252
 2018-01-29 10:19:06 +01:00
enriquecd 1918520ede Delete comments - #1748 2018-01-29 09:59:12 +01:00
enriquecd 34b6f3026e Fix min warning and critical on creating modules - #1748 2018-01-29 09:56:58 +01:00
artica 2b0688a76c Auto-updated build strings. 2018-01-29 00:01:11 +01:00
artica fd923a5adb Auto-updated build strings. 2018-01-28 00:01:11 +01:00
artica adb127c1c6 Auto-updated build strings. 2018-01-27 00:01:12 +01:00
enriquecd ca63112653 Delete comments - #1748 2018-01-26 14:46:56 +01:00
enriquecd 7c71b83b9a Event bar, module list in view, change builder data - #1748 2018-01-26 14:43:23 +01:00
enriquecd b57606610c Add min warning and critical data in module creation - #1748 2018-01-26 10:59:05 +01:00
artica 3b88cc46a3 Auto-updated build strings. 2018-01-26 00:01:12 +01:00
enriquecd 77fc16b690 Inprove view and fix wizard - #1748 2018-01-25 20:01:03 +01:00
enriquecd 2b07a7a8a9 Change po,mo,mr and package - #1257 2018-01-25 15:49:21 +01:00
enriquecd 9258d00051 Inprove cluster view, and change fields to insert in creation cluster modules - #1748 2018-01-25 15:40:39 +01:00
enriquecd 0808b2bf07 Cluster view, change creation and delete agent module method - #1748 2018-01-25 13:46:45 +01:00
fbsanchez 34c424953b Revised: dbuncompress 2018-01-25 12:41:44 +01:00
daniel 65615dcf80 Fixed error sql 2018-01-25 10:06:05 +01:00
enriquecd c14e68e0e8 Inprove wizard, change modules update - #1748 2018-01-24 19:39:00 +01:00
fbsanchez 2e1ab72a21 Reapplied #1000 solution 2018-01-24 17:28:00 +01:00
enriquecd 4358f37e07 Delete clusters, agents and modules - #1748 2018-01-24 16:15:53 +01:00
artica cd2c000cbf Updated version and build strings. 2018-01-24 14:27:02 +01:00
Alejandro Gallardo Escobar 85411c8948 [Pandora Console > Mobile] Redirect to the required page after login 2018-01-24 14:13:13 +01:00
artica e6aa3de997 Auto-updated build strings. 2018-01-24 00:01:12 +01:00
enriquecd 5dbf0eabbd Fix wizard, no show cluster agents in wizard, and preview - #1748 2018-01-23 19:33:48 +01:00
enriquecd a149b3119e Final Wizard without js, view list, cluster creation - #1748 2018-01-23 15:34:44 +01:00
artica f64498450a Auto-updated build strings. 2018-01-23 00:01:13 +01:00
enriquecd 2533072349 Creator wizard, module tpye constants, and functions - #1478 2018-01-22 18:37:54 +01:00
danielmaya 72aefbd96d Fixed colour link and delete link 2018-01-22 16:17:10 +01:00
daniel 36429616f3 fixed minor error combined graph fullscale 2018-01-22 15:46:23 +01:00
vgilc d471b0889c Merge branch '1572-Descripción-de-interfaces-dell-powerconnect-dev' into 'develop' 
Changed explode in wizard snmp interface explorer

See merge request artica/pandorafms!1256
 2018-01-22 10:40:03 +01:00
artica dc9e33953e Auto-updated build strings. 2018-01-22 00:01:11 +01:00
artica 6541fe17e8 Auto-updated build strings. 2018-01-21 00:01:12 +01:00
artica d2c97be01c Auto-updated build strings. 2018-01-20 00:01:16 +01:00
enriquecd e2399273ce Add step 3 and step 4 to wizard - #1748 2018-01-19 16:49:27 +01:00
artica c0c251dd8e Auto-updated build strings. 2018-01-19 00:01:13 +01:00
enriquecd 4d9f029a61 Add qizard stp 3 and step 4 - #1748 2018-01-18 19:44:47 +01:00
danielmaya c7c31a308c Changed explode in wizard snmp interface explorer 2018-01-18 13:44:38 +01:00
artica c96b9aac0d Auto-updated build strings. 2018-01-18 00:01:12 +01:00
enriquecd 099cd3bbe8 Wizard first and second step, clusters functions - #1478 2018-01-17 18:56:44 +01:00
artica ff0132e8de Auto-updated build strings. 2018-01-17 00:01:12 +01:00
enriquecd cce92cc961 Clusters creator main page, fix pandoradb - #1748 2018-01-16 19:24:58 +01:00
enriquecd 749bc20018 Add db changes to pandora_migrate - #1748 2018-01-16 16:02:20 +01:00
enriquecd 5ab43d8106 Add menu section, new db tables and two new module types in pandoradb 2018-01-16 15:41:35 +01:00
Junichi Satoh 55d392efc8 Added a new Japanese help and fixed typo. 2018-01-16 14:39:17 +09:00
artica 9d01f98f21 Auto-updated build strings. 2018-01-16 00:01:12 +01:00
danielmaya 3a3de49802 Fixed text/html option in alert action 2018-01-15 11:04:53 +01:00
artica ae23342184 Auto-updated build strings. 2018-01-15 00:01:10 +01:00
artica 53cbb0f3e8 Auto-updated build strings. 2018-01-14 00:01:11 +01:00
artica d9668e97c9 Auto-updated build strings. 2018-01-13 00:01:16 +01:00
daniel 5d61ff5056 fixed error in ACL 2018-01-12 14:17:48 +01:00
danielmaya c2a467064e Added string graph in mail 2018-01-12 13:17:57 +01:00
enriquecd 412374ef25 Fix setting visual console as home screen - #1694 2018-01-12 11:06:42 +01:00
vgilc 8fcf3a7045 Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente-4' into 'develop' 
Ent 1436 opciones avanzadas cron modulos sinteticos no funciona correctamente 4

See merge request artica/pandorafms!1245
 2018-01-12 08:49:22 +01:00
vgilc a79c1ae036 Merge branch 'feature/unknown-updates' into 'develop' 
Add support for periodically updating the status of unknown modules.

See merge request artica/pandorafms!1248
 2018-01-12 08:48:48 +01:00
artica 78e5f808ba Auto-updated build strings. 2018-01-12 00:01:16 +01:00
Ramon Novoa 934ab8ed91 Add support for periodically updating the status of unknown modules. 2018-01-11 16:00:22 +01:00
danielmaya 06a33faec2 Fixed element size of type icon, group and static graph 2018-01-11 15:32:52 +01:00
daniel 638d7ced30 performance improvements in visual console list is called indiscriminately to the function get_acl 2018-01-11 15:25:55 +01:00
daniel 57990d80a8 fixed warnings php 2018-01-11 13:05:31 +01:00
daniel 12faad0217 modificate users_get_group for acl groups parents and children 2018-01-11 11:53:09 +01:00
enriquecd 6e10baac32 Fix hbar grpahs label - #1727 2018-01-11 11:12:41 +01:00
artica d9670999c0 Auto-updated build strings. 2018-01-11 00:01:16 +01:00