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

11958 Commits

Author SHA1 Message Date
Daniel Rodriguez e81932cf0d Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop' 
Fixed visual styles ticket 4809

See merge request artica/pandorafms!2867
 2019-11-06 16:23:51 +01:00
fbsanchez 98237a8d34 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-06 15:36:53 +01:00
Daniel Rodriguez 34bfb762fd Merge branch 'ent-4857-Bug-color-pagina-eventos' into 'develop' 
Ent 4857 bug color pagina eventos

See merge request artica/pandorafms!2834
 2019-11-06 15:27:48 +01:00
Alejandro Fraguas 37ffff12eb Merge branch '4727-macros-grupos-secundarios' into 'develop' 
4727 macros grupos secundarios

See merge request artica/pandorafms!2811
 2019-11-06 12:20:39 +01:00
Daniel Rodriguez 5a34ec51d2 Merge branch 'ent-4687-api-get-all-agents-recursion' into 'develop' 
Added recursion to api_get_all_agents

See merge request artica/pandorafms!2753
 2019-11-06 10:38:17 +01:00
Tatiana Llorente 1a34e488b6 Fixed bug in report date in pdf reports 2019-11-06 10:34:08 +01:00
manuel a486738920 Fixed visual styles ticket 4809 2019-11-06 10:31:26 +01:00
Tatiana Llorente 05e424a24e Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 
Conflicts:
	pandora_console/include/functions_ui.php
 2019-11-05 17:25:56 +01:00
Tatiana Llorente 87c5d0025b Merge remote-tracking branch 'origin/develop' into ent-4623-Exportar-a-CSV-los-eventos-separador-erroneo 2019-11-05 17:24:10 +01:00
Daniel Rodriguez 35d87400fd Merge branch 'ent-4892-HTML-custom-report-date-vacio' into 'develop' 
Ent 4892 html custom report date vacio

See merge request artica/pandorafms!2847
 2019-11-05 17:19:40 +01:00
Luis b707ebd4a4 Added docs and support urls in console. Fixed bugs 2019-11-05 17:09:29 +01:00
Daniel Rodriguez b7d8323583 Merge branch 'ent-3687-get-agents-id-name-by-alias-api-cli' into 'develop' 
Added API and cli function get_agents_id_by_alias

See merge request artica/pandorafms!2802
 2019-11-05 17:08:32 +01:00
Daniel Rodriguez 0e628a365d Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop' 
Ent 4625 cambiar titulo a archivo csv de la vista de eventos

See merge request artica/pandorafms!2783
 2019-11-05 16:57:23 +01:00
Daniel Rodriguez dd86598298 Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop' 
Fixed visual bug in general report item

See merge request artica/pandorafms!2854
 2019-11-05 16:43:52 +01:00
marcos b80cb976f9 review fms 2019-11-05 16:08:51 +01:00
fbsanchez 276fc82556 Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-05 15:39:18 +01:00
Daniel Barbero Martin e5f24ca884 Merge develop 2019-11-05 15:27:06 +01:00
fbsanchez ed6dd2983f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2019-11-05 15:21:21 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
 2019-11-05 15:17:09 +01:00
Daniel Barbero Martin ebb7cbfe6c Fix styles css 2019-11-05 15:12:24 +01:00
Luis Calvo dab4676a33 Resolved merge conflict and fixed bugs 2019-11-05 13:57:13 +01:00
Daniel Rodriguez 98d36cfc6d Merge branch 'ent-4896-General-Report-en-Plantillas-no-tiene-bien-la-hora' into 'develop' 
Ent 4896 general report en plantillas no tiene bien la hora

See merge request artica/pandorafms!2855
 2019-11-05 13:33:27 +01:00
fbsanchez b1d4bfe149 Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace 
Conflicts:
	pandora_console/pandoradb_data.sql
 2019-11-05 11:16:26 +01:00
Daniel Rodriguez a1b879d065 Merge branch 'ent-4728-Desactivar-Restart-Map-para-usuarios-sin-permisos' into 'develop' 
Ent 4728 desactivar restart map para usuarios sin permisos

See merge request artica/pandorafms!2805
 2019-11-04 18:45:57 +01:00
