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

21971 Commits

Author SHA1 Message Date
artica 8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Rodriguez a12c692972 Merge branch 'ent-fix-custom-report' into 'develop' 
Fixed custom report

See merge request artica/pandorafms!4167
 2021-06-03 15:08:26 +00:00
Jose Gonzalez 08c945d91d Fixed missed buttons, improve code and added go back button when create-update 2021-06-03 15:37:11 +02:00
alejandro.campos@artica.es fb5ecaeef4 minor fixes in report item 2021-06-03 13:49:10 +02:00
Daniel Rodriguez 5040b4b265 Merge branch 'ent-7602-XSS-nombre-consolas-visuales' into 'develop' 
Improved code and fix xss vulnerability

Closes pandora_enterprise#7602

See merge request artica/pandorafms!4157
 2021-06-03 11:37:15 +00:00
Daniel Rodriguez b5802d41c7 Merge branch 'ent-7604-Vulnerabilidad-file-manager-images' into 'develop' 
Fix vulnerability with directories created in upper levels

Closes pandora_enterprise#7604

See merge request artica/pandorafms!4158
 2021-06-03 11:36:22 +00:00
alejandro.campos@artica.es b8c6922902 minor fixes in report item 2021-06-03 12:04:25 +02:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
Daniel Barbero Martin 030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
alejandro.campos@artica.es 36eb084824 minor fixes 2021-06-02 19:02:25 +02:00
alejandro.campos@artica.es 84905a6579 minor fixes in report item 2021-06-02 18:39:33 +02:00
Daniel Barbero Martin ea90a61b06 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 18:27:15 +02:00
Jose Gonzalez 7895a82268 Fixed issue with types 2021-06-02 16:06:00 +02:00
Jose Gonzalez 897a98eab6 Handle directory paths for file upload 2021-06-02 13:17:34 +02:00
alejandro.campos@artica.es 9513386ff7 prevent nonadmin users from viewing admin users in pandora search 2021-06-02 12:47:55 +02:00
Daniel Rodriguez 2edc1c73a7 Merge branch 'ent-7432-giss-11799-modulos-deshabilitados-en-servicios' into 'develop' 
Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted

See merge request artica/pandorafms!4166
 2021-06-02 10:35:32 +00:00
fbsanchez f003c37b09 Changes in disabled method - Module class 2021-06-02 10:05:31 +02:00
marcos 802dc50b79 fixed error updating item reporting 2021-06-02 09:18:40 +02:00
alejandro.campos@artica.es 24990b26f3 minor fix for pdfs 2021-06-02 09:06:39 +02:00
Junichi Satoh 740a3b6d3e Fixed following problems. 
- csv export of custom report with custom graph did not work correctly.
- number of users in default login screen was not correct with restricted user login.
 2021-06-02 15:25:33 +09:00
Daniel Barbero Martin 18f414ce5b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 08:09:32 +02:00
artica 2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00
Daniel Barbero Martin 2f536c7577 Wip command center 2021-06-01 19:36:56 +02:00
alejandro.campos@artica.es 8492a7d1c9 created agents inventory report item 2021-06-01 18:05:45 +02:00
alejandro.campos@artica.es 59834088bf created agents inventory report item 2021-06-01 18:04:01 +02:00
fbsanchez 70b8eb77a3 Remove service elements when removing items itselves and multiple fixes 2021-06-01 12:12:07 +02:00
fbsanchez a98a72354b Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted 2021-06-01 10:04:53 +02:00
alejandro.campos@artica.es 9cbe6a2924 created new report item 2021-06-01 09:43:55 +02:00
Daniel Barbero Martin ddc4b47d0b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-01 08:34:32 +02:00
artica b0e3b0aa24 Auto-updated build strings. 2021-06-01 01:00:09 +02:00
Daniel Barbero Martin a996c272e4 Wip command center 2021-05-31 17:32:53 +02:00
Daniel Barbero Martin 3a85c69043 Wip command center 2021-05-31 14:58:36 +02:00
Daniel Rodriguez 844f583b0c Merge branch 'ent-7596-ocultar-campos-http-auth-en-modulos-web' into 'develop' 
Ocultar campos http auth en modulos web en campo Web Checks

