5d409cd778
New view user edit
...
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
2019-03-20 16:45:24 +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
d27c509817
Merge remote-tracking branch 'origin/develop' into ent-3610-Vista-Edicion-de-Usuario
...
Former-commit-id: fb1fffdf576bd46ba733717abf2425ee0e0d607c
2019-03-20 13:28:07 +01:00
a99c8b1a7b
New view user edit
...
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
80c79b532b
[Netflow live] Removed aggregate by protocol
...
Former-commit-id: 2f02a384966bc4200f8b9b294e02fbd90ab440ef
2019-03-18 15:44:23 +01:00
4f8c7daada
[Netflow live] Change start date and end date
...
Former-commit-id: 14a24767a1426aa8151ba99495a17ddb71047cbb
2019-03-18 15:33:48 +01:00
33fd100d91
[Netflow view] Added start date
...
Former-commit-id: 98134de0f1e8c40458b36b0a14ad0b8c87bff0f2
2019-03-15 10:46:18 +01:00
8c8f368993
WIP: NetworkMaps rebuild
...
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
2019-03-14 18:51:48 +01:00
6299d23528
[Netflow live] Minor fixes
...
Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96
2019-03-14 17:49:44 +01:00
b660da6e84
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
2019-03-14 10:49:16 +01:00
d174af9a57
[Netflow live] Fixed filter styles
...
Former-commit-id: 8990361112fb96fbe2589ac2e31a105167754a8d
2019-03-14 10:43:59 +01:00
da08acce4f
[Netflow live] Removed units
...
Former-commit-id: 37d9182a46a85b44a400a50eae48cd7778a3dc84
2019-03-14 10:36:15 +01:00
e16d48804e
[Netflow live] Added removed unit from pie graph and summary table and refactorized bytes format
...
Former-commit-id: 35b9fd71ad97869e23119bd0d2031ec12400d745
2019-03-14 09:25:50 +01:00
c2c8287d3e
Fixed resolution in netflow reports
...
Former-commit-id: 9900123e9753f9360085a1dff434bc668df7eb70
2019-03-13 20:15:53 +01:00
3d1f1f86ed
[Netflow live] Removed agregate by none
...
Former-commit-id: 4da1581da67c95f29b9b34eb70436e8f68706988
2019-03-13 19:16:21 +01:00
8a336d6cfe
[Netflow live] Implemented resolution on area graphs and fixed end date
...
Former-commit-id: 86d55ac7645e62fcae6a07cbf1bd50f92d5d37a1
2019-03-13 18:55:16 +01:00
f5b0e6b1a4
minor fix radial redirection
...
Former-commit-id: 0676ff2eb51a7ea281eb1410b1e5c4082c39d074
2019-03-13 12:55:24 +01:00
95c61024f7
Cleanup Networkmaps
...
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
2019-03-13 11:38:03 +01:00
750c64fbd7
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
e61d409acc
fix in redirection after map creation
...
Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0
2019-03-12 19:23:40 +01:00
1bc326c00c
WIP: NetworkMap class
...
Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec
2019-03-12 18:17:18 +01:00
06f8aae91a
WIP NetworkMap class
...
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
2019-03-12 16:22:28 +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
aaf5d7bf89
New view user edit
...
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +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
c5722d2e10
New view user edit
...
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
9a702a90a1
New view user edit
...
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
3437994915
Fixed code style
...
Former-commit-id: 7422b647bb92ecc2d724aa71911a446aff058d3a
2019-03-11 19:36:49 +01:00
92d2e505ed
Added advanced filter on netflow live view
...
Former-commit-id: 13e2d3d26f6bb2c2f25900793464390997be4e41
2019-03-11 19:26:50 +01:00
8696bd9f91
Fixed CSV on network/netflow explorer
...
Former-commit-id: b111d5717ee66754ae15aa25c79464da92678174
2019-03-11 18:04:01 +01:00
7bf44b7c5b
Fixed styles
...
Former-commit-id: 6292bf0badc9175b6fb801b326e58ac475ae2bfb
2019-03-11 17:57:08 +01:00
4cc3eb13b9
Fixed order_by filter (some filter where lost)
...
Former-commit-id: 8f58c2615e5e8d5ba85908a888ec3dd2bcdf6f14
2019-03-11 17:53:21 +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
ccb41f1b68
Fixed z_dash(zoom) in networkmap
...
Former-commit-id: 2d19cd9234717cd5066d2ddd7094d367262ed1c4
2019-03-11 16:57:54 +01:00
935db452d2
Network report. Fixed some styles
...
Former-commit-id: 19a181044bae3f5bcec1f873e20ec50c41a73f00
2019-03-11 15:02:22 +01:00
a321a7465d
Merge branch 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/functions_netflow.php
pandora_console/operation/network/network_report.php
Former-commit-id: 4aa57202e051f4d9e8df95b000c54ac162021668
2019-03-11 13:19:17 +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
fbd5648d60
Added filter to ntop part in network explorer
...
Former-commit-id: 688f737c26599da309ed414f4291e24e521d74a0
2019-03-08 12:11:18 +01:00
ed25536a97
Added top by other metric in netflow report
...
Former-commit-id: 48f5b58ea255c59ffaa109805032c1b35de61a48
2019-03-08 11:57:32 +01:00
e9061d74b6
Added ordering header element
...
Former-commit-id: 11ffbe8c00a8ea9d881321be7c7541eaf0babe92
2019-03-08 11:46:47 +01:00
7b9bbe6b9c
Fixed reporting menu
...
Former-commit-id: efaf4d26e0d48bbdea3df7afb2c462a1b70a6701
2019-03-08 09:29:12 +01:00
dd8265f65e
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
2019-03-08 09:02:22 +01:00
6fc0a4924b
Do not calculate percentages. Catch it from netflow
...
Former-commit-id: b06a18df02d90a29660a34309a9d40c5774816b9
2019-03-07 19:11:30 +01:00
3e39e727b6
WIP: Unified class NetworkMapClass
...
Former-commit-id: 6e6f4afb70be008602f51dfbd383bb855613e084
2019-03-07 18:57:48 +01:00
a191823d83
Added pct to netflow explorer datas
...
Former-commit-id: 63907ccffb70dd2b2fc98cee065b2100d827ed2a
2019-03-07 17:25:18 +01:00
aecbdabbe0
Change period by a module interval input
...
Former-commit-id: 9f1b25e803d62a6ab501ba701083fd823a14bd64
2019-03-07 15:15:16 +01:00
1f89cccbbe
Change item link filter by image filter in network/flow explorer
...
Former-commit-id: 521cca18646273361711e75ad85f64a9b9988046
2019-03-07 15:10:38 +01:00
1fa4ef4555
Change start date by end date and vice versa
...
Former-commit-id: 193fff3013e21d8fc812bd8c6092bbf203fb104e
2019-03-07 14:04:29 +01:00
76422928e8
Added version check on netflow explorer
...
Former-commit-id: 2786b7a6c0282920d11808e77a2f66fc549d01e9
2019-03-07 14:01:50 +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
962284f8c5
Added action to hidden params en network explorer
...
Former-commit-id: e87bab9db0bb00a0b13f2bb6e0cc58a000b18c17
2019-03-06 13:41:13 +01:00
de35de6689
Added flows to CSV
...
Former-commit-id: 2cff3714b1502c3abcb36ec20e5a2fc354242a8b
2019-03-06 13:36:28 +01:00
ccb8078a5a
Added listeners and talkers netflow explorer
...
Former-commit-id: aabd4c468ae9163a89447da170861a5ab1dcc2a0
2019-03-06 13:31:55 +01:00
2e65301ace
Make IP filter permanent and added a remove button
...
Former-commit-id: f36766f60881edd7825c7aa992c832f8b74cda38
2019-03-05 18:14:38 +01:00
c09f89dffe
Added expport to CSV button
...
Former-commit-id: 7e8c23fbceb0e20bd0bc895212a52017241b68de
2019-03-05 17:30:47 +01:00
86a8024daa
Minor fix
...
Former-commit-id: 607950b830c329095bb011966df4a4f67d270ed9
2019-03-05 14:10:44 +01:00
233ede643b
Added chart to network report
...
Former-commit-id: 3dab00002afd311e787f1f4fc062958e189948d7
2019-03-05 12:33:01 +01:00
a01319464e
Added link with params html component and modify the network report
...
Former-commit-id: d95cfe164d67e70d5135feb68169bb825ee2d83a
2019-03-05 10:08:07 +01:00
942b160a3d
Use multiples in network explorer table
...
Former-commit-id: 2aec7e59e4ea46c693f5fe89c847f524cd882f63
2019-03-05 08:03:18 +01:00
d62b7f0d79
Added filter by ip requesting network matrix datas
...
Former-commit-id: 20a88fe66f9bcb2c39a9121b46e7204ed006470d
2019-03-04 20:26:11 +01:00
d89e3993e7
WIP first tasks
...
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
2019-03-04 20:02:35 +01:00
c95b057c14
Added simple table on network explorer
...
Former-commit-id: 9f2cdc58d7fc1f0375e6945c087aafbd521bacc9
2019-03-04 17:03:10 +01:00
32f14e8fe4
Added header to network explorer
...
Former-commit-id: ba49f7cb158affc89d006c77f64a1448c7da178e
2019-03-04 16:31:59 +01:00
8480572e5a
Added network explorer report filter
...
Former-commit-id: f50d86b3ba226cc8068b3eae0fb5c72f4d30dd0b
2019-03-04 16:29:08 +01:00
9d7c6854a8
fixed error in snmp browser change server
...
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
1f1c9de887
changes in default values in networkmap
...
Former-commit-id: 650abcc24fc19e565b9737e80e602f7188114148
2019-03-04 15:31:07 +01:00
b11fd87592
Added network explorer view
...
Former-commit-id: c34056a1cc0e2b700df8873a0b589d5bbfe36165
2019-03-01 14:51:13 +01:00
568d187902
Style fix
...
Former-commit-id: d7d8ba5bdc7269496adf6a1caa2ffa0631102cd5
2019-03-01 14:26:59 +01:00
cbb4f971a2
Added new network menus
...
Former-commit-id: 885f092dbfcc561cca5bf1bf8c3ba8497d94ffc4
2019-03-01 14:23:10 +01:00
f0fa992912
Ticket Resolved
...
Former-commit-id: 023a3b09aff3255b4ea6744ab12ddc2d2a5f540d
2019-02-28 10:08:33 +01:00
c7cd59ffb5
Ticket resolved
...
Former-commit-id: c7b3a4c44941a8e2ea91faf811730bbec4d7f877
2019-02-27 18:25:37 +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
72a57bfbec
minor changes in message edit
...
Former-commit-id: a36fe911f191c3a187c8c70032f3b1aaa0977fea
2019-02-11 19:27:21 +01:00
0dbabd3ba3
Improved conversation view (messages) some filters and fixes in functions_messages
...
Former-commit-id: 13597c6556939bbe772d5ed749930e30e5377c47
2019-02-11 18:28:00 +01:00
ba7540c9ee
improvement of optimization for list event
...
Former-commit-id: a7788b01160c661139e6a3a6aac70c69441265a1
2019-02-08 09:51:08 +01:00
c2a44e073f
Update events.build_query.php
...
Former-commit-id: 4622b27b1ce9e81ce81d89d7bc9d2eeb1b30fb93
2019-02-07 18:03:28 +01:00
23a8d0640f
Update events.build_query.php
...
Former-commit-id: 189244aa57d58eb33dd43f707eb6ac929f58e537
2019-02-07 17:05:05 +01:00
92af9f84bc
Fixed conflict
...
Former-commit-id: c0e0826c5a70772c049d9e0ce168f3d0b35118c0
2019-02-07 17:00:52 +01:00
d5fb9f1051
Added AJAX to user notification config window
...
Former-commit-id: 9ca09ae777d699588a76dfb619156d800a95895b
2019-02-07 12:22:50 +01:00
4c2215a3db
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
986dfcb74d
Added basic and dummy user edit notifications
...
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
2019-02-06 18:20:26 +01:00
6ddcfcbb19
Fixed code style lintern
...
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
ac6b74dcdf
Added new window to display user notifications config
...
Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94
2019-02-06 11:36:28 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
c5805e439e
Fixed filter by name of agents in events when they contain spaces
...
Former-commit-id: 93557e0ef296d1683acd86cb70ce2da6677e3e6c
2019-02-01 12:38:31 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
3f81e60df2
wip messages
...
Former-commit-id: 7852ce90b3f2681a0134a651812341f7fac00c53
2019-01-30 17:33:31 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
406c062a3c
WIP messages, usable
...
Former-commit-id: 79e0b38fe7499642480505aac088ef8b45b04714
2019-01-30 13:29:46 +01:00
fa6c4d5bc9
notifications, WIP: new lib defined
...
Former-commit-id: 430ac2e090f91403fc074d2a9b37ab36de10d5a9
2019-01-30 11:56:47 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
2155420d71
implement custom fields for node monitor view
...
Former-commit-id: d9dd515a726d1fa7cc5855b016270b9ef083cb6f
2019-01-18 11:13:29 +01:00
45becfe9ad
Merge branch '3046-Fallos-en-edicion-de-usuario' into 'develop'
...
3046-Fallos-en-edicion-de-usuario
See merge request artica/pandorafms!1947
Former-commit-id: bff6a1068784bb6ded8adec78f7458285f742368
2019-01-16 12:26:27 +01:00
797b49c03d
Merge branch '313-Respuestas-de-evento-masivas' into 'develop'
...
ent-313-Respuestas-de-evento-masivas
See merge request artica/pandorafms!2121
Former-commit-id: c4cf56f0b2526158d8f7f67ab3417e46b6e0f003
2019-01-15 16:17:53 +01:00
9048a13840
fix bug: in progress events deleting on event view massive deletion
...
Former-commit-id: 4c4f0a387ad3abd7cfea913b45c885ab3af4ecc6
2019-01-15 13:27:14 +01:00
5235b62c0d
fix disable actions in event list when centralized mode is enabled
...
Former-commit-id: d5f16b4453b1e291ba051cd381fc6c09ce0bd027
2019-01-15 11:29:12 +01:00
1ed90180c9
disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
...
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
efa2e5332f
fix massive custom event responses
...
Former-commit-id: 24db40167b05bfd7fe4de88060f03a7a0ec38e73
2019-01-14 13:40:49 +01:00
5a8e46d608
modify the way event responses are executed in event list
...
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
07dc9a0b84
first load it does not show the data
...
Former-commit-id: 417e37dfb7acd78f3fb9e379a62534ca611aa9b1
2019-01-09 12:27:22 +01:00
752186cfba
conflict solved
...
Former-commit-id: 1f523d736b97c48ecfb9b39598c529e601702775
2019-01-08 11:59:50 +01:00
05cc3d0538
Merge branch '3125_Fallo_en_calendario_Begin_Date_en_el_filtro_de_las_combined_graph' into 'develop'
...
Fixed calendar in combined graphs
See merge request artica/pandorafms!2005
Former-commit-id: a7df2231f2c3b6e94b9d3273c99112f07c258441
2019-01-03 16:41:21 +01:00
0686982055
Fixed agents_get_group_agents while trying to get agent list from target group
...
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
2018-12-28 13:09:37 +01:00
74f4c58693
Merge branch '2584_Visual_en_Mapas_GIS' into 'develop'
...
Fixed minor visual error in GIS Map
See merge request artica/pandorafms!1971
Former-commit-id: 6cdaa62ad743a06e6e7f2d0e4026a04f953fcb16
2018-12-21 10:33:17 +01:00
0670eb0d29
disable double authentication option on user edit when disabled in authentication setup
...
Former-commit-id: 3718da22ded115ae7de492ffbd200d972704865f
2018-12-10 11:04:21 +01:00
b155b06ae9
Fixed issue with secondary group
...
Former-commit-id: 879f30eec17cc27446c86dcc34bb4d774f0632dc
2018-12-07 11:20:15 +01:00
5754674212
Merge branch '2906-TIP-para-Time-autorefresh-de-Edit-my-user' into 'develop'
...
Tip added - #2906
See merge request artica/pandorafms!1882
2018-11-30 13:09:34 +01:00
14d683b003
Merge branch '2917-Error-al-cambiar-de-página-en-eventos-agrupados-por-agente' into 'develop'
...
Changed url - #2917
See merge request artica/pandorafms!1869
2018-11-30 13:08:53 +01:00
b88e584e85
Merge branch '2938-Problema-con-tags-en-el-wizard-y-la-vista-de-informes-dev' into 'develop'
...
Added check of tags in report wizard
See merge request artica/pandorafms!2007
2018-11-30 13:07:22 +01:00
8371e75757
modified event list visualization
2018-11-26 16:40:20 +01:00
557002d7fd
fixed error events graphs
2018-11-23 10:32:58 +01:00
62ad6b9a35
Added check of tags in report wizard
2018-11-22 10:39:48 +01:00
099e0e6ed2
Fixed calendar in combined graphs
2018-11-21 16:28:43 +01:00
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
f99dadca39
Merge branch 'fix/ux-panel-historical-images' into 'develop'
...
Fix/ux panel historical images
See merge request artica/pandorafms!1984
2018-11-16 12:51:31 +01:00
35870d13fd
allow snapshot_view check historical db
2018-11-16 12:42:08 +01:00
0a097d185d
fixed errors in custom fields view
2018-11-16 11:58:49 +01:00
d7db1e95e4
Merge branch 'fix/ehorus-password' into 'develop'
...
Decode entities in the eHorus password.
See merge request artica/pandorafms!1972
2018-11-14 12:41:52 +01:00
574e537ff1
Decode entities in the eHorus password.
...
Ref pandora_enterprise#3073.
2018-11-14 12:16:59 +01:00
43629d5c2a
Fixed minor visual error in GIS Map
2018-11-14 12:10:38 +01:00
22a26aa072
fixed error upgrade jquery
2018-11-14 11:40:01 +01:00
ac671d041c
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-13 15:47:07 +01:00
a201262737
Fixed php errors on radial networkmap
2018-11-12 16:29:31 +01:00
afaa6ad2ba
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-12 09:07:56 +01:00
7afc328e50
Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios_2' into 'develop'
...
Display an error message when no changes have been made - #2900
See merge request artica/pandorafms!1948
2018-11-08 12:27:45 +01:00
85adf7cf8d
Display an error message when no changes have been made - #2900
2018-11-08 12:04:08 +01:00
4179c0d341
fixed user edit update bug: not able to empty email and phone number fields and console errors. Also added validation to email and phone number inputs
2018-11-08 10:20:22 +01:00
1c1df4b5f7
fixed errors css jqueryui
2018-11-07 17:09:42 +01:00
218bf81fa1
Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields
2018-11-07 13:30:19 +01:00
3f78f15499
WIP View custom fields data
2018-11-07 13:28:00 +01:00
3ffd976365
resolved conflicts in ver_agente
2018-11-07 12:31:54 +01:00
eec3b1843d
Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios' into 'develop'
...
2900 mensajes de error y success al mismo tiempo en la edición de usuarios
See merge request artica/pandorafms!1863
2018-11-06 17:08:54 +01:00
4102f11f6b
Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo_2' into 'develop'
...
2618 bug acceso agentes en vista de grupo 2
See merge request artica/pandorafms!1928
2018-11-05 13:11:44 +01:00
3d99ef48aa
Fixed ACLs in monitoring View and agent detail
2018-11-05 13:05:34 +01:00
233b9c2c70
Well centered message modal window - #2768
2018-11-02 13:07:38 +01:00
3c78e387df
Fixed nodes count in pandora_networkmap
2018-11-02 11:32:07 +01:00
39b6164526
snapshot viewer fix
2018-10-30 18:20:10 +01:00
b1bf1d7b4b
Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
...
2326 unificar vistas ux y wux en un mismo portal
See merge request artica/pandorafms!1917
2018-10-30 16:20:26 +01:00
a58bde2118
fixed UX historical snapshot viewer
2018-10-30 16:12:48 +01:00
e03f56f0d7
Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop'
...
2429 resaltar elementos al pasar por encima o marcar
See merge request artica/pandorafms!1762
2018-10-29 09:17:54 +01:00
17286414c7
Merge branch '2619_Group_View' into 'develop'
...
Added warning and normal status agents in group view
See merge request artica/pandorafms!1799
2018-10-29 09:16:33 +01:00
1973a5fe54
Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
...
WUX-UX integration
See merge request artica/pandorafms!1890
2018-10-26 14:42:23 +02:00
0b0bad8a73
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
...
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
2018-10-25 17:43:28 +02:00
85051924b7
estilos popup
2018-10-25 14:01:12 +02:00
f2356a3a9b
Merge branch 'ent-2608-mas-problemas-de-vistas-de-grupos-secundarios' into 'develop'
...
Ent 2608 mas problemas de vistas de grupos secundarios
See merge request artica/pandorafms!1856
2018-10-25 12:59:51 +02:00
4c4c874553
Merge branch '2630-Exportación-Gráficas-relacionado-con-CSV' into 'develop'
...
Fixed bug in csv export graph
See merge request artica/pandorafms!1814
2018-10-25 12:57:24 +02:00
9b4eeb5c84
Merge branch '2723-Fallo-hint-en-eventos' into 'develop'
...
new function that adds a border to the image if the status is warning - #2723
See merge request artica/pandorafms!1743
2018-10-25 12:07:58 +02:00
8e1a946836
Merge branch '2738-Autorefresh-falla-en-la-meta' into 'develop'
...
Countdown in group view for autorefresh
See merge request artica/pandorafms!1768
2018-10-25 11:57:53 +02:00
82f6e3cb95
Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop'
...
Fixed group and set_center
See merge request artica/pandorafms!1880
2018-10-25 11:43:38 +02:00
67fc03ab6d
Merge branch '2814-Create-network-components-desde-SNMP-Walk' into 'develop'
...
Changed styles for the button create_network_component - #2814
See merge request artica/pandorafms!1817
2018-10-25 11:41:35 +02:00
89f0d547b0
Merge branch '2848-Descuadre-en-SNMP-console' into 'develop'
...
Added align center for the head of the table - #2848
See merge request artica/pandorafms!1820
2018-10-25 11:20:37 +02:00
bbde9c70b6
conflict resolved
2018-10-25 11:13:57 +02:00
582db8d3b5
Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo' into 'develop'
...
Fixed enterprise ACLs in Agents View
See merge request artica/pandorafms!1853
2018-10-25 10:40:12 +02:00
2b6e8473dc
Merge branch 'ent-2908-lentitud-vista-tactica-cuando-hay-millones-de-eventos' into 'develop'
...
Improve performance on tactical view with a lot of events
See merge request artica/pandorafms!1857
2018-10-25 10:32:11 +02:00
50aa314191
WUX-UX integration
2018-10-24 19:31:39 +02:00
87abf1dc02
added event time filter in tactical view
2018-10-24 16:36:44 +02:00
b9112541fb
Tip added - #2906
2018-10-23 13:56:27 +02:00
f10a661cd6
Fixed group and set_center
2018-10-23 12:36:20 +02:00
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
f96c626823
Changed url - #2917
2018-10-18 16:34:03 +02:00
Tatiana Llorente
alejandro-campos
fermin831
fbsanchez
Alejandro Fraguas
Daniel Rodriguez
daniel
marcos.alconada
samucarc
Daniel Maya
manuel
Samuel Carcases
Alejandro Gallardo Escobar
artica
vgilc
Ramon Novoa