Commit Graph

14384 Commits

Author SHA1 Message Date
fbsanchez 1c94f619ef Custom graphs in widget in MC 2021-04-06 14:20:07 +02:00
fbsanchez 55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
fbsanchez 38a6d65f60 Merge remote-tracking branch 'origin/develop' into ent-2685-7938-aadcm-dashboards-en-metaconsola 2021-04-06 11:01:20 +02:00
Jose Gonzalez a9a1a7ccb8 Added function for safe html symbols tag 2021-04-06 10:36:43 +02:00
artica 247343c0b6 Auto-updated build strings. 2021-04-06 01:02:48 +02:00
José González bfaf8a8794 WIP: Backup upload 2021-04-05 17:55:46 +02:00
marcos 78ce8660c9 fixed visual error 2021-04-05 17:27:40 +02:00
marcos ac286a438c set labels white color on module interval svg 2021-04-05 11:41:36 +02:00
artica 31a8fd6c55 Auto-updated build strings. 2021-04-05 01:00:42 +02:00
artica 4811e45bf2 Auto-updated build strings. 2021-04-04 01:00:37 +02:00
artica 95e437252b Auto-updated build strings. 2021-04-03 01:00:36 +02:00
artica 2f4eaacb6a Auto-updated build strings. 2021-04-02 01:00:33 +02:00
artica 10ea68f33f Auto-updated build strings. 2021-04-01 01:00:11 +02:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola'
Conflicts:
   pandora_console/include/functions_html.php
2021-03-31 10:12:36 +00:00
Jose Gonzalez 5eeb3423f0 Solve merge 2021-03-31 10:29:57 +02:00
artica 321fc8aa05 Auto-updated build strings. 2021-03-31 01:00:44 +02:00
Jose Gonzalez a8e3c10846 Added comments header and improve code 2021-03-30 16:31:45 +02:00
Daniel Maya f004cfc276 trace removed 2021-03-30 16:20:46 +02:00
Daniel Rodriguez 8a62fa67ad Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop'
Ent 7171 iconos poco visibles en monitor detail black theme

See merge request artica/pandorafms!3929
2021-03-30 09:51:04 +00:00
marcos 063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
Calvo 245286330c Fixed treeview filter by module status 2021-03-30 08:28:10 +02:00
artica 8b92c0ffc1 Auto-updated build strings. 2021-03-30 01:00:51 +02:00
marcos 5d38740630 resolved error with sql message error external tools2 2021-03-29 16:54:41 +02:00
artica 96d63e2029 Updated version and build strings. 2021-03-29 14:57:41 +02:00
Jose Gonzalez 5e125a33c3 Fixed lints 2021-03-29 14:42:51 +02:00
Jose Gonzalez 001b547fb0 Fixed issue with duplicate web server modules 2021-03-29 14:07:57 +02:00
Daniel Rodriguez 4fa790dd7f Merge branch 'ent-7202-fallos-visuales-discovery' into 'develop'
Ent 7202 fallos visuales discovery

See merge request artica/pandorafms!3953
2021-03-29 09:49:31 +00:00
Calvo bc7584f259 Fixed api add user profile with group all 2021-03-29 10:51:02 +02:00
marcos 1f89a0d293 fixed visual error 2021-03-29 09:58:23 +02:00
Daniel Rodriguez d01c3e1c92 Merge branch 'ent-7215-fallos-vista-eventos' into 'develop'
fixed visual error

See merge request artica/pandorafms!3961
2021-03-29 07:23:03 +00:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
marcos 3934096d03 Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery 2021-03-29 09:21:04 +02:00
Daniel Rodriguez 04483fe9f3 Merge branch 'ent-7210-Bug-en-token-limit-de-widget-List-of-last-events' into 'develop'
fixed minor error

See merge request artica/pandorafms!3958
2021-03-29 07:15:32 +00:00
marcos 88f3ce9b90 fixed lost icons 2021-03-29 08:12:54 +02:00
artica 3e8214850f Auto-updated build strings. 2021-03-29 01:00:18 +02:00
artica cf78261d0b Auto-updated build strings. 2021-03-28 01:00:14 +01:00
artica e46845e864 Auto-updated build strings. 2021-03-27 01:00:19 +01:00
Daniel Rodriguez c5d6daa018 Merge branch 'ent-7207-error-visual-en-relaciones-de-network-maps' into 'develop'
fixed visual error

See merge request artica/pandorafms!3968
2021-03-26 13:41:31 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
marcos 89ba8b43fb fixed visual error 2021-03-26 13:58:13 +01:00
fbsanchez a3e571ff50 Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect
Conflicts:
	pandora_console/godmode/users/user_list.php
2021-03-26 13:52:01 +01:00
Daniel Rodriguez 1f74bd071c Merge branch 'ent-7221-icono-lupa-cambiado-por-ojo' into 'develop'
Substituted eye with operation (magnifier) icon on credential store and tasklist

See merge request artica/pandorafms!3964
2021-03-26 12:05:29 +00:00
Daniel Rodriguez 316aa0a691 Merge branch 'ent-7222-Bug-en-widget-Defined-custom-graph' into 'develop'
fixed minor error