Tatiana Llorente c83b85c225 Ent 4801 error informes pdf csv 2019-11-04 18:41:03 +01:00
Jose Gonzalez f584ac7835 Solved issue with query 2019-11-04 17:45:56 +01:00
marcos 84bdc8fc17 add progress extend 2019-11-04 17:39:21 +01:00
Tatiana Llorente 28e2702a48 Changed condition for general reports with last value checked 2019-11-04 12:00:12 +01:00
manuel d0c2c0d1eb Fixed visual bug in general report item 2019-11-04 10:39:16 +01:00
fbsanchez a249132fb5 sap discovery - config 2019-10-31 21:32:34 +01:00
fbsanchez 115c884cd4 Discovery SAP 2019-10-31 21:13:18 +01:00
fbsanchez 5a42e76650 SAP discovery task 2019-10-31 18:19:00 +01:00
fbsanchez c72f792d43 SAP discovery task 2019-10-31 18:18:38 +01:00
Tatiana Llorente 867ab6d0bf Fixed bug in report date 2019-10-31 09:51:38 +01:00
fbsanchez 3eb0a6bb95 minor fixes after internal meeting 2019-10-30 18:33:33 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
 2019-10-30 16:56:44 +01:00
marcos 334cea472e add method ui_progress_extend(work in progress) 2019-10-30 14:47:28 +01:00
marcos bb7ba67dab changes in omnishell.css 2019-10-29 17:49:04 +01:00
Daniel Barbero Martin 2bb81a839a Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/menu.php
	pandora_console/pandoradb_data.sql
 2019-10-29 17:15:19 +01:00
fbsanchez c07baa614f Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF 2019-10-29 17:00:57 +01:00
Marcos Alconada 613e5741fb Merge branch 'develop' into 'ent-4766-feedback-de-ayudas' 
# Conflicts:
#   pandora_console/include/functions_ui.php
 2019-10-29 17:00:39 +01:00
marcos 487da50d31 add omnishell.css 2019-10-29 16:56:11 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
fbsanchez 0a53c0b915 Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 2019-10-29 16:50:46 +01:00
fbsanchez 7224131126 Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF 2019-10-29 16:50:02 +01:00
alejandro-campos cf0321846f fix bug in dynamic report filter group functionality: not applying recursion correctly 2019-10-29 12:31:23 +01:00
marcos 8174b4f2eb add help option in welcome window 2019-10-29 10:38:22 +01:00
Luis Calvo 64e80e6fee Fixed error message 2019-10-29 10:32:59 +01:00
Luis Calvo 7f01f3d014 Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli 2019-10-29 10:23:46 +01:00
alejandro-campos 758804e5de fix minor bug in function groups_get_id_recursive 2019-10-29 09:18:21 +01:00
Daniel Barbero Martin 6f52095419 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-29 09:14:06 +01:00
Daniel Barbero Martin f6fd5cc21f Add image feedback 2019-10-29 09:13:48 +01:00
artica 6f3e42e732 Auto-updated build strings. 2019-10-29 00:01:13 +01:00
marcos 57bfc364ae add modal confirmation window 2019-10-28 18:57:10 +01:00
fbsanchez 7d5b845e1f minor fixes 2019-10-28 18:37:01 +01:00
Tatiana Llorente 32da1d287b Fixed API function set_module_data 2019-10-28 15:19:39 +01:00
fbsanchez e12bcb2ac4 Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace 2019-10-28 12:59:02 +01:00
fbsanchez 7accbc97c4 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:36:19 +01:00
artica 3094d5af05 Updated version and build strings. 2019-10-28 12:35:59 +01:00
fbsanchez ccf971c2eb Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:18:19 +01:00
Alejandro Fraguas ffb9b9052c Merge branch 'ent-4848-phantomjs-se-queda-congelado' into 'develop' 
Ent 4848 phantomjs se queda congelado

See merge request artica/pandorafms!2837
 2019-10-28 11:53:47 +01:00
Daniel Rodriguez 08247c1952 Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop' 
changed pandora api functions to include possibility of using agent alias when...

See merge request artica/pandorafms!2819
 2019-10-28 11:25:38 +01:00