See merge request artica/pandorafms!4162
 2021-05-31 11:25:25 +00:00
alejandro.campos@artica.es 3362106afe added agents inventory report item 2021-05-31 13:13:25 +02:00
Daniel Barbero Martin 33618af381 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-31 08:40:09 +02:00
artica ff3eb72420 Auto-updated build strings. 2021-05-31 01:00:34 +02:00
artica 20d3399d39 Auto-updated build strings. 2021-05-30 01:00:20 +02:00
artica ec8ffea249 Auto-updated build strings. 2021-05-29 01:00:10 +02:00
Daniel Barbero Martin 12e67380ee Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-28 14:37:20 +02:00
Daniel Barbero Martin d88520f752 Wip command center 2021-05-28 14:32:41 +02:00
Daniel Rodriguez 9f57b02295 Merge branch 'ent-7002-Revision-cabeceras-codigo-faltante' into 'develop' 
Fixed code

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4161
 2021-05-28 12:31:14 +00:00
Calvo b253a01841 Ocultar campos http auth en modulos web en campo Web Checks 2021-05-28 14:00:43 +02:00
Jose Gonzalez cf358341fb Fixed issue with css file in meta 2021-05-28 13:47:14 +02:00
Jose Gonzalez 84902a5d3d Fixed code 2021-05-28 13:20:16 +02:00
Daniel Rodriguez 2eb85562c2 Merge branch 'ent-7468-campo-plugin-falla-bandwith-politicas' into 'develop' 
Fixed issue with id_plugin with bandwidth modules

Closes pandora_enterprise#7468

See merge request artica/pandorafms!4159
 2021-05-28 10:38:21 +00:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
marcos 29f1a8a720 resolve merge conflcit 2021-05-28 08:10:14 +02:00
artica 059b14dbf6 Auto-updated build strings. 2021-05-28 01:00:43 +02:00
José González 91e870edbc Fixed issue with id_plugin with bandwidth modules 2021-05-27 22:06:58 +02:00
Daniel Rodriguez 0b158028f3 Merge branch 'ent-7560-item-de-excxeption-no-funciona-en-metaconsola-con-not-ok' into 'develop' 
Fixed report exception item with not ok on meta

See merge request artica/pandorafms!4143
 2021-05-27 16:23:20 +00:00
Luis db306a30b9 Fixed report exception item with not ok on meta 2021-05-27 16:23:20 +00:00
Daniel Rodriguez be77599c07 Merge branch 'ent-7337-tree-view-os-no-aparecen-not-init-modules' into 'develop' 
Fixed not showing agents with not init modules on os treeview

See merge request artica/pandorafms!4120
 2021-05-27 16:22:47 +00:00
Luis cb6f130ab0 Fixed not showing agents with not init modules on os treeview 2021-05-27 16:22:47 +00:00
Daniel Rodriguez 791f007ff6 Merge branch 'ent-7502-11735-problemas-visuales-tema-oscuro' into 'develop' 
fixed visual error on alerts black theme

See merge request artica/pandorafms!4113
 2021-05-27 16:22:19 +00:00
Marcos Alconada e2cfc5d615 fixed visual error on alerts black theme 2021-05-27 16:22:19 +00:00
Daniel Rodriguez 3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop' 
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
 2021-05-27 16:21:48 +00:00
Daniel Rodriguez 0808960537 Merge branch 'ent-7259-tabla-tickets-integria-descompensada' into 'develop' 
Integria tickets table visual fix

See merge request artica/pandorafms!4003
 2021-05-27 16:21:17 +00:00
Luis 6681d9fd67 Integria tickets table visual fix 2021-05-27 16:21:17 +00:00
Daniel Rodriguez c2314717e3 Merge branch 'ent-7467-wizard-snmp-falla-para-modulos-que-usen-braa' into 'develop' 
Ent 7467 wizard snmp falla para modulos que usen braa