See merge request artica/pandorafms!3960
2021-03-26 11:39:14 +00:00
Calvo 2c86e3e26c Substituted eye with operation (magnifier) icon on credential store and tasklist 2021-03-26 12:20:37 +01:00
Daniel Barbero Martin 021675d825 fixed minor error 2021-03-26 11:28:34 +01:00
Daniel Barbero Martin 193d6bf2d2 fixed minor error 2021-03-26 10:37:44 +01:00
Daniel Barbero Martin 8e57e1645c fixed minor error 2021-03-26 10:34:07 +01:00
Daniel Rodriguez b9f0ac8239 Merge branch 'ent-7205-fallos-visuales-en-monitoring' into 'develop'
fixed visual error

See merge request artica/pandorafms!3955
2021-03-26 09:32:30 +00:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Daniel Rodriguez 17c923a68b Merge branch 'ent-7204-error-visual-en-agents-module' into 'develop'
fixed visual error

See merge request artica/pandorafms!3954
2021-03-26 09:32:08 +00:00
Daniel Barbero Martin 9dd7ee7cbc fixed minor error 2021-03-26 09:15:05 +01:00
Junichi Satoh d4b8916c54 Fixed following problems.
- alert actions cannot be copied/removed by any users
- alert actions cannot be modified by users with 'LM' even if alerts belong to the same group of users.

And users with 'LM' can now copy alert actions/templates in All group to the group to which the user belongs.
2021-03-26 17:11:10 +09:00
artica c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +01:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop'
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
2021-03-25 14:33:31 +00:00
Daniel Rodriguez 26577095d7 Merge branch 'ent-7193-submenu-ocultado-en-arbol-de-discovery' into 'develop'
fixed visual error

See merge request artica/pandorafms!3939
2021-03-25 14:08:35 +00:00
marcos b8a72f0583 fixed visual error 2021-03-25 14:42:34 +01:00
marcos ec4f23e502 fixed visual error 2021-03-25 14:36:51 +01:00
marcos b7f845a64d fixed visual error 2021-03-25 14:27:41 +01:00
fbsanchez 7b7ef3a757 minor improvement (err. messages) 2021-03-25 14:25:09 +01:00
marcos a6b9998bbe fixed visual error 2021-03-25 13:42:21 +01:00
marcos f5ceb2384e fixed visual error 2021-03-25 12:35:40 +01:00
Daniel Rodriguez 1d374fca46 Merge branch 'ent-2561-llamadas-api-para-modulos-de-politicas' into 'develop'
minor changes

See merge request artica/pandorafms!3779
2021-03-25 09:57:53 +00:00
Daniel Rodriguez f99e4763e2 Merge branch 'ent-7197-estilos-log-viewer' into 'develop'
Fix some documentary issues

Closes pandora_enterprise#7197

See merge request artica/pandorafms!3948
2021-03-25 09:53:41 +00:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
artica 1934c04388 Auto-updated build strings. 2021-03-25 01:00:21 +01:00
fbsanchez f046069de1 old-school style setup 2021-03-24 17:49:42 +01:00
José González 9918e7c3cd Merge branch 'develop' into 'ent-6858-Goliat-opensource'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
2021-03-24 15:50:12 +00:00
fbsanchez 12767683dc minor fixes 2021-03-24 16:25:27 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez ac1c3398fe Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-03-24 16:05:08 +01:00
fbsanchez d312f764ed Hack to use old functions from PandoraDB 2021-03-24 13:43:14 +01:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
marcos eaed8aa09a fixed visual error 2021-03-24 13:10:29 +01:00
Daniel Rodriguez 9f22c061f5 Merge branch 'ent-5929-revision-general-logstash' into 'develop'
Deleted logstash references

Closes pandora_enterprise#5929

See merge request artica/pandorafms!3729
2021-03-24 11:57:47 +00:00
Jose Gonzalez af98637680 Fix some documentary issues 2021-03-24 12:45:25 +01:00
Daniel Rodriguez ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop'
Command center

See merge request artica/pandorafms!3887
2021-03-24 11:43:52 +00:00
daniel 774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
fbsanchez 6cd393edef Style fix 2021-03-24 12:33:36 +01:00
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
2021-03-24 09:55:31 +01:00
artica 00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
Daniel Rodriguez 2597c2c7fc Merge branch 'ent-7188-bug-visual-en-tactical-view-metaconsola' into 'develop'
fixed visual error

See merge request artica/pandorafms!3940
2021-03-23 15:56:02 +00:00
Daniel Rodriguez 61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop'
add tooltip service name

See merge request artica/pandorafms!3783
2021-03-23 15:55:28 +00:00
Marcos Alconada 302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
José González 6fbd40ea74 Merge branch 'develop' into 'ent-5929-revision-general-logstash'
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
2021-03-23 12:00:45 +00:00
Daniel Rodriguez 0a31f7f165 Merge branch 'ent-7185-snmp-browser-ventana-de-info-de-OID-descuadrada' into 'develop'
fixed visual error