alejandro-campos b16ef248d6 minor fixes in cli and api functions 2019-10-28 09:48:52 +01:00
Daniel Barbero Martin 89b030c484 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-28 08:50:02 +01:00
artica 88a56a1f22 Auto-updated build strings. 2019-10-28 00:01:08 +01:00
artica 874ac0c630 Auto-updated build strings. 2019-10-27 00:01:07 +02:00
artica 8a03486dfc Auto-updated build strings. 2019-10-26 00:01:09 +02:00
Daniel Barbero f8c9b83a9c Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-25 13:46:08 +02:00
Daniel Barbero c4aea1ac59 add styles validation form of modal 2019-10-25 13:28:01 +02:00
fbsanchez 21dd69706d web2image 2019-10-25 13:16:06 +02:00
fbsanchez 440874d436 More controls for phantom web2image 2019-10-25 12:51:33 +02:00
fbsanchez a2e96270a7 Avoid close cron sessions while gc 2019-10-25 12:24:02 +02:00
fbsanchez 2a24e22335 Avoid close cron sessions while gc 2019-10-25 12:23:00 +02:00
Daniel Barbero 22a2b7cd0b Add feedback phpInfo 2019-10-25 10:43:03 +02:00
artica 86fd1275be Auto-updated build strings. 2019-10-25 00:01:11 +02:00
Daniel Barbero Martin 3dee6888d6 fix 2019-10-24 17:42:37 +02:00
Tatiana Llorente 38b3490e4e Changed color of constant to severity minor in events 2019-10-24 17:42:27 +02:00
marcos e725a0185b cambios semi finales 2019-10-24 16:56:13 +02:00
alejandro-campos ee587a3117 Merge remote-tracking branch 'origin/develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name 2019-10-24 13:21:08 +02:00
alejandro-campos a4988fe9af modified get_events functions in functions_api 2019-10-24 13:18:26 +02:00
fbsanchez a0c610d988 WS fixed audit origin address 2019-10-24 12:18:49 +02:00
fbsanchez d34aa0917b WS tick interval, WS manager able to limit connections per session 2019-10-24 10:35:16 +02:00
artica 38dfa5cf35 Auto-updated build strings. 2019-10-24 00:01:09 +02:00
fbsanchez 709f4cac81 WebSocket configuration, quickShell settings, quickShell proxied url compatibility 2019-10-23 19:56:48 +02:00
Daniel Barbero Martin de22fb70e3 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 2019-10-23 19:51:49 +02:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
alejandro-campos a06f56a413 added function to convert cidr prefixes to mask 2019-10-23 17:22:18 +02:00
Alejandro Fraguas 5364ef0fa1 Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into 'develop' 
Fix and control API sessions

See merge request artica/pandorafms!2830
 2019-10-23 16:12:19 +02:00
Tatiana Llorente 31c36dc015 Ent 4819 no funciona llamada api get events 2019-10-23 15:53:30 +02:00
Alejandro Fraguas 8fd6f28070 Merge branch 'ent-4851-Cambio-de-color-en-la-union-de-agentes-del-GIS-map' into 'develop' 
Changed color

See merge request artica/pandorafms!2831
 2019-10-23 12:28:04 +02:00
Daniel Rodriguez 39b3a00276 Merge branch 'ent-4690-revision-completa-de-informes-templates-en-meta' into 'develop' 
Fixed bugs in reports

See merge request artica/pandorafms!2796
 2019-10-23 11:41:07 +02:00
Daniel Maya c01a856826 Changed color 2019-10-23 11:17:16 +02:00
artica 1470241783 Auto-updated build strings. 2019-10-23 00:01:11 +02:00
fbsanchez 9edb77d288 proper logout (api) 2019-10-22 20:48:45 +02:00
fbsanchez 5b3fd5dd79 Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace 2019-10-22 17:34:41 +02:00
fbsanchez eb98f695f9 Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace 2019-10-22 17:34:34 +02:00
fbsanchez ccfd944ad7 Fix and control API sessions 
Conflicts:
	pandora_console/include/lib/User.php

	modified:   pandora_console/include/api.php
	modified:   pandora_console/include/chart_generator.php
	new file:   pandora_console/include/lib/User.php
	modified:   pandora_console/include/load_session.php
	modified:   pandora_console/include/web2image.js
 2019-10-22 17:33:50 +02:00