See merge request artica/pandorafms!4139
 2021-05-27 16:19:08 +00:00
Daniel Rodriguez f93ff84123 Merge branch 'ent-7474-boton-descolocado-en-modal-de-update-online-open' into 'develop' 
fixed visual error with update manager online open

See merge request artica/pandorafms!4105
 2021-05-27 16:17:47 +00:00
Marcos Alconada 87dd11f99c fixed visual error with update manager online open 2021-05-27 16:17:47 +00:00
José González 57eeb9a1db Fix vulnerability with directories created in upper levels 2021-05-27 16:19:51 +02:00
marcos 94cd396072 changed button position 2021-05-27 15:49:20 +02:00
José González 3aee7e7c4d Improved code and fix xss vulnerability 2021-05-27 14:55:01 +02:00
José González a495b96bd6 Fix dashboards ACLs 2021-05-27 12:16:17 +02:00
alejandro.campos@artica.es 7abe6d5446 created new report item 2021-05-27 11:22:01 +02:00
marcos 403f326f55 resolve merge conflcit 2021-05-27 09:57:06 +02:00
Daniel Barbero Martin a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
artica 9103f671e2 Auto-updated build strings. 2021-05-27 01:00:43 +02:00
fbsanchez 50242d3030 OID fixes while retrieving from remote Satellite server 2021-05-26 17:55:30 +02:00
Daniel Barbero Martin fb4358945b Wip command center 2021-05-26 17:36:02 +02:00
Daniel Rodriguez 74b38f299e Merge branch 'ent-7183-limitar-expansion-lateral-modulos-web-data-server' into 'develop' 
Resize vertical on textarea web/data server modules css

See merge request artica/pandorafms!4011
 2021-05-26 13:39:25 +00:00
Luis 8c100e8809 Resize vertical on textarea web/data server modules css 2021-05-26 13:39:25 +00:00
Daniel Rodriguez e3cd5b6d56 Merge branch 'ent-7468-snmp-wizard-modulos-plugin-no-configuran-campo-plugin' into 'develop' 
Fixed missed parameter

Closes pandora_enterprise#7468

See merge request artica/pandorafms!4097
 2021-05-26 13:38:43 +00:00
Daniel Rodriguez cfc70da64c Merge branch 'ent-7522-Duplicate-modules-de-tipo-remote-cmd-no-clona-la-IP' into 'develop' 
Ent 7522 duplicate modules de tipo remote cmd no clona la ip

See merge request artica/pandorafms!4123
 2021-05-26 13:38:17 +00:00
Daniel Rodriguez 104205a372 Merge branch 'ent-7455-No-funciona-check-de-exec-server' into 'develop' 
Ent 7455 no funciona check de exec server

See merge request artica/pandorafms!4086
 2021-05-26 13:37:27 +00:00
Daniel Rodriguez 693e3988b9 Merge branch 'ent-7182-barra-de-busqueda-no-funciona-correctamente' into 'develop' 
Changed search bar text

See merge request artica/pandorafms!4004
 2021-05-26 13:36:47 +00:00
Daniel Rodriguez 8d847bb071 Merge branch 'ent-7544-11866-bug-en-datos-inc-con-18-digitos' into 'develop' 
Enlarge numeric data fields

See merge request artica/pandorafms!4151
 2021-05-26 13:35:50 +00:00
Daniel Rodriguez c3ea89597c Merge branch 'ent-7584-no-se-puede-cerrar-ventana' into 'develop' 
Improve code and fix issue with modal

Closes pandora_enterprise#7584

See merge request artica/pandorafms!4153
 2021-05-26 13:34:00 +00:00
Daniel Rodriguez 44ea35bb69 Merge branch 'ent-7300-email-test-solo-envia-datos-guardados' into 'develop' 
Email test working with data in text fields

See merge request artica/pandorafms!4090
 2021-05-26 13:30:36 +00:00