See merge request artica/pandorafms!3942
2021-03-23 09:29:39 +00:00
Daniel Rodriguez f92c75639a Merge branch 'ent-7089-11446-trazas-en-el-codigo-de-release' into 'develop'
Removed extra verbosity

See merge request artica/pandorafms!3899
2021-03-23 09:29:05 +00:00
Daniel Maya 131a04a4ce Fixed api get all agents 2021-03-23 09:55:57 +01:00
Daniel Maya 64c3e35e85 Added target port 2021-03-23 08:56:52 +01:00
artica b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
fbsanchez 659c1b4503 Wizard Aws.S3 RC1 2021-03-22 19:21:05 +01:00
Daniel Rodriguez 67c0968864 Merge branch 'ent-7190-bug-icono-wux-en.vista-de-modulos' into 'develop'
fixed visual error

See merge request artica/pandorafms!3941
2021-03-22 16:59:57 +00:00
Jose Gonzalez 4ee0c580bb WIP: Backup upload 2021-03-22 17:52:11 +01:00
Jose Gonzalez d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01:00
marcos 51ea2d569d fixed visual error 2021-03-22 17:02:30 +01:00
marcos 69fe389afc fixed visual error 2021-03-22 16:42:19 +01:00
marcos adadd40399 fixed visual error 2021-03-22 16:34:29 +01:00
marcos b6c02bd95c fixed visual error 2021-03-22 15:21:09 +01:00
fbsanchez d73ba6a2e5 Merge remote-tracking branch 'origin/develop' into ent-6377-proyectos-amazon-s3-en-el-discovery 2021-03-22 15:16:10 +01:00
daniel b258f409b9 Mode ghost for disabled modules and agents 2021-03-22 14:10:14 +00:00
marcos 31e6d75229 fixed error with label reporting views 2021-03-22 14:28:12 +01:00
Daniel Rodriguez 390d9df706 Merge branch 'ent-7173-Iconos-de-creacion-de-items-en-consolas-visuales-apenas-se-ven' into 'develop'
fixed visuals errors black theme

See merge request artica/pandorafms!3937
2021-03-22 12:48:39 +00:00
Daniel Rodriguez 8f33c767b7 Merge branch 'ent-7132-bug-en-vista-agents-alerts' into 'develop'
fixed visual error

See merge request artica/pandorafms!3911
2021-03-22 12:46:58 +00:00
Daniel Rodriguez 8db123d364 Merge branch 'ent-7180-spinner-de-snmp-browere-ha-desaparecido' into 'develop'
fixed spinner bug

See merge request artica/pandorafms!3933
2021-03-22 12:46:02 +00:00
Daniel Rodriguez a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop'
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
2021-03-22 12:39:59 +00:00
marcos c9f0b138b0 fixed error with label reporting views 2021-03-22 12:24:58 +01:00
marcos d5df7bf9ce fixed error with label reporting views 2021-03-22 12:01:17 +01:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
2021-03-22 09:59:07 +01:00
artica 49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica 2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica 3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
marcos ebf912437b fixed error with sort function 2021-03-18 18:05:53 +01:00
Daniel Rodriguez da4c5a1c28 Merge branch 'ent-7167-meta-varios-botones-y-ventanas-descuadradas' into 'develop'
fixed visual errors

See merge request artica/pandorafms!3925
2021-03-18 17:05:50 +00:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
Daniel Barbero Martin 6d6b9fe5b9 fixed visuals errors black theme 2021-03-18 17:32:21 +01:00
Daniel Rodriguez 8eb06d8adc Merge branch 'ent-6753-consistencia-en-el-selector-de-grupos' into 'develop'
group selector updates for report, required

See merge request artica/pandorafms!3763
2021-03-18 16:05:16 +00:00
Daniel Rodriguez 3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop'
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
2021-03-18 16:02:56 +00:00
marcos bfaaba9dbd fixed spinner bug 2021-03-18 12:08:02 +01:00
fbsanchez ddb58f56e9 errata fix 2021-03-18 11:48:52 +01:00
marcos b55ebd69f0 fixed visual error 2021-03-18 11:30:53 +01:00
Daniel Rodriguez c2f297c26a Merge branch 'ent-6574-mensaje-borrado-agentes-meta' into 'develop'
Fixed api agent delete and show correct message when called by meta wizard

See merge request artica/pandorafms!3892
2021-03-18 10:01:22 +00:00
Luis 085b5ece87 Fixed api agent delete and show correct message when called by meta wizard 2021-03-18 10:01:21 +00:00
Daniel Rodriguez cb1da6d7ba Merge branch 'ent-7062-vulneravilidad-xx-en-mensajes' into 'develop'
fixed xss vulnerability

See merge request artica/pandorafms!3861
2021-03-18 10:00:35 +00:00
Marcos Alconada 9040e832b8 fixed xss vulnerability 2021-03-18 10:00:34 +00:00
fbsanchez 38695482c0 Validate custom text 2021-03-18 10:35:41 +01:00
marcos 13575a457c fixed visual error 2021-03-18 10:35:19 +01:00
fbsanchez a3069fdf76 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 2021-03-18 10:04:18 +01:00
marcos a0607e7230 fixed visual error 2021-03-18 10:03:52 +01:00
fbsanchez f00ef1cd54 Minor changes 2021-03-18 10:03:26 +01:00
marcos b6a7598c33 fixed visual error 2021-03-18 09:53:39 +01:00
artica 572f8c9908 Auto-updated build strings. 2021-03-18 01:00:22 +01:00
Daniel Rodriguez b6b399e635 Merge branch 'ent-7170-color-de-icono-de-alertas-en-tree-view-black-theme' into 'develop'
fixed visual error