marcos b35c9dd96d ajust changes 2019-10-22 16:42:13 +02:00
manuel bbeb750e46 Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta 
Conflicts:
	pandora_console/include/functions_graph.php
 2019-10-22 15:51:38 +02:00
manuel deb217906c Fixed bug in templates 2019-10-22 15:41:13 +02:00
Daniel Rodriguez 552d8758e8 Merge branch 'ent-4815-html-en-los-csv' into 'develop' 
Fixed bug in CSV export

See merge request artica/pandorafms!2824
 2019-10-22 14:22:42 +02:00
marcos f14c4966e3 changes 2019-10-22 13:10:15 +02:00
Daniel Rodriguez 0cf3e01f74 Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop' 
Ent 1880 umbrales inversos en negativo

See merge request artica/pandorafms!2818
 2019-10-22 12:56:21 +02:00
Alejandro Fraguas ee0eee06f6 Merge branch 'ent-4724-estilo-vista-pandora-wux' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2779
 2019-10-22 12:54:28 +02:00
marcos ca49cefb0d fixed 2019-10-22 12:19:25 +02:00
marcos 79a1a1b2a3 add wux.css 2019-10-22 10:23:53 +02:00
artica f99616723b Auto-updated build strings. 2019-10-22 00:01:09 +02:00
fbsanchez 47e6f4adb5 Fix and control API sessions 2019-10-21 21:09:03 +02:00
marcos ee97ed8a5e segunda ronda 2019-10-21 18:36:02 +02:00
Daniel Barbero e37af1598a continue feedback diagnostics 2019-10-21 18:11:04 +02:00
fbsanchez 6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
fbsanchez bb2faca479 ma 2019-10-21 12:18:42 +02:00
manuel 312b1c7c40 Fixed bug in CSV export 2019-10-21 11:48:13 +02:00
alejandro-campos f2dbcea183 fix indentation 2019-10-21 09:55:39 +02:00
alejandro-campos 6cf08dde1e Merge branch 'develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name 2019-10-21 09:43:43 +02:00
artica f72fde0fb5 Auto-updated build strings. 2019-10-21 00:01:07 +02:00
artica bb9d18b6d8 Auto-updated build strings. 2019-10-20 00:01:07 +02:00
artica 88248fd226 Auto-updated build strings. 2019-10-19 00:01:11 +02:00
fbsanchez 1cf77cc8f1 WSProxy ACL check 2019-10-18 18:55:29 +02:00
Daniel Barbero b8d03e98c3 pdf diagnostic 2019-10-18 15:23:23 +02:00
Luis Calvo 4638915c70 Fixed minor bugs 2019-10-18 12:48:38 +02:00
Luis Calvo 85dff93f41 Added strict option 2019-10-18 12:22:20 +02:00
marcos 353246f9f6 first changed to welcome window 2019-10-18 10:30:19 +02:00
artica 22af1a3654 Auto-updated build strings. 2019-10-18 00:01:11 +02:00
fbsanchez e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +02:00
Daniel Barbero Martin 4e56f6751a Continue work diagnostics 2019-10-17 15:17:28 +02:00
Alejandro Fraguas be29f1dd55 Merge branch 'ent-4746-boton-de-aspecto-raro-en-forgot-your-password' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2782
 2019-10-17 13:20:14 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
alejandro-campos 3a5bbb22bd changed pandora api functions to include possibility of using agent alias when agent id is accepted as argument 2019-10-17 11:14:42 +02:00
Daniel Rodriguez 2dfc2b7a8a Merge branch 'ent-3989-graficas-sql-metaconsola' into 'develop' 
Available in metaconsole sql charts in reports for metaconsole server

See merge request artica/pandorafms!2697
 2019-10-17 11:07:37 +02:00
Daniel Rodriguez 3cb80e5d32 Merge branch '4820-planned_downtimes_created-no-se-almacena-correctamente' into 'develop' 
Solved issue with date_from and dato_to missing time data