José González e7b59ab472 Added standarized headers 2021-05-26 10:16:23 +02:00
Daniel Barbero Martin d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
artica 22a9043378 Auto-updated build strings. 2021-05-26 01:00:45 +02:00
Daniel Rodriguez b875199f28 Merge branch 'ent-7492-bug-visual-vista-agents-alerts-no-alerts' into 'develop' 
Ent 7492 bug visual vista agents alerts no alerts

See merge request artica/pandorafms!4110
 2021-05-25 15:53:41 +00:00
Luis eb54ce9a62 Ent 7492 bug visual vista agents alerts no alerts 2021-05-25 15:53:41 +00:00
Daniel Rodriguez 96741c1864 Merge branch 'ent-7246-icono-vista-informes-y-custom-graphs' into 'develop' 
Fixed view icon on report and custom graphs

See merge request artica/pandorafms!4002
 2021-05-25 15:53:05 +00:00
Daniel Rodriguez 305941bb1d Merge branch 'ent-7361-fallos-visuales-agent-alerts' into 'develop' 
Fixed visual issues

Closes pandora_enterprise#7361

See merge request artica/pandorafms!4061
 2021-05-25 15:52:22 +00:00
Daniel Rodriguez f01eec72dc Merge branch 'ent-7460-fallo-visual-en-error-creacion-usuario' into 'develop' 
Fixed visual bug on user creation error

See merge request artica/pandorafms!4088
 2021-05-25 15:51:49 +00:00
Daniel Rodriguez d4dceb0a6c Merge branch 'ent-7344-Selector-de-Dashboards-desplazado' into 'develop' 
Ent 7344 selector de dashboards desplazado

See merge request artica/pandorafms!4089
 2021-05-25 15:51:16 +00:00
Daniel Barbero Martin 6b248da428 Wip command center 2021-05-25 17:39:21 +02:00
José González a36718c724 Improve code and fix issue with modal 2021-05-25 16:19:41 +02:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Daniel Rodriguez bbcf140466 Merge branch 'ent-4991-API-editar-scheduled-downtimes-y-añadir-eliminar-agentes-de-ellas' into 'develop' 
Ent 4991 api editar scheduled downtimes y añadir eliminar agentes de ellas

See merge request artica/pandorafms!4069
 2021-05-25 13:40:33 +00:00
Daniel Maya 7eaaa1f371 Ent 4991 api editar scheduled downtimes y añadir eliminar agentes de ellas 2021-05-25 13:40:33 +00:00
Daniel Rodriguez adb038dd5f Merge branch 'ent-7590-fallo-servicios-modulos-goliat' into 'develop' 
Fixed issue with webserver modules

Closes pandora_enterprise#7590

See merge request artica/pandorafms!4152
 2021-05-25 12:48:49 +00:00
José González e69f258f8a Fixed issue with webserver modules 2021-05-25 12:50:25 +02:00
Daniel Maya e6713c2f2c #6917 metaconsole config changes 2021-05-25 09:58:18 +00:00
fbsanchez d95eec0188 Enlarge numeric data fields 2021-05-25 09:57:23 +02:00
Daniel Barbero Martin 933f679d27 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-25 08:51:48 +02:00
artica f3d6dafad2 Auto-updated build strings. 2021-05-25 01:00:38 +02:00
Daniel Barbero Martin 337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
Daniel Barbero Martin 0b36853553 Wip command center 2021-05-24 17:35:15 +02:00
Junichi Satoh 362855a24e Fixed to follow ACL with get_agents_group_json. 2021-05-24 18:56:18 +09:00
Daniel Rodriguez 4e16f5712d Merge branch 'ent-7104-mejoras-de-legibilidad-en-correlacion-de-eventos-2' into 'develop' 
Alert correlatioin some improvements

See merge request artica/pandorafms!4147
 2021-05-24 09:26:17 +00:00
