b7cc25314d
Unified sizes of the checkbox switch
...
Former-commit-id: 392fdf006c81fb5586349b8a4b4544e0c07aa903
2019-02-25 16:20:05 +01:00
7f01e47e1f
Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
...
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar
See merge request artica/pandorafms!2132
Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
2019-02-25 13:48:37 +01:00
be7eadeb2c
extend status change functionality in monitor detail view custom fields
...
Former-commit-id: e48ae88416f50b47aac79ae28b9b4bcd08ebdf73
2019-02-25 11:32:26 +01:00
9753faa17a
Auto-updated build strings.
...
Former-commit-id: 01fee147745dfd638487449f20211abd8e83b71e
2019-02-25 00:01:36 +01:00
a49f68e96b
Auto-updated build strings.
...
Former-commit-id: ee007a4042fe893b73e088abd7a7b6cd0bdc45d2
2019-02-24 00:01:50 +01:00
febe2cc3a6
Auto-updated build strings.
...
Former-commit-id: 4f687af81ee7ab9541649e5f395c2e2aaf359609
2019-02-23 00:02:37 +01:00
bd6ac21595
Merge branch 'ent-3554-7588-apply_policy-no-funciona' into 'develop'
...
Added new parameter in pandora_add_policy_queue
See merge request artica/pandorafms!2176
Former-commit-id: 65ceb6b0fe1bf2c81bcfb1ce946f7d73d2c68df2
2019-02-22 13:09:34 +01:00
e55915e1e2
Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
...
3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop
See merge request artica/pandorafms!2193
Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83
2019-02-22 10:01:43 +01:00
1aa60fd15d
Merge branch 'ent-3511-Bug-en-la-edicion-del-widget-de-tipo-Agent/Module-View' into 'develop'
...
Ent 3511 bug en la edicion del widget de tipo agent/module view
See merge request artica/pandorafms!2190
Former-commit-id: bffc145be0e0eee4265dcdf7d8be2447e467bb79
2019-02-22 09:18:11 +01:00
b1149a053b
Auto-updated build strings.
...
Former-commit-id: f642e8fe029c7df7a017abe433d7768acd8577fd
2019-02-22 00:01:38 +01:00
45bba4faa8
fix agent name input
...
Former-commit-id: 51b7566719392d1cc43ca04a9ec91ae007e73feb
2019-02-21 19:00:47 +01:00
59159ec473
change last status change info
...
Former-commit-id: e40f4ce7f042219584f0224822ca8a112f453194
2019-02-21 17:22:00 +01:00
a9eb3cf37b
Merge branch 'ent-3458-Metaconsola_filtro_eventos_por_nombre_agente_no_machea_nombres_con_espacios' into 'develop'
...
Fixed filter by name of agents in events when they contain spaces
See merge request artica/pandorafms!2160
Former-commit-id: 725ca1b5279d8074454ae8ed4b3af27f084e9594
2019-02-21 17:07:36 +01:00
36410a26d1
Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
...
Add support for column macros.
See merge request artica/pandorafms!2182
Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +01:00
a54903d9c6
Merge branch 'ent-3279-planned-downtime-creation-api-cli' into 'develop'
...
API/CLI: fixed planned downtime creation
See merge request artica/pandorafms!2184
Former-commit-id: 84f21e2c9762af3a1c1c04c24dc6e35848c0f437
2019-02-21 13:32:15 +01:00
d9e0f2ea42
Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo
...
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
2019-02-21 13:26:12 +01:00
dc4d5b1bd7
fixed error in widget
...
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
2019-02-21 13:21:05 +01:00
acf3c94642
fix bad solved conflict and added changes in bd to migrate and mr
...
Former-commit-id: d52e91d0f2b886620aa9fc07dda48bfeb27ffe0c
2019-02-21 13:16:32 +01:00
ba87d6a9b8
Merge branch 'ent-3214-exact-oid-matches' into 'develop'
...
Add support for exact matches to SNMP alerts.
See merge request artica/pandorafms!2090
Former-commit-id: 5e4c43a5343f7fa6992c05c93c0695b1881548b9
2019-02-21 11:35:51 +01:00
bb7be444f4
Merge branch '3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo' into 'develop'
...
Fixed error user edit tocken filter events not set.
See merge request artica/pandorafms!2188
Former-commit-id: d293fbdebaf2a1300b4a2082c75d9b92c37cf87b
2019-02-21 09:49:47 +01:00
1156b29743
Auto-updated build strings.
...
Former-commit-id: f760ca3d8b53ad47017d82e6bc2fbb298a69312b
2019-02-21 00:01:55 +01:00
8266c716e8
Merge branch 'ent-3138-ent-Cambiar-alert-por-dialog' into 'develop'
...
Cambiar alert por dialog
See merge request artica/pandorafms!2178
Former-commit-id: b8d1f9f1797ef1d3f54975ca8a695f0a5033938e
2019-02-20 16:37:03 +01:00
9419e68aef
Merge branch 'ent-3499-Numero_de_respuestas_de_eventos_masivas' into 'develop'
...
add new tocken max events responses
See merge request artica/pandorafms!2180
Former-commit-id: c8b7deddcaa8f290d1b3065158606e21504d2dae
2019-02-20 16:11:34 +01:00
300626e551
Merge remote-tracking branch 'origin/develop' into ent-3499-Numero_de_respuestas_de_eventos_masivas
...
Former-commit-id: 4a8482ccef3661c83553dff8f5533c29321f95f2
2019-02-20 15:38:15 +01:00
d4cc0f6952
Merge branch 'ent-3497-event-responses-current-user-macro' into 'develop'
...
Added the _current_user_ macro to the event responses
See merge request artica/pandorafms!2179
Former-commit-id: c468e43ec3add15487109c2c961630361bd9bdaf
2019-02-20 13:50:19 +01:00
af2954d392
Changed controls in static graph vs
...
Former-commit-id: 4db156a5abd372d0d50c252936a00d00416dc475
2019-02-20 11:46:32 +01:00
c527378183
Merge branch 'ent-3345-Error_al_subir_imagenes_en_el_file_manager' into 'develop'
...
fixed error filemanager
See merge request artica/pandorafms!2186
Former-commit-id: d7cbd95f2b8cf86a7cdcbc85e100dc282a94d483
2019-02-20 11:42:29 +01:00
1c7c0ebe8f
Merge branch '3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
...
remove special characters from agent alias string on creation and trim blank…
See merge request artica/pandorafms!2100
Former-commit-id: 2e2268eef1c2a45f8c6bc046e9e21d0101d456c0
2019-02-20 11:02:24 +01:00
33ed8a2cc1
Merge branch '3219-Vista-de-custom-fields-diferente-nodo-meta2' into 'develop'
...
Fixed bug in metaconsole custom fields2
See merge request artica/pandorafms!2070
Former-commit-id: cb36006bed0259c9e7c70c420d5e46129d64457a
2019-02-20 11:00:42 +01:00
55486e7b93
Merge branch 'ent-2836-Operaciones-masivas-filtrado-de-modulos-por-tag' into 'develop'
...
Fixed bug in filtered modules by tag
See merge request artica/pandorafms!2181
Former-commit-id: f313f0cab032ccc8329933a641db8c541b682474
2019-02-20 10:33:28 +01:00
094a5c17d8
Merge branch '3222-Deshabilitar-doble-autenticacion-si-no-esta-activada' into 'develop'
...
disable double authentication option on user edit when disabled in authentication setup
See merge request artica/pandorafms!2054
Former-commit-id: b60f3ec06935ad6b6e456e556c9a281539e42e19
2019-02-20 09:56:49 +01:00
c36241de4f
Add additional help icons.
...
Former-commit-id: 9641eb9ceaefde1c24503fcfb4c7965afedf8fbc
2019-02-20 09:04:15 +01:00
53a41a7a56
Auto-updated build strings.
...
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
2019-02-20 00:01:26 +01:00
63c00f00a8
Merge branch '3231-Mensaje_erroneo_al_aplicar_grupos_secundarios' into 'develop'
...
Eliminated message when secondary groups are added
See merge request artica/pandorafms!2124
Former-commit-id: 8c96030a463fa3b95ee2eabe3ee13c1852f60ffd
2019-02-19 18:09:38 +01:00
0352ef2b70
Merge branch '3141-SQL-query-a-la-propia-metaconsola' into 'develop'
...
fix metaconsole sql items creation
See merge request artica/pandorafms!2097
Former-commit-id: a2efa5704837d09eec24f144eb0fcc5b922b856a
2019-02-19 18:08:14 +01:00
df88582982
fixed error filemanager
...
Former-commit-id: 4bd54ef9c60396822a1a757bc91218b4d2244efa
2019-02-19 17:52:25 +01:00
218e90a663
Merge branch '2970_No_capta_bien_las_fuentes' into 'develop'
...
Fixed minor bug in pandora flot js
See merge request artica/pandorafms!1897
Former-commit-id: 7c45783033b5f856375498ec30954341a4ddc0fa
2019-02-19 17:51:19 +01:00
c80a1fc3dd
add tooltip to agent alias on creation
...
Former-commit-id: 8724f37e286080e58d9666fceec2e016fa741138
2019-02-19 16:25:19 +01:00
04c4162419
Merge branch '339-No_cortar_elementos_en_PDF' into 'develop'
...
339 no cortar elementos en pdf
See merge request artica/pandorafms!2163
Former-commit-id: 756360a1b91e5edf2c1af80e601085f7b41b505c
2019-02-19 15:39:03 +01:00
cf79f54a48
fixed minor error
...
Former-commit-id: ffde6120127e31865553a8b06f91b3f0938a164c
2019-02-19 15:07:07 +01:00
d4e7cbcdc8
Fixed error user edit tocken filter events not set.
...
Former-commit-id: 6c57c05f82fc0be260428474408384527d66a838
2019-02-19 14:55:44 +01:00
2573e40538
Bugfix
...
Former-commit-id: 0ea7cf8437935c77098b1e408a723ac3de4d973c
2019-02-19 14:52:14 +01:00
68afc9289d
Documentation improvements
...
Former-commit-id: ad2155056dd26014f169e277eec2ac7cd463ea3a
2019-02-19 14:51:40 +01:00
2e78012e40
Fix double authentication check in meta authentication setup
...
Former-commit-id: 37fea3368898f58fafda9c485b93bf07c8ad81fa
2019-02-19 13:13:13 +01:00
00cba4cbc9
Fixed bug in filtered modules by tag
...
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
7bd5851667
Add support for column macros.
...
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +01:00
39a60639fb
Merge branch 'ent-3439-Añadir-la-macro-de-id-del-trap-a-las-macros-de-alerta-de-trap-snmp' into 'develop'
...
Add _id_trap_ macro to snmp alert macros - #3439
See merge request artica/pandorafms!2177
Former-commit-id: 863b66aead27483654b8ec9eb21efd540f1a22e4
2019-02-19 12:33:43 +01:00
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
d554dcc7db
Added the _current_user_ macro to the event responses
...
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
2019-02-19 11:37:44 +01:00
b8fe20e373
Merge branch '3193-Mal-unidades-de-tamaño-de-log-en-diagnostic-info' into 'develop'
...
Fixed bug in diagnostic info
See merge request artica/pandorafms!2076
Former-commit-id: 79147da886f68dc106ba946a06bad66a6fd00d59
2019-02-19 10:28:31 +01:00
manuel
Daniel Rodriguez
alejandro-campos
artica
Alejandro Fraguas
daniel
Ramon Novoa
Alejandro Gallardo Escobar