See merge request artica/pandorafms!2817
 2019-10-17 10:16:07 +02:00
artica 361f2022f4 Auto-updated build strings. 2019-10-17 00:01:10 +02:00
Daniel Rodriguez b6db2aa041 Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop' 
Fixed open and enterprise network map migration

See merge request artica/pandorafms!2745
 2019-10-16 19:03:24 +02:00
Jose Gonzalez 4a29057a1b Solved issue with date_from and dato_to missing time data 2019-10-16 16:41:22 +02:00
Daniel Rodriguez 5f0dffb816 Merge branch 'ent-4559-desajuste-en-custom-fields' into 'develop' 
Ent 4559 desajuste en custom fields

See merge request artica/pandorafms!2684
 2019-10-16 11:38:38 +02:00
Marcos Alconada e7a948bb71 Update HelpFeedBack.class.php 2019-10-16 11:03:21 +02:00
Alejandro Fraguas 7e54a26b49 Merge branch 'ent-4618-8580-4526-Bug-en-los-CSV-report' into 'develop' 
Fixed csv reports download

See merge request artica/pandorafms!2742
 2019-10-16 09:58:00 +02:00
artica a3a456da92 Auto-updated build strings. 2019-10-16 00:01:08 +02:00
Marcos Alconada 1a77e3e381 Update HelpFeedBack.class.php 2019-10-15 18:11:50 +02:00
Marcos Alconada 43d3f32d0c Update help_feedback.css 2019-10-15 18:11:21 +02:00
Marcos Alconada 5a73b67545 Update help_feedback.css 2019-10-15 17:59:22 +02:00
Marcos Alconada d04544fa66 Update HelpFeedBack.class.php 2019-10-15 16:34:01 +02:00
Marcos Alconada 03ada6fb1f Update HelpFeedBack.class.php 2019-10-15 16:28:12 +02:00
Marcos Alconada f8636e77cc Update HelpFeedBack.class.php 2019-10-15 12:45:40 +02:00
marcos a31e66a9bd add feedback 2019-10-15 12:16:50 +02:00
Alejandro Fraguas 78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop' 
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
 2019-10-15 11:42:00 +02:00
Marcos Alconada 89843fcc3b Update functions_ui 2019-10-15 11:13:40 +02:00
artica 6c21d57677 Auto-updated build strings. 2019-10-15 00:01:09 +02:00
Daniel Barbero Martin 13a72426cd fixed diagnostics 2019-10-14 17:21:38 +02:00
Jose Gonzalez e0ff5bf9cc Solved an issue with japanese wiki 2019-10-14 17:13:13 +02:00
Jose Gonzalez 01148749a6 Added secondarygroups macro and updated spanish, english and japanses wiki 2019-10-14 17:10:48 +02:00
Daniel Rodriguez febe54e3c8 Merge branch '4779-call-set-planned_downtimes-no-se-muestra' into 'develop' 
Added date control

See merge request artica/pandorafms!2794
 2019-10-14 16:21:39 +02:00
artica 83b16d9d84 Auto-updated build strings. 2019-10-14 00:01:07 +02:00
artica 838fcfa3a1 Auto-updated build strings. 2019-10-13 00:01:06 +02:00
artica df2acbce96 Auto-updated build strings. 2019-10-12 00:01:10 +02:00
Daniel Barbero 66bad65550 refactoriced diagnostics pandoraFMS 2019-10-11 14:55:20 +02:00
Tatiana Llorente dd2ace99e1 Check permissions to reset a network map - #4728 2019-10-11 13:51:52 +02:00
Daniel Rodriguez e4775a3e6d Merge branch 'ent-4607-8644-informe-histograma-no-funciona-bien' into 'develop' 
Fixed bug in histogram graph report

See merge request artica/pandorafms!2803
 2019-10-11 13:06:27 +02:00
Daniel Rodriguez adaead5f8f Merge branch 'ent-4763-paginacion-datatables' into 'develop' 
datatables hide when only 1 page

See merge request artica/pandorafms!2784
 2019-10-11 12:46:22 +02:00
Daniel Rodriguez c1853523f5 Merge branch 'ent-4545-Bug-creacion-infrome-con-graficas-MAX-Value-fallo-tabla' into 'develop' 
Ent 4545 bug creacion infrome con graficas max value fallo tabla