artica 3388bfa699 Auto-updated build strings. 2021-05-24 01:00:35 +02:00
artica 5366b40ac3 Auto-updated build strings. 2021-05-23 01:00:27 +02:00
artica 01e811254e Auto-updated build strings. 2021-05-22 01:00:37 +02:00
Daniel Rodriguez 5fbfacd718 Merge branch 'ent-7558-Informe-group-event-report-no-saca-datos' into 'develop' 
Fixed issue with group events in reports

Closes pandora_enterprise#7558

See merge request artica/pandorafms!4144
 2021-05-21 12:10:04 +00:00
Daniel Rodriguez 85565ef7f9 Merge branch 'ent-7549-error-de-carga-link-publico-consolas-visuales' into 'develop' 
Ent 7549 error de carga link publico consolas visuales

See merge request artica/pandorafms!4140
 2021-05-21 12:09:30 +00:00
José González 52bad0e53c Added CSRF validation 2021-05-21 13:59:54 +02:00
fbsanchez 26acafac47 Alert correlatioin some improvements 2021-05-21 12:57:48 +02:00
Daniel Barbero Martin 5bc6fa9394 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-21 08:35:49 +02:00
artica f86c1c50c6 Auto-updated build strings. 2021-05-21 01:01:12 +02:00
Daniel Barbero Martin 03e857ffc8 Wip command center 2021-05-20 17:36:01 +02:00
José González 11d1b785b2 Fixed issue with group events in reports 2021-05-20 14:44:40 +02:00
Daniel Barbero Martin 73454dd4ea Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-20 08:21:31 +02:00
artica 63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
Daniel Rodriguez 22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop' 
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
 2021-05-19 16:02:34 +00:00
Daniel Rodriguez 4ea790a649 Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop' 
Ent 7141 vulnerabilities csrf

Closes pandora_enterprise#7141

See merge request artica/pandorafms!4015
 2021-05-19 16:00:16 +00:00
fbsanchez 4711ca4856 Avoid connection accumulation 2021-05-19 17:44:07 +02:00
Daniel Maya 9559a63c3b #7555 fixed module_search with filter 2021-05-19 17:11:41 +02:00
Daniel Barbero Martin 8c0a9859a8 remove synch old and check api 2021-05-19 17:08:13 +02:00
fbsanchez 538e7beb48 Public access using PublicLogin interface 2021-05-19 11:57:17 +02:00
fbsanchez 09ccaf254e Fixed public access and added PublicLogin interface, including code style fixex 2021-05-19 11:31:52 +02:00
fbsanchez 4b114e63a4 Minor fix 2021-05-19 10:13:25 +02:00
Daniel Barbero Martin 3eba993c5c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-19 08:36:26 +02:00
artica f3eb560518 Auto-updated build strings. 2021-05-19 01:00:46 +02:00
fbsanchez 8fc438f913 Fix in item load vc-public link 2021-05-18 18:50:01 +02:00
fbsanchez 074fadda35 Fix in item load vc-public link 2021-05-18 18:49:20 +02:00
Daniel Barbero Martin 6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
José González 91d11bd4cf Controlled pandora_revent with id_agent 0 2021-05-18 16:37:05 +02:00
José González 46e0cbca70 id_agent control for pandora_revent 2021-05-18 14:52:23 +02:00
José González e5ebc52356 Fixed missed parameter 2021-05-18 13:32:10 +02:00
fbsanchez 876e3dd191 Minor fix - linter return type in comments set to mixed 2021-05-18 13:27:56 +02:00
fbsanchez 0d50ea94db Ensure oid starts with dot - braa requriements 2021-05-18 13:27:06 +02:00
Daniel Barbero Martin 5d70226b13 fix category, Os, tags, user_edit synch 2021-05-18 11:02:00 +02:00
Daniel Barbero Martin ec6cb4d532 fix category, Os, tags, user_edit synch 2021-05-18 10:57:21 +02:00
fbsanchez 9666b76fa9 Common requirements using base url 2021-05-18 10:56:40 +02:00
Daniel Barbero Martin a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
 2021-05-18 08:39:06 +02:00