See merge request artica/pandorafms!3926
2021-03-17 16:29:41 +00:00
Daniel Rodriguez 372d367b8e Merge branch 'ent-6760-interfaces-con-guion-nombre-no-generan-correctamente' into 'develop'
Fixed interfaces wizard modules genartion wit hypen

See merge request artica/pandorafms!3694
2021-03-17 16:29:07 +00:00
Luis e667bdd2e8 Fixed interfaces wizard modules genartion wit hypen 2021-03-17 16:29:07 +00:00
marcos 667ccd50ce fixed visual error 2021-03-17 16:44:10 +01:00
Daniel Rodriguez 3eb6a8b3c4 Merge branch 'ent-7125-bug-visual-en-group-view' into 'develop'
fixed visual error group view

See merge request artica/pandorafms!3897
2021-03-17 15:22:01 +00:00
marcos 0195a80b78 fixed visual error 2021-03-17 14:41:36 +01:00
marcos 1ea562fe17 fixed visual error 2021-03-17 13:22:11 +01:00
artica 610d41290e Auto-updated build strings. 2021-03-17 01:00:20 +01:00
Daniel Rodriguez 2c05a1fe72 Merge branch 'ent-7164-iconos-cambiados-en-varias-vistas' into 'develop'
fixed icons

See merge request artica/pandorafms!3923
2021-03-16 17:01:35 +00:00
Daniel Rodriguez aa1e5022a2 Merge branch 'ent-7126-recuperar-selector-de-temas-en-setup-visual' into 'develop'
revert selector theme

See merge request artica/pandorafms!3915
2021-03-16 16:49:43 +00:00
Daniel Rodriguez 6745fb7c7a Merge branch 'ent-7150-Bug-en-edicion-de-dashboard' into 'develop'
fixed visual error dashboards

See merge request artica/pandorafms!3908
2021-03-16 16:46:38 +00:00
Daniel Rodriguez 24f9ce7acf Merge branch 'ent-7160-SNMP-Browser-no-saca-las-opciones-de-v3' into 'develop'
fixed errors visual snmp browser

See merge request artica/pandorafms!3918
2021-03-16 16:42:51 +00:00
Daniel Rodriguez 128fabfde2 Merge branch 'ent-6648-Añadir-agentes-a-politicas-metaconsola' into 'develop'
Ent 6648 añadir agentes a politicas metaconsola

See merge request artica/pandorafms!3912
2021-03-16 16:41:13 +00:00
marcos df8695b015 fix green old theme 2021-03-16 16:25:09 +01:00
Calvo 58dc4aee0d General report exponent prefix shows with blankspace 2021-03-16 13:37:57 +01:00
marcos e689813e2c fixed icons 2021-03-16 13:37:13 +01:00
fbsanchez 2862afb7f5 Multicolumn setup for performance and visual settings 2021-03-16 13:00:24 +01:00
Daniel Barbero Martin e4a6c8c876 fixed errors visual snmp browser 2021-03-16 11:44:44 +01:00
Daniel Maya 11c445106c Added csv log in metaconsole 2021-03-16 11:31:43 +01:00
Calvo 8ed48776ee Addded param to escape API url call raw_decode 2021-03-16 11:03:15 +01:00
Daniel Rodriguez eea114e3d1 Merge branch 'ent-7119-Ticket-GUARDIA-SNMPBrowser-falla-a-la-hora-de-visualizar-datos-2' into 'develop'
Ent 7119 ticket guardia snmp browser falla a la hora de visualizar datos 2

See merge request artica/pandorafms!3903
2021-03-16 09:13:44 +00:00
alejandro.campos@artica.es 75d57c41ac remove constant 2021-03-16 09:22:43 +01:00
alejandro.campos@artica.es 8dc6ec4e07 added setup token 2021-03-16 09:21:16 +01:00
artica df269f52c1 Auto-updated build strings. 2021-03-16 01:00:18 +01:00
marcos 4c5f220264 fixed visual error 2021-03-15 17:55:54 +01:00
Daniel Barbero Martin 2b8b27a863 fixed visual error dashboards 2021-03-15 15:42:22 +01:00
fbsanchez c20c206a5f Fixed task edit url when nof fully defined (custom-script) 2021-03-15 14:37:08 +01:00
Daniel Maya e4e3007def Fixed img 2021-03-15 13:32:25 +01:00
Daniel Barbero Martin b78f4093ac fixed error tree groups agent edition metaconsole 2021-03-15 13:31:24 +01:00
Daniel Barbero Martin bf4710ba93 fixed error events reports 2021-03-15 13:26:29 +01:00
fbsanchez 1762e758fa forced no display_errors 2021-03-15 10:09:02 +01:00
artica fc29160c91 Auto-updated build strings. 2021-03-15 01:00:15 +01:00
artica 0f848d48e8 Auto-updated build strings. 2021-03-14 01:00:14 +01:00
artica 5fca622b3b Auto-updated build strings. 2021-03-13 01:00:19 +01:00
Daniel Rodriguez 5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop'
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Daniel Rodriguez 7723ef6e23 Merge branch 'ent-6846-Network-tools-al-setup-general' into 'develop'
Ent 6846 network tools al setup general