See merge request artica/pandorafms!2719
 2019-10-11 12:30:36 +02:00
manuel f139fb0d2c Merge branch 'develop' into ent-4618-8580-4526-Bug-en-los-CSV-report 2019-10-11 11:39:41 +02:00
Alejandro Fraguas 7fc31d127d Merge branch 'ent-4662-bug-creacion-agente-API-visualizacion-Metaconsola' into 'develop' 
Ent 4662 bug creacion agente api visualizacion metaconsola

See merge request artica/pandorafms!2764
 2019-10-11 11:25:16 +02:00
manuel a69cfb63f1 Fixed bug in histogram graph report 2019-10-11 09:04:13 +02:00
artica 9a165dc9d8 Auto-updated build strings. 2019-10-11 00:01:08 +02:00
Daniel Rodriguez f8dc0596ba Merge branch 'ent-4653-item-agent-modules-blank-on-template' into 'develop' 
Removed item agent/modules from templates

See merge request artica/pandorafms!2760
 2019-10-10 17:00:28 +02:00
Luis Calvo bf19fbffd3 Added API and cli function get_agents_id_by_alias 2019-10-10 14:25:17 +02:00
artica edb3c806ce Auto-updated build strings. 2019-10-10 00:01:08 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
Tatiana Llorente 18679f90e5 Added token in visual styles to change the font size in items of reports - #4670 2019-10-09 16:24:37 +02:00
fbsanchez d09c071684 discovery ACL 2019-10-09 15:45:02 +02:00
manuel 93bca4673f Fixed bugs in reports 2019-10-09 13:15:07 +02:00
artica be2148ff26 Auto-updated build strings. 2019-10-09 00:01:09 +02:00
Jose Gonzalez 6ad9386cf6 Added date control 2019-10-08 15:42:55 +02:00
Daniel Rodriguez bc2e40d0a3 Merge branch '4748-API-call-set-planned_downtimes_created' into 'develop' 
Added control for same-day and different hours planned downtimes

See merge request artica/pandorafms!2788
 2019-10-08 11:37:10 +02:00
artica 2a76b06870 Auto-updated build strings. 2019-10-08 00:01:11 +02:00
Daniel Rodriguez bd7ee945f7 Merge branch 'ent-4454-No-aparece-el-icono-con-color-de-warning-en-el-Service-Tree-View' into 'develop' 
Fixed bad image for warning status - #4454

See merge request artica/pandorafms!2629
 2019-10-07 19:21:53 +02:00
Daniel Rodriguez e6724752ff Merge branch 'ent-4661-leyenda-de-las-graficas-en-classic-mode' into 'develop' 
Fixed Error

See merge request artica/pandorafms!2767
 2019-10-07 19:21:28 +02:00
Daniel Rodriguez dc01b3e22e Merge branch 'ent-4679-notificacion-supervisor-server-no-actualizado' into 'develop' 
Added notify when Console and Server have version mismatch

See merge request artica/pandorafms!2770
 2019-10-07 15:59:16 +02:00
Daniel Rodriguez 375fac7f3d Merge branch 'ent-4681-8764-Fallo-en-Vodat-a-la-hora-de-editar-módulos-de-politica' into 'develop' 
Fixed modules_get_relations

See merge request artica/pandorafms!2751
 2019-10-07 14:01:24 +02:00
Daniel Rodriguez debbbdc4e5 Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop' 
Improved truncate system and solved issue

See merge request artica/pandorafms!2774
 2019-10-07 13:49:57 +02:00