artica 739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Barbero Martin 4c12c6e770 fix profiles and user synch 2021-05-17 17:57:08 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
fbsanchez 4f7ec16467 avoid maintenance warning 2021-05-17 14:37:01 +02:00
alejandro.campos@artica.es 663d1dcf75 minor fix 2021-05-17 13:43:20 +02:00
José González 7617330e93 Added agent regex to console task template send email 2021-05-17 13:31:46 +02:00
fbsanchez 818186ff28 DB updates - syncqueue 2021-05-17 12:57:15 +02:00
Daniel Barbero Martin bc6a838ebb WIP command center, fix view synch queue 2021-05-17 12:35:29 +02:00
Daniel Rodriguez a6f41ede3d Merge branch 'ent-7521-Dynamic-Threshold-max-desactivado-por-error' into 'develop' 
Fixed issue with undesired deactivate dynamic threshold max field

Closes pandora_enterprise#7521

See merge request artica/pandorafms!4130
 2021-05-17 08:07:11 +00:00
Daniel Rodriguez 8b704cb2c1 Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas-2' into 'develop' 
new bell orange

See merge request artica/pandorafms!4131
 2021-05-17 08:06:37 +00:00
Daniel Barbero Martin 1526dac01d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-17 08:35:52 +02:00
artica d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica 8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
alejandro.campos@artica.es 1c1e25e712 Added new item type in reports 2021-05-14 14:54:09 +02:00
marcos 9cde309222 new bell orange 2021-05-14 11:58:08 +02:00
Daniel Rodriguez 203310d13b Merge branch 'ent-7538-traza-en-tree-view-nodo' into 'develop' 
remove vamos a ver

See merge request artica/pandorafms!4126
 2021-05-14 09:39:07 +00:00
Daniel Rodriguez 823eb96d47 Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas' into 'develop' 
changed bell orange

See merge request artica/pandorafms!4127
 2021-05-14 09:38:47 +00:00
Daniel Rodriguez 5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' 
Create interface views

See merge request artica/pandorafms!4023
 2021-05-14 09:37:48 +00:00
José González 998fb4b0dc Fixed issue with undesired deactivate dynamic threshold max field 2021-05-14 11:22:32 +02:00
alejandro.campos@artica.es 2c065d6f38 visual fix 2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es 86447e2a0b visual fix 2021-05-14 10:10:42 +02:00
Daniel Barbero Martin 3f509ebd09 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-14 08:36:58 +02:00
artica 9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +02:00
alejandro.campos@artica.es 1a194e1644 minor change 2021-05-13 14:10:42 +02:00
alejandro.campos@artica.es b52f971262 minor change 2021-05-13 14:06:54 +02:00
alejandro.campos@artica.es 172afc9070 minor change 2021-05-13 13:40:09 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez 3a76d6e680 Merge branch 'ent-7156-eliminar-agente-desde-meta-no-borra-ficheros' into 'develop' 
Added comments header and improve code

Closes pandora_enterprise#7156

See merge request artica/pandorafms!3986
 2021-05-13 11:14:44 +00:00
marcos 40cfe62e96 changed bell orange 2021-05-13 13:14:16 +02:00
marcos d711d71392 remove vamos a ver 2021-05-13 13:09:42 +02:00
Daniel Maya a869e0749c #7505 fixed fixed Hirearchy 2021-05-13 10:11:58 +02:00
Daniel Barbero Martin 5b376568a4 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/47.sql
 2021-05-13 08:25:59 +02:00
artica afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +02:00
Daniel Rodriguez 13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
José González 3758c80019 Fixed delete_files entries. 2021-05-12 13:07:45 +00:00
Daniel Rodriguez 6aa1188d35 Merge branch 'ent-7111-acciones-alertas-snmp-no-se-guardan' into 'develop' 
Added missing fields to alert snmp actions

See merge request artica/pandorafms!3927
 2021-05-12 12:54:37 +00:00