Closes pandora_enterprise#6846

See merge request artica/pandorafms!3735
2021-03-12 11:01:05 +00:00
marcos de716ddc4a fixed visual error group view 2021-03-12 11:55:54 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00
marcos 7f46d078c0 fixed error with snmpbrower modal 2021-03-12 09:32:07 +01:00
artica d4bf4b9cad Auto-updated build strings. 2021-03-12 01:00:20 +01:00
fbsanchez b48af30d96 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos
Conflicts:
	pandora_console/godmode/reporting/create_container.php
	pandora_console/godmode/reporting/graph_builder.main.php
	pandora_console/godmode/reporting/reporting_builder.main.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/include/javascript/pandora_ui.js
	pandora_console/views/dashboard/formDashboard.php
2021-03-11 17:47:27 +01:00
Daniel Maya 2f7d0f1795 fixed permissions on response 2021-03-11 16:11:06 +01:00
Daniel Rodriguez 16ee65ba95 Merge branch 'ent-6781-revision-de-estilos-visuales-y-eliminacion-de-sistemas-skins' into 'develop'
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins

See merge request artica/pandorafms!3699
2021-03-11 14:40:24 +00:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 1f64b598c8 Merge branch 'ent-7098-Solucion-para-mostar-datos-de-estado-warning' into 'develop'
new report histogram

See merge request artica/pandorafms!3875
2021-03-11 14:22:28 +00:00
daniel 54fc2e89d3 new report histogram 2021-03-11 14:22:28 +00:00
fbsanchez 6df9870f92 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas
Conflicts:
	pandora_console/include/functions_api.php
	visual_console_client/src/Item.ts
2021-03-11 14:37:06 +01:00
Daniel Maya c7b33c9c9c Ent 7119 11478 ticket guardia snmp browser falla a la hora de visualizar datos 2021-03-11 11:18:13 +00:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
2021-03-11 10:00:17 +01:00
Jose Gonzalez cf1c460a9d Fixed all issues 2021-03-11 09:12:53 +01:00
artica 74fb084ba5 Auto-updated build strings. 2021-03-11 01:00:18 +01:00
Daniel Rodriguez 988b6826fc Merge branch 'ent-7065-Modificar-scripts-generacion-y-publicacion-de-paquetes' into 'develop'
cambio de dominio

See merge request artica/pandorafms!3888
2021-03-10 16:01:39 +00:00
Daniel Rodriguez 2422813a29 Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop'
visual fixes in agent view graphs

See merge request artica/pandorafms!3884
2021-03-10 15:56:15 +00:00
Daniel Rodriguez 3db990ba36 Merge branch 'ent-6559-Cambio-en-el-target-ip-al-crear-módulos-desde-el-browser-snmp' into 'develop'
Ent 6559 cambio en el target ip al crear módulos desde el browser snmp

See merge request artica/pandorafms!3751
2021-03-10 15:53:55 +00:00
Jose Gonzalez 92d654763f Fixed some issues 2021-03-10 16:20:45 +01:00
José González b7bd28ba07 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
2021-03-10 10:17:27 +00:00
artica e34a1c47c8 Auto-updated build strings. 2021-03-10 01:01:06 +01:00
Daniel Rodriguez c8bc516b5d Merge branch 'ent-6830-item-Servicios-Consolas-Visuales' into 'develop'
Fixed VC service title %

See merge request artica/pandorafms!3854
2021-03-09 16:39:56 +00:00
daniel b434e05376 Fixed VC service title % 2021-03-09 16:39:55 +00:00
Daniel Rodriguez 4996be48dc Merge branch 'ent-6966-No-se-ve-fecha-validacion' into 'develop'
Fixed issue with date

Closes pandora_enterprise#6966

See merge request artica/pandorafms!3818
2021-03-09 16:37:34 +00:00
Daniel Rodriguez 011507f065 Merge branch 'ent-6832-Item-historico-de-eventos-Consolas-Visuales' into 'develop'
Fixed VC events history

See merge request artica/pandorafms!3850
2021-03-09 16:36:37 +00:00
daniel 0c5cfcc90e Fixed VC events history 2021-03-09 16:36:37 +00:00
Daniel Rodriguez d992b818b2 Merge branch 'ent-6568-setup-module-library-no-se-puede-borrar-usuario' into 'develop'
Module library user pass let empty user/pass

See merge request artica/pandorafms!3706
2021-03-09 16:34:22 +00:00
Daniel Rodriguez 868694ba24 Merge branch 'ent-6968-Ordenar-servicios-por-descripcion-tree-view' into 'develop'
Fixed sorting by description

