5411eb9d17
Merge branch 'ent-3735-Buguete-filtrado-de-eventos-por-grupo' into 'develop'
...
fix bug in event filter by group when not using secondary groups
See merge request artica/pandorafms!2276
Former-commit-id: e414c5033fbcde1d97a28190170454080531ef34
2019-03-25 10:22:45 +01:00
c19ec2b041
fix bug when filtering events by group
...
Former-commit-id: f5ee52f47cd615007f22ce54e67c1c345eed802b
2019-03-22 10:47:40 +01:00
b5e1487736
add strict comparator
...
Former-commit-id: 0561976f26d6bc59f3076f48a5a4261dafaad28b
2019-03-20 15:26:42 +01:00
36119ebb85
fix bug in event filter by group when not using secondary groups
...
Former-commit-id: fe9c88e8e2d7552fed7e5c7cd5a5694d47ee444f
2019-03-20 14:48:02 +01:00
dbf0229ce0
Merge branch 'ent-3084-Warnings_en_PHP_7' into 'develop'
...
fixed warnings php
See merge request artica/pandorafms!2197
Former-commit-id: 486796c729a540e5ce75de80914a94dc3c1170ca
2019-03-12 13:24:48 +01:00
e55d7f0042
Merge branch '3547-7561-al-pinchar-en-un-icono-enlazado-a-un-monitor-no-aparece-en-la-busqueda-por-defecto-hasta-que-no-le-damos-a-buscar' into 'develop'
...
3547 7561 al pinchar en un icono enlazado a un monitor no aparece en la busqueda por defecto hasta que no le damos a buscar
See merge request artica/pandorafms!2192
Former-commit-id: 38c35e89b2af8f4c72b912afcbd77f4d08a3951d
2019-03-12 13:18:10 +01:00
15ca89068d
Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
...
Conflicts:
pandora_console/godmode/servers/manage_recontask_form.php
pandora_console/include/functions_events.php
Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +01:00
5227390c87
se elimina linea de autosearch = false
...
Former-commit-id: aab03c4e38d41b098a8af818b45036f6524580de
2019-03-12 13:06:27 +01:00
60337b0da7
Merge branch 'ent-3559-Poner-evento-en-in-progress-provoca-un-fallo-de-visualizacion' into 'develop'
...
Fixed error in event filters when is only new events
See merge request artica/pandorafms!2252
Former-commit-id: 3dd94c18cf9c3896d7a1f95546c879de63c86fe8
2019-03-12 11:18:51 +01:00
5b3dd6121b
Fixed error in event filters when is only new events
...
Former-commit-id: a1e0529b58e4a1c62c8c35cba7b133c218f59a93
2019-03-11 17:14:26 +01:00
ae006026bf
Merge branch '3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local' into 'develop'
...
fixed error in snmp browser change server
See merge request artica/pandorafms!2236
Former-commit-id: a6a45ffe82e01f49139d80e09a954cceb245ce12
2019-03-11 11:54:58 +01:00
798567bf8e
fixed minor errors change word command for parameters
...
Former-commit-id: 6e6e56bded99331c606f7a9f6179826afee22d16
2019-03-07 09:05:38 +01:00
f79400ecfb
Merge remote-tracking branch 'origin/develop' into ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva
...
Former-commit-id: 76e5afc943bd05e89a82efbe091db42d1e0a4e8d
2019-03-07 08:32:40 +01:00
e79e2a4fbc
Finished
...
Former-commit-id: 529f6297404b74dc41af77ae672a034530f18727
2019-03-06 17:25:36 +01:00
18ca3a191b
ticket changed
...
Former-commit-id: 532d461aa9ff0c956dbbe0dd931dc6f03d56498b
2019-03-06 16:47:56 +01:00
9d7c6854a8
fixed error in snmp browser change server
...
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
8780571a74
add new functionality in event response
...
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +01:00
8f24c0cb18
Fixed conflict in CLI apply_policy
...
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
441fb979e1
Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
...
Ent 3210 nueva vista de servicios
See merge request artica/pandorafms!2195
Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
d8ee90c285
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
cdca720d9a
minor fix user_edig
...
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
2019-02-25 14:41:27 +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
504a8e9d1a
fixed warnings php
...
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +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
2c1eb0fe03
Added aws view menu
...
Former-commit-id: a64079eb5e773d3fe36031bac856aa801728f79d
2019-02-22 14:16:39 +01:00
faae9c58b3
implement services tree view
...
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
2019-02-22 14:09:27 +01:00
eb56fd566c
implemented services treeview
...
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
35ad2f4bb5
Validations for default values
...
Former-commit-id: a33139b817ece206a611d5f2678b62c876a8e41f
2019-02-22 11:21:38 +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
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
6ef1c3951a
Ticket Changed
...
Former-commit-id: e258f0932398d9fc58a8d097098c83b7bed084c5
2019-02-21 14:04:00 +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
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
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
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
d4e7cbcdc8
Fixed error user edit tocken filter events not set.
...
Former-commit-id: 6c57c05f82fc0be260428474408384527d66a838
2019-02-19 14:55:44 +01:00
00cba4cbc9
Fixed bug in filtered modules by tag
...
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
27602d8e49
Recovered notification editor for user
...
Former-commit-id: a4fbf05912c974ab388cde9e9237022f2bcc3277
2019-02-18 15:14:24 +01:00
7b2e0342c1
Fix. notification did not reach ALL target
...
Former-commit-id: 237e5dac34bcbe50453e0b56f0964a9d74aa7c04
2019-02-18 14:18:58 +01:00
c16fb1696d
Merge branch 'develop' into 3222-Deshabilitar-doble-autenticacion-si-no-esta-activada
...
Former-commit-id: 6024bd09f1bb77c7610a8adbb72a92631ad6e59d
2019-02-15 15:03:42 +01:00
e4ca9b7fc8
Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar
...
Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f
2019-02-15 14:22:55 +01:00
3e9e668e00
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
...
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
2019-02-14 10:59:27 +01:00
ed63ef47fa
Moved ReconServer to DiscoveryServer
...
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
166c3bbe88
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
...
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
42dc0c60be
supervisor
...
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
Alejandro Fraguas
alejandro-campos
Daniel Rodriguez
daniel
marcos.alconada
samucarc
fbsanchez
fermin831
manuel