Luis 7d56552e72 Added missing fields to alert snmp actions 2021-05-12 12:54:36 +00:00
Daniel Rodriguez ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' 
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
 2021-05-12 12:52:44 +00:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
Daniel Maya a08a69fa91 #7522 fixed duplicate ip_target 2021-05-12 12:39:56 +02:00
Daniel Rodriguez 4e871ed296 Merge branch 'ent-6983-typo-en-traduccion' into 'develop' 
fixed wrong string

See merge request artica/pandorafms!4099
 2021-05-12 07:55:09 +00:00
Daniel Barbero Martin ad03bc41aa Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-12 08:41:00 +02:00
artica 671c1ca0a3 Auto-updated build strings. 2021-05-12 01:00:48 +02:00
Daniel Rodriguez 8a3d977e82 Merge branch 'ent-5401-Búsqueda-de-módulo-por-ID-al-llegar-desde-link-de-consola' into 'develop' 
Ent 5401 búsqueda de módulo por id al llegar desde link de consola

See merge request artica/pandorafms!4026
 2021-05-11 15:38:01 +00:00
Daniel Rodriguez dcbeaa1b3e Merge branch 'ent-7295-bug-visual-en-modal-eventos' into 'develop' 
Fixed visual bug on event modal event responses

See merge request artica/pandorafms!4022
 2021-05-11 13:49:40 +00:00
Luis b9398604f6 Fixed visual bug on event modal event responses 2021-05-11 13:49:40 +00:00
Daniel Rodriguez 858adb2628 Merge branch 'ent-7345-Bugs-en-el-apartado-de-Diagnosticos' into 'develop' 
Fixed errors diagnostic

See merge request artica/pandorafms!4047
 2021-05-11 13:48:55 +00:00
Daniel Maya 9c234eef85 Ent 7087 mensaje duplicado en los test mails 2021-05-11 13:48:09 +00:00
José González 5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-05-11 13:11:51 +00:00
Daniel Rodriguez 128f67b058 Merge branch 'ent-7139-clickjacking' into 'develop' 
Avoiding clickjacking

Closes pandora_enterprise#7139

See merge request artica/pandorafms!4013
 2021-05-11 09:45:08 +00:00
Daniel Rodriguez fb539be410 Merge branch 'ent-7479-Integracion-Integria-IMS-falla-subida-de-adjuntos' into 'develop' 
fixed bug in file attachment

See merge request artica/pandorafms!4102
 2021-05-11 07:40:54 +00:00
Daniel Rodriguez 89dcde6ca7 Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop' 
minor changes

See merge request artica/pandorafms!4107
 2021-05-11 07:40:24 +00:00
Daniel Rodriguez f77d774a32 Merge branch 'ent-7476-black-theme-color-letra-en-el-control-de-busqueda-de-usuarios-no-se-ve' into 'develop' 
fixed visual error black theme

See merge request artica/pandorafms!4100
 2021-05-11 07:39:58 +00:00
Daniel Rodriguez ac0ef3c61c Merge branch 'ent-7475-Mejor-interfaz-de-configuracion-en-integracion-Integria' into 'develop' 
minor change in integria ims setup

See merge request artica/pandorafms!4104
 2021-05-11 07:39:16 +00:00
Daniel Rodriguez de58f0533b Merge branch 'ent-6618-giss-nombres-de-servicios-aleatorios' into 'develop' 
Ent 6618 giss nombres de servicios aleatorios

See merge request artica/pandorafms!4039
 2021-05-11 07:37:49 +00:00
Daniel Rodriguez 197e156869 Merge branch 'ent-5264-Report-vacio-mails-console-tasks' into 'develop' 
Added function for use templates in emails

Closes pandora_enterprise#5264

See merge request artica/pandorafms!4027
 2021-05-11 07:35:01 +00:00
Daniel Barbero Martin c19e398057 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-11 07:37:56 +02:00
artica 6bdd983755 Auto-updated build strings. 2021-05-11 01:00:46 +02:00