Closes pandora_enterprise#6968

See merge request artica/pandorafms!3825
2021-03-09 16:33:12 +00:00
Daniel Rodriguez 950b7bcdfd Merge branch 'ent-5140-Añadir-summary-al-availability-graph' into 'develop'
add summary report availability graph

See merge request artica/pandorafms!3709
2021-03-09 16:32:12 +00:00
daniel 6e0188fac1 add summary report availability graph 2021-03-09 16:32:12 +00:00
Daniel Rodriguez 39e735ed22 Merge branch 'ent-5760-problema-sistema-de-notificaciones-en-servidores-con-pocos-modulos' into 'develop'
Avoid performance tests if there are not enough modules in system

See merge request artica/pandorafms!3765
2021-03-09 16:31:38 +00:00
Daniel Barbero Martin 219ca1914d cambio de dominio 2021-03-09 16:02:05 +01:00
José González 69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
2021-03-09 14:39:15 +00:00
Jose Gonzalez f0dd360786 Fixed merge 2021-03-09 12:56:59 +01:00
fbsanchez b384e97da5 Test REGEXP is valid before apply in MySQL 2021-03-09 10:17:29 +01:00
artica f9d5767027 Auto-updated build strings. 2021-03-09 01:00:17 +01:00
alejandro.campos@artica.es 0a8c478c47 visual fixes in agent view graphs 2021-03-08 17:48:59 +01:00
Jose Gonzalez 34b7c1003b Fixed error with sorting 2021-03-08 11:20:50 +01:00
Jose Gonzalez c235cfb01a Fixed 2021-03-08 08:21:45 +01:00
artica 2bd9515152 Auto-updated build strings. 2021-03-08 01:00:14 +01:00
artica 438c388423 Auto-updated build strings. 2021-03-07 01:00:17 +01:00
artica 80c568bbdd Auto-updated build strings. 2021-03-06 01:00:19 +01:00
Daniel Rodriguez 84da313641 Merge branch 'ent-6910-11185-no-cambio-parametros-llamada-api-get_module_graph' into 'develop'
Added with option for api_get_module_graph

See merge request artica/pandorafms!3770
2021-03-05 12:53:24 +00:00
Daniel Rodriguez ea7c7c88b2 Merge branch 'ent-7025-operaciones-masivas-error' into 'develop'
Ent 7025 operaciones masivas error

Closes pandora_enterprise#7025

See merge request artica/pandorafms!3833
2021-03-05 12:49:13 +00:00
Jose Gonzalez 0860b6e647 Fix ordenation with subservices 2021-03-05 13:07:53 +01:00
Jose Gonzalez df30df4637 Merge remote-tracking branch 'origin' into ent-6968-Ordenar-servicios-por-descripcion-tree-view 2021-03-05 12:37:29 +01:00
fbsanchez cfded31e1b minor fix 2021-03-05 11:18:47 +01:00
fbsanchez bcde9f940e b64 2021-03-05 11:17:50 +01:00
fbsanchez ae3d54cedf B64 included in user options 2021-03-05 11:11:19 +01:00
fbsanchez 1534fd9c40 API module graph width 2021-03-05 10:30:14 +01:00
artica eb912405a6 Auto-updated build strings. 2021-03-05 01:00:53 +01:00
Luis Calvo f8d9c00183 Fixed alert detail filter and tactical view counter for disabled alers/agents/modules 2021-03-04 20:15:40 +01:00
Daniel Maya aace7344a1 Fixed issue with id_grupo 2021-03-04 12:41:14 +01:00
Daniel Maya 1bbbbcaee1 Ent 6890 condición agentes vista sap 2021-03-04 10:57:52 +00:00
Daniel Rodriguez 6c2a353812 Merge branch 'ent-6839-Crear-llamadas-a-la-api-para-activar-o-parar-una-discovery-task' into 'develop'
Ent 6839 crear llamadas a la api para activar o parar una discovery task

See merge request artica/pandorafms!3798
2021-03-04 10:47:20 +00:00
Daniel Rodriguez bf2705f571 Merge branch 'ent-6528-fallo-acl-servicios' into 'develop'
Fixed services ACL on services treeview

See merge request artica/pandorafms!3685
2021-03-04 10:46:31 +00:00
Daniel Rodriguez d6b7b46139 Merge branch 'ent-6925-vista-previa-en-acciones-de-alertas-recuperadas' into 'develop'
action_details avoid overlapping colors

See merge request artica/pandorafms!3792
2021-03-04 10:43:29 +00:00
Daniel Rodriguez c26ba819ce Merge branch 'ent-6887-SAP-view-ACL' into 'develop'
Added ACL groups in SAP view

See merge request artica/pandorafms!3747
2021-03-04 10:36:05 +00:00
Jose Gonzalez 6ee5b9c3e9 Fix issues 2021-03-04 11:33:21 +01:00
Daniel Rodriguez 94b04a8ef4 Merge branch 'ent-6106-Exportacion-CSV-en-icono-grafica-es-diferente-a-la-exportacion-normal' into 'develop'
Fix styles file export_data