Jose Gonzalez 7ac12e45ef Solved visual issue 2019-10-07 13:33:18 +02:00
Jose Gonzalez 2b2f8417a7 Added control for same-day and different hours planned downtimes 2019-10-07 12:40:59 +02:00
marcos.alconada a7b66e6365 revert changes 2019-10-07 12:07:31 +02:00
marcos.alconada 8c0c392197 revert chanegd 2019-10-07 11:39:06 +02:00
marcos.alconada 80e6d70b31 revert style 2019-10-07 11:29:42 +02:00
marcos.alconada a9e8b1113e add default comments when change owner or status on events 2019-10-07 11:15:25 +02:00
artica 745971dfa6 Auto-updated build strings. 2019-10-07 00:01:06 +02:00
artica 936ce0ee26 Auto-updated build strings. 2019-10-06 00:01:06 +02:00
artica d0dead58f0 Auto-updated build strings. 2019-10-05 00:01:09 +02:00
fbsanchez a4cff9770f Collaborative session @manuel.montes pagination fix in datatables (hide when only 1 page) 2019-10-04 14:17:14 +02:00
Daniel Rodriguez bfe32a5aed Merge branch 'ent-4699-Revision-completa-de-informes-Wizard-en-Meta' into 'develop' 
Fixed bug in meta serialize data

See merge request artica/pandorafms!2773
 2019-10-04 14:04:17 +02:00
Daniel Rodriguez 658d71568a Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop' 
the itil type is removed in the report types

See merge request artica/pandorafms!2757
 2019-10-04 13:55:54 +02:00
Daniel Rodriguez 915edd455d Merge branch 'ent-4098-historical_data-report-no-definido-para-metaconsola' into 'develop' 
Fixed historical_data report in metaconsole

See merge request artica/pandorafms!2722
 2019-10-04 13:53:29 +02:00
Tatiana Llorente 305d74878c Changed title of csv in events - #4625 2019-10-04 11:51:30 +02:00
artica cc239e5e68 Auto-updated build strings. 2019-10-04 00:01:09 +02:00
marcos.alconada 2938435988 fixed minor error 2019-10-03 17:46:26 +02:00
Daniel Rodriguez 5f463e51b8 Merge branch '4689-mostrar-instrucciones-en-la-vista-de-eventos' into 'develop' 
Fixed issue with instructions in events view

See merge request artica/pandorafms!2752
 2019-10-03 16:59:03 +02:00
Daniel Rodriguez b2157f4b32 Merge branch 'ent-4051-tree-view-module-groups-duplica-modulos' into 'develop' 
add condition in query

See merge request artica/pandorafms!2710
 2019-10-03 16:41:15 +02:00
Kike b25c9ca793 Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos 
Conflicts:
	pandora_console/include/functions_events.php
 2019-10-03 15:59:15 +02:00
Alejandro Fraguas e42932ad19 Merge branch 'ent-4543-Bug-en-Graficas-Personalizadas-con-Average-series-Visual' into 'develop' 
fixed summatory series custom graph

See merge request artica/pandorafms!2754
 2019-10-03 13:38:18 +02:00
Alejandro Fraguas e174f8dda9 Merge branch 'ent-4544-bug-custom-graph-csv-export' into 'develop' 
Fixed CSV custom graphs export

See merge request artica/pandorafms!2694
 2019-10-03 12:59:30 +02:00
artica 21d363b21e Auto-updated build strings. 2019-10-03 00:01:09 +02:00
marcos.alconada 2ea20c1605 fixed visual error 2019-10-02 14:42:51 +02:00
artica 8e204605e5 Auto-updated build strings. 2019-10-02 00:01:07 +02:00
Marcos Alconada f1d20d56e7 Update functions_ui.php 2019-10-01 16:26:22 +02:00
marcos.alconada a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
manuel 454750aefe Fixed bugs in metaconsole reports 2019-10-01 12:46:09 +02:00
Jose Gonzalez f55b2ce80f Improved truncate system and solved issue 2019-10-01 11:22:25 +02:00
artica c600f74ee2 Auto-updated build strings. 2019-10-01 00:01:06 +02:00
Jose Gonzalez 5294e2f627 Now the supervisor control all servers and not only one 2019-09-30 15:40:40 +02:00
manuel d566da6fb1 Fixed bug in meta serialize data 2019-09-30 15:33:44 +02:00
Jose Gonzalez d878958502 Added notify when Console and Server have version mismatch 2019-09-30 12:48:46 +02:00
artica b072bb5314 Auto-updated build strings. 2019-09-30 00:01:06 +02:00
artica 7ae5a8e5be Auto-updated build strings. 2019-09-29 00:01:06 +02:00
artica 15752c10ef Auto-updated build strings. 2019-09-28 00:01:08 +02:00
Kike dfea704154 Show instructions on mouse over 2019-09-27 14:48:45 +02:00
marcos.alconada 4c93ca3d60 fixed minor error 2019-09-27 12:07:40 +02:00
artica dc3dd1cffa Auto-updated build strings. 2019-09-27 00:01:09 +02:00
marcos.alconada cc18d5d1ed Fixed Error 2019-09-26 17:51:26 +02:00
Jose Gonzalez 5fdf65c440 Modified the mode of creation of agents with API 2019-09-26 17:33:51 +02:00
artica 574d9b13d6 Updated version and build strings. 2019-09-26 16:32:58 +02:00
Daniel Rodriguez c9cfbf0bf2 Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop' 
Ent 4461 configuracion integracion integria

