59834088bf
created agents inventory report item
2021-06-01 18:04:01 +02:00
70b8eb77a3
Remove service elements when removing items itselves and multiple fixes
2021-06-01 12:12:07 +02:00
9cbe6a2924
created new report item
2021-06-01 09:43:55 +02:00
ddc4b47d0b
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-01 08:34:32 +02:00
a996c272e4
Wip command center
2021-05-31 17:32:53 +02:00
3a85c69043
Wip command center
2021-05-31 14:58:36 +02:00
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
3362106afe
added agents inventory report item
2021-05-31 13:13:25 +02:00
12e67380ee
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-28 14:37:20 +02:00
275c6d321b
Fixed alert command hide on update
2021-05-28 14:29:53 +02:00
b253a01841
Ocultar campos http auth en modulos web en campo Web Checks
2021-05-28 14:00:43 +02:00
84902a5d3d
Fixed code
2021-05-28 13:20:16 +02:00
62272a1f3f
Unset field tcp send when snmp remote component selected
2021-05-28 12:45:39 +02:00
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
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
db306a30b9
Fixed report exception item with not ok on meta
2021-05-27 16:23:20 +00:00
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
e2cfc5d615
fixed visual error on alerts black theme
2021-05-27 16:22:19 +00:00
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
57eeb9a1db
Fix vulnerability with directories created in upper levels
2021-05-27 16:19:51 +02:00
7abe6d5446
created new report item
2021-05-27 11:22:01 +02:00
a1ca4abe8f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-27 08:22:43 +02:00
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
8c100e8809
Resize vertical on textarea web/data server modules css
2021-05-26 13:39:25 +00:00
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
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
e7b59ab472
Added standarized headers
2021-05-26 10:16:23 +02:00
d91e7f6aba
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-26 08:28:42 +02:00
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
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
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
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
8019126367
Fixed group icon on agent creation
2021-05-20 17:15:27 +02:00
09ccaf254e
Fixed public access and added PublicLogin interface, including code style fixex
2021-05-19 11:31:52 +02:00
6c305833bf
fix groups, module_groups, network_components user_edit synch
2021-05-18 17:18:54 +02:00
5d70226b13
fix category, Os, tags, user_edit synch
2021-05-18 11:02:00 +02:00
ec6cb4d532
fix category, Os, tags, user_edit synch
2021-05-18 10:57:21 +02:00
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
4c12c6e770
fix profiles and user synch
2021-05-17 17:57:08 +02:00
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
1c1e25e712
Added new item type in reports
2021-05-14 14:54:09 +02:00
998fb4b0dc
Fixed issue with undesired deactivate dynamic threshold max field
2021-05-14 11:22:32 +02:00
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
9cde8c345f
removed deprecated incident permissions
2021-05-13 13:33:45 +02:00
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
9c234eef85
Ent 7087 mensaje duplicado en los test mails
2021-05-11 13:48:09 +00:00
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
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
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
d1e0f070f1
Merge branch 'ent-7296-botones-descolocados-gestion-eventos-metaconsola' into 'develop'
...
Event responses buttons visual bug
See merge request artica/pandorafms!4111
2021-05-10 09:11:29 +00:00
5a339ac76e
Merge branch 'ent-7284-Warning-creación-agente' into 'develop'
...
Ent 7284 warning creación agente
See merge request artica/pandorafms!4017
2021-05-10 09:10:43 +00:00
cdf0e1a4f4
Ent 7284 warning creación agente
2021-05-10 09:10:43 +00:00
3d8f0b58d6
Merge branch 'ent-7258-spinner-infinito-agentes-report-sla-items' into 'develop'
...
Fix bugs with SLA item reports
Closes pandora_enterprise#7258
See merge request artica/pandorafms!4000
2021-05-10 09:09:36 +00:00
514a91c853
Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop'
...
Ent 6541 quitar id usuario url seccion usuario
Closes pandora_enterprise#6541
See merge request artica/pandorafms!3990
2021-05-10 09:08:59 +00:00
6faefa4afa
Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
...
Unified downtime name as scheduled downtime
See merge request artica/pandorafms!4001
2021-05-10 09:06:43 +00:00
f25256a74d
Unified downtime name as scheduled downtime
2021-05-10 09:06:43 +00:00
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
0a7c960630
Added control for autocomplete input icon
2021-05-07 12:40:38 +02:00
3359b21d5b
Event responses buttons visual bug
2021-05-06 16:06:21 +02:00
ce5934b9a1
Added form-type buttons for user-actions
2021-05-06 14:46:58 +02:00
c39d013afb
Merge branch 'ent-7227-Perfil-LM-no-permite-modificar-acciones-ni-templates' into 'develop'
...
Ent 7227 perfil lm no permite modificar acciones ni templates
See merge request artica/pandorafms!3980
2021-05-06 12:22:48 +00:00
c003964394
Ent 7227 perfil lm no permite modificar acciones ni templates
2021-05-06 12:22:47 +00:00
8e737502c5
Merge branch 'ent-7133-texto-ingles-discovery' into 'develop'
...
Fixed text
Closes pandora_enterprise#7133
See merge request artica/pandorafms!3976
2021-05-06 12:10:21 +00:00
325e400b11
Merge branch 'ent-7109-Bug-al-duplicar-alertas-snmp' into 'develop'
...
Ent 7109 bug al duplicar alertas snmp
See merge request artica/pandorafms!3934
2021-05-06 12:07:16 +00:00
db92b65fd0
Merge branch 'ent-7211-errores-visuales-en-la-vista-de-agente' into 'develop'
...
resolved error with sql message error external tools2
See merge request artica/pandorafms!3979
2021-05-06 12:05:04 +00:00
aa4769d331
minor changes
2021-05-05 13:02:53 +02:00
d358fd894d
minor change in integria ims setup
2021-05-05 11:03:32 +02:00
dbb7fe364f
Added standard headers
2021-04-30 14:35:54 +02:00
ab984b8c32
Added standard headers
2021-04-30 13:50:58 +02:00
46a691c397
Added standard headers
2021-04-30 13:24:55 +02:00
3f33a0ec29
Added standard header
2021-04-30 12:35:02 +02:00
71c88313d5
Added standard header
2021-04-30 10:58:37 +02:00
6ad371e4ab
Email test working with data in text fields
2021-04-29 16:04:51 +02:00
9ab027b286
WIP: Upload
2021-04-29 13:28:03 +02:00
4aea645735
Fixed visual bug on user creation error
2021-04-29 11:15:20 +02:00
1d472ec480
#7455 Fixed check_process
2021-04-29 08:55:16 +02:00
b00e7eff8b
fixed size with select2 in module component
2021-04-28 10:48:32 +00:00
28984aa414
Merge branch 'ent-7384-bug-acl-en-usuario-con-permiso-rr-u-o-rw' into 'develop'
...
fixed error with rr and rw in report list - acls
See merge request artica/pandorafms!4068
2021-04-27 14:07:48 +00:00
c54f542b45
Merge branch 'ent-7376-11735-varios-problemas-de-visualizacion-modo-en-tema-oscuro' into 'develop'
...
fixed minnor error black theme 7376
See merge request artica/pandorafms!4064
2021-04-27 14:05:08 +00:00
425dc74123
Merge branch 'ent-7378-create-workunit-alerts-action-form' into 'develop'
...
Controlled if Integria IMS is selected for show Create workunit switch
Closes pandora_enterprise#7378
See merge request artica/pandorafms!4066
2021-04-27 11:45:30 +00:00
55c38dfc03
Merge branch 'ent-7377-fallos-en-gis-maps' into 'develop'
...
fixed error with creation and updating gis maps
See merge request artica/pandorafms!4072
2021-04-27 11:44:55 +00:00
c57ca2a2b8
fixed error with creation and updating gis maps
2021-04-27 11:44:55 +00:00
2db8c73743
fixed error with rr and rw in report list - acls
2021-04-26 10:30:51 +02:00
68e1e72b46
Controlled if Integria IMS is selected for show Create workunit switch
2021-04-23 13:43:16 +02:00
f818b86827
fixed minnor error black theme 7376
2021-04-23 09:56:06 +02:00
0ff28fb9a2
fixed error with icon groups policies
2021-04-22 16:09:05 +02:00
a2a3e67d49
Ent 7363 bug al copiar consola visual
2021-04-22 07:07:22 +00:00
00e61aba79
Fixed infinite spinner on agent field grouped general report
2021-04-21 10:59:39 +02:00
a990689e59
Merge branch 'ent-7268-Falla-sincronizacion-de-inventario-Integria-Pandora' into 'develop'
...
changed request protocol
See merge request artica/pandorafms!4033
2021-04-20 07:31:13 +00:00
55677850a6
Merge branch 'ent-7317-11690-problema-grave-consolas-visuales-modo-legacy-activado' into 'develop'
...
fixeed visual error vc legacy mode
See merge request artica/pandorafms!4036
2021-04-20 07:30:11 +00:00
4655668ca4
fixeed visual error vc legacy mode
2021-04-19 14:16:30 +02:00
59ec6c850d
Merge branch 'ent-6387-limitar-agentes-por-grupo' into 'develop'
...
Added control for max agents in groups
Closes pandora_enterprise#6387
See merge request artica/pandorafms!3800
2021-04-19 07:17:56 +00:00
0e12402469
Fixed message issue
2021-04-15 21:20:59 +02:00
3d3beca727
Added feature of generate event
2021-04-15 15:06:48 +02:00
317bf0da3d
minnor error fixed
2021-04-15 10:33:31 +00:00
ada6bccfd6
changed request protocol
2021-04-15 12:12:06 +02:00
a93a3b7967
Merge branch 'ent-6933-fix-inconsistency-in-alerts-group-profiles-revised' into 'develop'
...
Fixed and improved alert functions.
See merge request artica/pandorafms!3957
2021-04-14 13:15:29 +00:00
72480bdb1a
Merge branch 'ent-7287-selectores-desplegados-en-home-screen' into 'develop'
...
fixed visual error selects home view
See merge request artica/pandorafms!4028
2021-04-13 14:48:36 +00:00
fff13ad2ac
Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop'
...
Minor changes
See merge request artica/pandorafms!3930
2021-04-13 14:31:37 +00:00
87362d07f4
fixed visual error selects home view
2021-04-13 15:37:44 +02:00
3d359dab36
Fixed merge with 7161
2021-04-13 12:55:35 +02:00
9bbac06771
Ent 7161 cambiar opciones de skin en usuarios y grupos
2021-04-13 09:26:50 +00:00
4a028b2ee3
Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo'
...
# Conflicts:
# pandora_console/extras/mr/46.sql
2021-04-13 07:52:48 +00:00
eeff80638f
Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop'
...
multiple fixes
See merge request artica/pandorafms!3812
2021-04-12 10:39:41 +00:00
62264c9d07
Added boolean casting for check acl
2021-04-09 14:05:33 +02:00
1fb259c35f
Merge branch 'ent-7260-no-esta-funcionando-operaciones-masivas-agentes-edicion' into 'develop'
...
fixed error on bulk operations edit agents
See merge request artica/pandorafms!3995
2021-04-09 09:21:36 +00:00
f8d4039314
Fixed merges
2021-04-09 10:34:25 +02:00
c64f05dc17
minor fix while empty search condition
2021-04-07 20:31:24 +02:00
b244cd28b2
Merge branch 'ent-6962-tags-largos-no-caben-en-configuracion-modulos' into 'develop'
...
Added tips to large tags in module config
See merge request artica/pandorafms!3851
2021-04-07 10:52:39 +00:00
36287188b4
Added tips to large tags in module config
2021-04-07 10:52:39 +00:00
97879d1c71
Fixed reomte components search bugs and button go back
2021-04-07 10:51:35 +00:00
4ab7b1a135
Ent 6952 bug group creation user admin no all
2021-04-07 08:11:35 +00:00
0fc3cb8714
Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop'
...
Multicolumn setup for performance and visual settings
See merge request artica/pandorafms!3921
2021-04-06 17:47:39 +00:00
aaded121a4
Merge branch 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas' into 'develop'
...
restricted action creation on alerts created from policy
See merge request artica/pandorafms!3891
2021-04-06 17:46:47 +00:00
43cfa383ac
Merge branch 'ent-5370-Pestaña-de-comandos-de-alertas-sin-paginacion' into 'develop'
...
Add pagination to commands view
See merge request artica/pandorafms!3919
2021-04-06 17:44:54 +00:00
8ebaddc233
Merge branch 'ent-6941-Problemas-de-rendimiento-en-la-vista-Manage-users' into 'develop'
...
Ent 6941 problemas de rendimiento en la vista manage users
See merge request artica/pandorafms!3799
2021-04-06 17:33:38 +00:00
bec22b5825
Merge branch 'ent-7238-salto-de-linea-perfil-grupo-manage-users' into 'develop'
...
Fixed user/profile newline on users_list
See merge request artica/pandorafms!3982
2021-04-06 17:24:20 +00:00
32527863cb
Merge branch 'ent-7095-Bug-en-Tree-group-metaconsola-con-usuario-no-ALL' into 'develop'
...
fixed error tree groups agent edition metaconsole
See merge request artica/pandorafms!3904
2021-04-06 17:23:18 +00:00
1e90b0d300
Merge branch 'ent-6986-11304-ordenar-alfabeticamente-los-resultados-snmp-en-discovery' into 'develop'
...
Modules alphabetically sorted in Discovery review
See merge request artica/pandorafms!3907
2021-04-06 17:09:28 +00:00
1eba5f8e6c
Merge branch 'ent-7072-mensaje-erroneo-module-management-meta' into 'develop'
...
Fixed centralized management warnin on module management meta
See merge request artica/pandorafms!3880
2021-04-06 17:06:40 +00:00
4944820aed
Fixed centralized management warnin on module management meta
2021-04-06 17:06:40 +00:00
7756056755
Merge branch 'ent-7242-cambio-iconos-vista-edicion-agentes' into 'develop'
...
restored bell and module icon with plus on agent edition view
See merge request artica/pandorafms!3988
2021-04-06 17:03:19 +00:00
c192a1681b
Merge branch 'ent-7022-open-error-en-la-ruta-de-netscan-custom' into 'develop'
...
Fixed task edit url when nof fully defined (custom-script)
See merge request artica/pandorafms!3906
2021-04-06 17:00:49 +00:00
4b9f8ce202
Added custom fields combo larger params
2021-04-06 16:51:14 +00:00
0b1e60b8cf
Fixed view icon on report and custom graphs
2021-04-06 18:18:17 +02:00
2a7aa8c1e5
Fix bugs with SLA item reports
2021-04-06 15:25:43 +02:00
7d3dc7e3a6
fixed error on bulk operations edit agents
2021-04-06 08:55:06 +02:00
98b7a9c66a
Update DiscoveryTaskList.class.php
2021-04-05 14:05:53 +00:00
8352e4d18d
restored bell and module icon with plus on agent edition view
2021-03-31 10:54:58 +02:00
847fc44b14
Fixed user/profile newline on users_list
2021-03-30 13:34:38 +02:00
5d38740630
resolved error with sql message error external tools2
2021-03-29 16:54:41 +02:00
3770f491dc
Merge branch 'ent-7231-icono-vistas-consolas-visuales' into 'develop'
...
fixed icon
See merge request artica/pandorafms!3975
2021-03-29 12:39:02 +00:00
e26c2eb76d
fixed icon
2021-03-29 14:30:00 +02:00
390d7e79cd
fixed buttton position
2021-03-29 12:32:14 +02:00
293cbc2e44
Fixed text
2021-03-29 12:17:41 +02:00
1f89a0d293
fixed visual error
2021-03-29 09:58:23 +02:00
3934096d03
Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery
2021-03-29 09:21:04 +02:00
812007169d
Merge branch 'ent-7209-boton-new-ayer-en-creacion-edicion-gis-maps-no-funciona' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!3969
2021-03-26 13:52:44 +00:00
9dd17acb57
fixed visual error
2021-03-26 13:40:55 +00:00
56462b1b06
fixed visual error
2021-03-26 14:32:29 +01:00
48b299ba67
Merge branch 'ent-7228-Errores-en-las-Visual-consoles-de-Metaconsola' into 'develop'
...
fixed minor error
See merge request artica/pandorafms!3967
2021-03-26 13:05:28 +00:00
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
dff3ef3484
Merge branch 'ent-7223-error-message-update-manager-offline' into 'develop'
...
Restored not update error message on update manager offline
See merge request artica/pandorafms!3965
2021-03-26 12:35:57 +00:00
487a9b96d9
fixed minor error
2021-03-26 13:25:42 +01:00
887742a675
Restored not update error message on update manager offline
2021-03-26 13:02:55 +01:00
2c86e3e26c
Substituted eye with operation (magnifier) icon on credential store and tasklist
2021-03-26 12:20:37 +01:00
3d350ba481
fixed visual error
2021-03-26 09:32:30 +00:00
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
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
29e7e3c844
Merge branch 'ent-7196-tabla-de-list-sla-no-se-muestra' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!3946
2021-03-25 11:55:33 +00:00
823bf52372
fixed visual error
2021-03-25 11:49:32 +01:00
fdc4133eaa
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
2021-03-25 10:20:02 +01:00
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
79914082e9
Ent 6850 quitar nta
2021-03-24 15:16:13 +00:00
9c693e309c
AWS.S3 monitoring RC1
2021-03-24 11:52:47 +01:00
90c825888a
fixed visual error
2021-03-23 15:12:57 +01:00
659c1b4503
Wizard Aws.S3 RC1
2021-03-22 19:21:05 +01:00
4ee0c580bb
WIP: Backup upload
2021-03-22 17:52:11 +01:00
4b7c0fc7ee
WIP: Backup upload
2021-03-22 17:39:24 +01:00
d43c51cc66
WIP: Backup upload
2021-03-22 17:37:15 +01:00
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
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
04bae1b4fb
fixed visual errors
2021-03-18 17:05:50 +00:00
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
6a9dff3355
Ent 6852 integrar edicion de sistema de credencial boxes con edicion de coniguracion del satelite en la misma vista
2021-03-18 16:00:14 +00:00
05f1eb495b
Fixed duplicate alert
2021-03-18 12:29:58 +01:00
9c4a6a56c7
Merge branch 'ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle' into 'develop'
...
add discovery_app_microsoft_sql_serve on task list
See merge request artica/pandorafms!3058
2021-03-18 09:56:31 +00:00
a3069fdf76
Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos
2021-03-18 10:04:18 +01:00
61cb8a43c6
Merge remote-tracking branch 'origin/develop' into ent-6894-uniway-estado-pending-en-server-task-aws
...
Conflicts:
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
2021-03-17 13:25:38 +01:00
71a0dcfd0c
Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
...
Conflicts:
pandora_console/include/constants.php
pandora_server/lib/PandoraFMS/Recon/Base.pm
2021-03-17 10:11:58 +01:00
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
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
4bf47eaa35
Merge branch 'ent-7145-boton-de-borrado-de-items-desplazado-en-lista-de-informes' into 'develop'
...
fixed position
See merge request artica/pandorafms!3909
2021-03-16 16:47:54 +00:00
9e2d774d8f
Merge branch 'ent-7148-estilos-rotos-en-varios-botones-de-custom-graphs-de-informes' into 'develop'
...
fixed visual style error
See merge request artica/pandorafms!3905
2021-03-16 16:47:26 +00:00
7d4f6de646
Merge branch 'ent-7162-Botones-descolocados-en-remote-components' into 'develop'
...
fixed errors visual
See merge request artica/pandorafms!3920
2021-03-16 16:45:30 +00:00
e59600c10b
Merge branch 'ent-7151-errores-visuales-en-manage-agents-modo-details' into 'develop'
...
Ent 7151 errores visuales en manage agents modo details
See merge request artica/pandorafms!3922
2021-03-16 16:44:40 +00:00
989e6441d8
Merge branch 'ent-6868-massive-operations-snmp-modules' into 'develop'
...
Fixed snmpv3 options on modules massive op
See merge request artica/pandorafms!3739
2021-03-16 16:41:54 +00:00
6bb6f1121b
Fixed snmpv3 options on modules massive op
2021-03-16 16:41:54 +00:00
e689813e2c
fixed icons
2021-03-16 13:37:13 +01:00
f05592faeb
fixed error
2021-03-16 13:12:03 +01:00
2862afb7f5
Multicolumn setup for performance and visual settings
2021-03-16 13:00:24 +01:00
f880e0632d
Merge branch 'ent-7137-error-en-merge-reporting-builder-y-policy-agents' into 'develop'
...
resolved merge conflict
See merge request artica/pandorafms!3900
2021-03-16 11:52:55 +00:00
fd1c885e2f
fixed errors visual
2021-03-16 12:06:59 +01:00
373ab32bb5
Add pagination to commands view
2021-03-16 11:54:40 +01:00
f765493ce7
revert selector theme
2021-03-16 11:24:05 +01:00
0ad3e3fd8b
Merge branch 'develop' into 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas'
...
# Conflicts:
# pandora_console/godmode/alerts/alert_list.list.php
2021-03-16 08:41:55 +00:00
bd4cad3c83
fixed position
2021-03-15 16:28:30 +01:00
137a2c31ad
fixed visual fails
2021-03-15 15:30:56 +01:00
02b2eec65d
Modules alphabetically sorted in Discovery review
2021-03-15 15:16:49 +01:00
95787e2fe8
fixed visual style error
2021-03-15 14:38:20 +01:00
c20c206a5f
Fixed task edit url when nof fully defined (custom-script)
2021-03-15 14:37:08 +01:00
e4e3007def
Fixed img
2021-03-15 13:32:25 +01:00
b78f4093ac
fixed error tree groups agent edition metaconsole
2021-03-15 13:31:24 +01:00
971f86601a
Merge branch 'ent-5276-AADCM-creacion-de-paradas-planificadas' into 'develop'
...
Refactored downtime editor
See merge request artica/pandorafms!3879
2021-03-15 11:29:04 +00:00
88b4b4920f
Merge remote-tracking branch 'origin/develop' into ent-5276-AADCM-creacion-de-paradas-planificadas
2021-03-15 12:13:05 +01:00
09e94bd0e9
resolved merge conflict
2021-03-15 11:43:36 +01:00
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
b4927d6071
minor fix
2021-03-12 12:46:27 +01:00
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01:00
6a427cfa8a
Fixed
2021-03-12 11:09:34 +01:00
5b1517f767
Merge
2021-03-12 11:07:44 +01:00
2f7a826253
minor fixes
2021-03-11 17:54:20 +01:00
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
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
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
54fc2e89d3
new report histogram
2021-03-11 14:22:28 +00:00
f833429695
restricted action creation on alerts created from policy
2021-03-11 12:38:42 +01:00
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
05a133bf77
Merge branch 'ent-4659-AADCM-Opcion-de-deshabilitar-mediante-checks-varios-modulos-desde-la-vista-de-agente' into 'develop'
...
added option to disable selected agents massively
See merge request artica/pandorafms!3874
2021-03-10 15:55:07 +00:00
38cc8d2ab9
Merge branch 'ent-5284-Granular-los-permisos-de-alerta' into 'develop'
...
permissions limitation for command management
See merge request artica/pandorafms!3872
2021-03-10 15:54:31 +00:00
96d5555ed2
Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop'
...
Ent 6464 discovery id recon server no cambia si no existe
Closes pandora_enterprise#6464
See merge request artica/pandorafms!3788
2021-03-10 15:53:28 +00:00
92d654763f
Fixed some issues
2021-03-10 16:20:45 +01:00
5c3b5d2be0
minor fixes in scheduled downtime setup
2021-03-10 13:02:17 +01:00
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
71e9452988
Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora
2021-03-10 10:28:45 +01:00
5913313bae
Increased number of possible custom fields for Integria action
2021-03-10 10:28:27 +01:00
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
6e0188fac1
add summary report availability graph
2021-03-09 16:32:12 +00:00
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
b9f72a1ef9
Merge branch 'ent-6892-Discover-Task-List-no-hay-limitación-por-grupo' into 'develop'
...
Ent 6892 discover task list no hay limitación por grupo
See merge request artica/pandorafms!3756
2021-03-05 12:56:01 +00:00
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
b117bbfd7e
Refactored downtime editor
2021-03-04 16:27:14 +01:00
daa95d40c8
Merge remote-tracking branch 'origin/develop' into ent-6894-uniway-estado-pending-en-server-task-aws
...
Conflicts:
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
2021-03-04 14:32:01 +01:00
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
8281d98f83
Merge branch 'ent-6926-Vista-de-servidores-no-muestra-masters' into 'develop'
...
Ent 6926 vista de servidores no muestra masters
See merge request artica/pandorafms!3809
2021-03-04 10:45:05 +00:00
6ee5b9c3e9
Fix issues
2021-03-04 11:33:21 +01:00
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
532c04db39
Merge branch 'ent-6946-bug-en-usuario-con-perfil-group-coordinator-meta' into 'develop'
...
fixed error with group cordinator profile with agent management meta
See merge request artica/pandorafms!3842
2021-03-02 12:48:16 +00:00
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
93a4a90dd6
Ent 7077 no funciona doble auth meta
2021-03-02 12:24:03 +00:00
9b3f6f1efb
added option to disable selected agents massively
2021-03-02 10:42:08 +01:00
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
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
af680b5d92
permissions limitation for command management
2021-03-01 13:58:04 +01:00
001c7aaba9
Merge branch 'ent-6950-selector-de-grupos-xxl-en-creacion-de-netflow-filter-y-gis-maps' into 'develop'
...
fixed select style
See merge request artica/pandorafms!3835
2021-03-01 12:24:48 +00:00
2ef8bc2178
Merge branch 'ent-6877-Aumentar-el-limite-de-caracteres-de-la-etiqueta-en-contenedore-de-Gráficas' into 'develop'
...
Ent 6877 aumentar el limite de caracteres de la etiqueta en contenedore de gráficas
See merge request artica/pandorafms!3791
2021-03-01 12:24:17 +00:00
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
341fc212d5
Merge branch 'ent-6610-links-ayuda-configuración-metaconsola' into 'develop'
...
Removed metaconsole empty help links
See merge request artica/pandorafms!3702
2021-03-01 10:59:50 +00:00
f6d9997b16
Merge branch 'ent-6547-Visual-styles-cambio-de-tamaño-agente-modulo-y-descripcion' into 'develop'
...
Ent 6547 visual styles cambio de tamaño agente modulo y descripcion
See merge request artica/pandorafms!3707
2021-03-01 10:57:08 +00:00
f74b73cbb5
Merge branch 'ent-6492-Tokens-que-no-corresponden-en-el-item-SQL-Query-de-informes' into 'develop'
...
Fix item sql query remove fields
See merge request artica/pandorafms!3690
2021-03-01 10:52:28 +00:00
4de4709f9f
Merge branch 'ent-6401-Espacio-entre-label-e-ID-en-actualización-de-usuario-metaconsola' into 'develop'
...
Ent 6401 espacio entre label e id en actualización de usuario metaconsola
See merge request artica/pandorafms!3701
2021-03-01 10:50:39 +00:00
8ff36ef66f
Merge branch 'ent-5269-añadir-elemento-al-filtro-de-la-vista-de-administracion-general-de-alertas' into 'develop'
...
Ent 5269 añadir elemento al filtro de la vista de administracion general de alertas
See merge request artica/pandorafms!3796
2021-03-01 10:38:51 +00:00
c37d883efe
Merge branch 'ent-6874-macros-no-se-sustituyen-listado-informes' into 'develop'
...
Added macros to reports items list
See merge request artica/pandorafms!3740
2021-03-01 10:20:54 +00:00
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
07a29fae04
Merge branch 'ent-6608-OPEN-Servidores-SMTP-externos-no-mandan-e-mail-test' into 'develop'
...
fixed string
See merge request artica/pandorafms!3870
2021-03-01 10:05:04 +00:00
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
43c842ec75
Merge branch 'ent-6931-Cabecera-duplicada-en-Remote-component-management' into 'develop'
...
Ent 6931 cabecera duplicada en remote component management
See merge request artica/pandorafms!3782
2021-03-01 09:54:35 +00:00
1767712c72
Merge branch 'ent-2530-bug-tokens-webserver-module' into 'develop'
...
Fixed tokens htpp_auth user,avoid repetiton
See merge request artica/pandorafms!3734
2021-03-01 09:53:55 +00:00
86cd01418f
fixed string
2021-02-26 09:41:53 +01:00
7cfc1d2f9a
Fixed issue with all modules
2021-02-25 16:08:02 +01:00
alejandro.campos@artica.es
fbsanchez
Daniel Barbero Martin
Daniel Rodriguez
Calvo
Jose Gonzalez
Marcos Alconada
José González
José González
Daniel Maya
vgilc
Junichi Satoh