See merge request artica/pandorafms!3691
2021-03-04 10:29:52 +00:00
daniel fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
2021-03-04 10:27:07 +00:00
artica 4d1cab6b67 Auto-updated build strings. 2021-03-04 01:00:19 +01:00
daniel 6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00
artica 442d0d440a Auto-updated build strings. 2021-03-03 01:00:23 +01:00
Daniel Rodriguez abdfe6b77f Merge branch 'ent-7064-no-se-muestran-los-mensajes' into 'develop'
fixed error not show messages

See merge request artica/pandorafms!3859
2021-03-02 12:50:36 +00:00
Daniel Rodriguez 51404eda8d Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop'
Ent 7077 no funciona doble auth meta

See merge request artica/pandorafms!3866
2021-03-02 12:24:03 +00:00
Luis 93a4a90dd6 Ent 7077 no funciona doble auth meta 2021-03-02 12:24:03 +00:00
Daniel Rodriguez 8c730f7a0c Merge branch 'ent-6522-fallo-visual-vista-ficheros-colecciones' into 'develop'
Added infobox for empty folder on collections

See merge request artica/pandorafms!3717
2021-03-02 12:21:13 +00:00
Luis 28b8092669 Added infobox for empty folder on collections 2021-03-02 12:21:13 +00:00
fbsanchez c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus
Conflicts:
	pandora_console/extras/mr/45.sql
2021-03-02 09:48:33 +01:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
2021-03-02 09:40:15 +01:00
artica 19ab53cfb8 Auto-updated build strings. 2021-03-02 01:00:21 +01:00
Daniel Rodriguez 23cddae261 Merge branch 'ent-5229-filtro-event-report' into 'develop'
Added string exclude filter to events reports

See merge request artica/pandorafms!3748
2021-03-01 15:28:18 +00:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop'
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
2021-03-01 12:16:27 +00:00
Daniel Rodriguez 23edf2f11f Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop'
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco

See merge request artica/pandorafms!3695
2021-03-01 12:14:54 +00:00
Daniel Rodriguez 72ecb53412 Merge branch 'ent-6602-AXA-Recursividad-de-grupos-no-funciona-en-operaciones-masivas' into 'develop'
fix recursivity check

See merge request artica/pandorafms!3711
2021-03-01 10:57:45 +00:00
Daniel Rodriguez 39d0e66983 Merge branch 'ent-6378-descarga-custom-field-view' into 'develop'
Added ACL check to custom view CSV donwload

See merge request artica/pandorafms!3714
2021-03-01 10:47:50 +00:00
Daniel Rodriguez 0ff981e279 Merge branch 'ent-6364-bug-set-stop-downtime-api' into 'develop'
Fixed api call set stop_downtime

See merge request artica/pandorafms!3704
2021-03-01 10:46:33 +00:00
Daniel Rodriguez da15dfc69c Merge branch 'ent-5347-Mensaje-de-aviso-de-información-actualizada-erróneo-al-cambiar-el-idioma' into 'develop'
Ent 5347 mensaje de aviso de información actualizada erróneo al cambiar el idioma

See merge request artica/pandorafms!3698
2021-03-01 10:41:39 +00:00
Daniel Rodriguez 55f9ab6d57 Merge branch 'ent-5113-Metaconsola-vista-tactica-alertas-disparadas' into 'develop'
fixed triggered alerts count

See merge request artica/pandorafms!3716
2021-03-01 10:29:31 +00:00
Daniel Rodriguez 54fa645d00 Merge branch 'ent-6840-Errores-en-la-vista-de-Omnishell' into 'develop'
Ent 6840 errores en la vista de omnishell

See merge request artica/pandorafms!3732
2021-03-01 10:19:21 +00:00
Daniel Rodriguez b2ed2f5511 Merge branch 'ent-6833-planned-downtimes-any-no-funciona' into 'develop'
Fix issue with adding agents and modules

Closes pandora_enterprise#6833

See merge request artica/pandorafms!3723
2021-03-01 10:05:59 +00:00
Daniel Rodriguez 0243740ab1 Merge branch 'ent-6136-fallos-visuales-en-la-correlacion-de-alertas' into 'develop'
add new style

See merge request artica/pandorafms!3789
2021-03-01 10:02:19 +00:00
Marcos Alconada 0d4761b63d add new style 2021-03-01 10:02:18 +00:00
Daniel Rodriguez 1128b366d5 Merge branch 'ent-5537-cambio-en-botones-de-select-all-de-ventanas-de-seleccion-de-agentes' into 'develop'
Ent 5537 cambio en botones de select all de ventanas de seleccion de agentes

See merge request artica/pandorafms!3696
2021-03-01 10:00:22 +00:00
Daniel Maya 6175d91298 Ent 5537 cambio en botones de select all de ventanas de seleccion de agentes 2021-03-01 10:00:22 +00:00
Daniel Rodriguez a0335b5fe6 Merge branch 'ent-4336-8257-separar-alertas-de-system-status-para-elegir-cuales-deseamos-recibir' into 'develop'
Ent 4336 8257 separar alertas de system status para elegir cuales deseamos recibir