See merge request artica/pandorafms!2732
 2019-09-26 14:34:50 +02:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Luis Calvo 8284dfc44f Removed item agent/modules from templates 2019-09-26 10:32:36 +02:00
alejandro-campos ad01cd0303 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-26 09:48:13 +02:00
alejandro-campos 91f90d07d6 minor fixes in integria integration 2019-09-26 09:44:58 +02:00
artica 0dd0c4c36d Auto-updated build strings. 2019-09-26 00:01:08 +02:00
Tatiana Llorente 5436df5575 Changed the word incident for ticket - #4461 2019-09-25 16:13:37 +02:00
marcos.alconada 93941f334a the itil type is removed in the report types 2019-09-25 16:12:57 +02:00
Tatiana Llorente 84ae4a8391 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 
Conflicts:
	pandora_console/extras/mr/32.sql
 2019-09-25 10:50:31 +02:00
Daniel Rodriguez e03e83d565 Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop' 
fixed error percentil label

See merge request artica/pandorafms!2734
 2019-09-25 10:27:13 +02:00
artica 0a6c5352e6 Auto-updated build strings. 2019-09-25 00:01:10 +02:00
fbsanchez 746f817fe4 Windows: Revisión general Pandora - Discovery 2019-09-24 19:07:55 +02:00
Daniel Barbero Martin 43aa13b4e5 fixed summatory series custom graph 2019-09-24 17:39:11 +02:00
Luis Calvo c93c29fd59 Added recursion to api_get_all_agents 2019-09-24 16:37:53 +02:00
alejandro-campos a5ea095734 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 2019-09-24 15:16:22 +02:00
Kike 4ae14e0888 Fixed issue with instructions in events view 2019-09-24 15:14:17 +02:00
Daniel Rodriguez 8e728eed6b Merge branch 'ent-4632-alineamiento-erroneo-en-los-headers-y-footer-con-reported-pdf' into 'develop' 
changed style on tables pdf report

See merge request artica/pandorafms!2718
 2019-09-24 12:33:46 +02:00
Daniel Rodriguez 2798512208 Merge branch 'ent-4680-fallos-en-los-reports-de-eventos' into 'develop' 
Fixed bug in report items

See merge request artica/pandorafms!2750
 2019-09-24 12:06:14 +02:00
fbsanchez 7d52614064 Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora 2019-09-24 11:25:53 +02:00
artica 1d58e25a88 Auto-updated build strings. 2019-09-24 00:01:11 +02:00
Alejandro Campos 20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-23 17:16:15 +02:00
alejandro-campos 6aa0824390 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 16:59:55 +02:00
alejandro-campos b8e1caba9d minor fixes 2019-09-23 16:59:16 +02:00
Tatiana Llorente 3bfa7fb596 Added ACL in integria tabs 2019-09-23 16:56:29 +02:00
Daniel Maya 4e47aede4c Fixed modules_get_relations 2019-09-23 16:55:43 +02:00
manuel b7ff7bc121 Fixed bug in report items 2019-09-23 15:27:06 +02:00
alejandro-campos 8d2820df37 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 15:17:22 +02:00
alejandro-campos f73cd80336 minor changes in integria integration 2019-09-23 15:16:31 +02:00
Tatiana Llorente 59eed5f1af Minor fixes - #4644 2019-09-23 15:09:52 +02:00