See merge request artica/pandorafms!3846
2021-03-01 09:57:51 +00:00
artica 0587500074 Auto-updated build strings. 2021-03-01 01:00:09 +01:00
artica 0cf47e4b00 Auto-updated build strings. 2021-02-28 01:00:06 +01:00
artica 814a39235e Auto-updated build strings. 2021-02-27 01:00:19 +01:00
artica dc04a2b2b5 Auto-updated build strings. 2021-02-26 01:00:19 +01:00
Luis eb5e295286 Ent 7080 error servicios elementos modulo 2021-02-25 17:56:21 +00:00
Jose Gonzalez 7cfc1d2f9a Fixed issue with all modules 2021-02-25 16:08:02 +01:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
artica 078ab1657f Auto-updated build strings. 2021-02-25 01:00:25 +01:00
fbsanchez 9f694e32f7 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php
2021-02-24 09:41:53 +01:00
artica 508b953496 Auto-updated build strings. 2021-02-24 01:00:21 +01:00
marcos b13d5dc8d4 fixed error not show messages 2021-02-23 14:35:57 +01:00
Jose Gonzalez e68d2bfe5c Fixed issue with URLs 2021-02-23 14:32:51 +01:00
Luis Calvo e258069c39 Fixed data always formatting to date in sys uptime snmp modules 2021-02-23 11:50:35 +01:00
artica a5b1128014 Auto-updated build strings. 2021-02-23 01:00:16 +01:00
fbsanchez 4b0f96126b minor fix 2021-02-22 12:25:24 +01:00
fbsanchez d1c0d1b9f4 Merge remote-tracking branch 'origin/develop' into ent-4336-8257-separar-alertas-de-system-status-para-elegir-cuales-deseamos-recibir 2021-02-22 12:03:52 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/include/functions_ui.php
2021-02-22 12:01:29 +01:00
artica cd9694f034 Auto-updated build strings. 2021-02-22 01:00:09 +01:00
artica c70643203f Auto-updated build strings. 2021-02-21 01:00:14 +01:00
artica 396f67d57b Auto-updated build strings. 2021-02-20 01:00:21 +01:00
fbsanchez 925f456ef7 minor fixes 2021-02-19 13:57:39 +01:00
fbsanchez 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
Jose Gonzalez dac99fa4c6 Added more clear message 2021-02-19 12:29:48 +01:00
artica 0f4f9cd461 Auto-updated build strings. 2021-02-19 01:00:21 +01:00
Marcos Alconada c69b1f6282 Ent 7059 no existe el console log en nuevas instalaciones 2021-02-18 17:34:42 +01:00
fbsanchez a856f982d0 Merge remote-tracking branch 'origin/develop' into ent-2685-7938-aadcm-dashboards-en-metaconsola 2021-02-18 13:22:36 +01:00
fbsanchez bdea068f89 Dashboards in metaconsole 2021-02-18 13:20:54 +01:00
fbsanchez ef16ef4281 Dashboards in metaconsole 2021-02-18 12:47:42 +01:00
artica 4c1eaf929b Auto-updated build strings. 2021-02-18 01:00:24 +01:00
fbsanchez 1b3eb9a19e Merge remote-tracking branch 'origin/ent-7010-nexcon-mejoras-widget-de-eventos' into ent-2685-7938-aadcm-dashboards-en-metaconsola
Changes from #7010 into #2685
2021-02-17 16:48:40 +01:00
fbsanchez 673f95e276 Dashboards in meta 2021-02-17 12:57:13 +01:00
fbsanchez da7e903101 WIP dashboards meta 2021-02-17 12:19:22 +01:00
Daniel Rodriguez 8a0b4fd090 Merge branch 'ent-7032-boton-ok-wizard-snmp-interfaces' into 'develop'
Hide OK button meanwhile is loading data

Closes pandora_enterprise#7032

See merge request artica/pandorafms!3837
2021-02-17 09:50:25 +01:00
artica a33a94eb89 Auto-updated build strings. 2021-02-17 01:00:18 +01:00
Jose Gonzalez ed6c6dfad5 Hide OK button meanwhile is loading data 2021-02-16 13:43:10 +01:00
fbsanchez 210017b162 minor style fix select2 2021-02-16 13:41:03 +01:00
fbsanchez 8049aabf5b select2 on select items 2021-02-16 13:35:04 +01:00
fbsanchez 416bc8cad4 Minor fixes
and speed out of control
2021-02-16 12:33:15 +01:00
fbsanchez 74ee4971d0 Added inUsage and outUsage, added units 2021-02-16 12:14:56 +01:00
artica c2ec312e72 Auto-updated build strings. 2021-02-16 01:00:18 +01:00
fbsanchez 30755ba256 minor fixes 2021-02-15 19:12:06 +01:00
fbsanchez 2826f4fd89 Fixes in MR, added uniqid macro to pandora_snmp_bandwidth 2021-02-15 19:08:32 +01:00
fbsanchez 09b5400023 MR info + bandwidth analysis in wizards 2021-02-15 18:56:42 +01:00
Luis Calvo 514b3fca09 Fixed module library download links 2021-02-15 12:55:35 +01:00