0fe9c57e51
Visual Console Refactor: now the public view is updated on VC update
...
Former-commit-id: 9382876893e56f893d92636742905e171766b060
2019-04-12 13:17:33 +02:00
75d0e11dac
Visual Console Refactor: fixed some image urls to load them from the public view
...
Former-commit-id: 833a5529304b343ac22a0d054ced47d48667c306
2019-04-12 13:03:10 +02:00
3cda4523b4
Visual Console Refactor: now the rest of the view changes when the VC is udpated
...
Former-commit-id: c2972fa2b6a9177e6ce46efd36e122033fb109c4
2019-04-12 12:44:45 +02:00
ddfd3339ff
add api
...
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
2019-04-12 11:39:34 +02:00
26d5060232
fixed errors css
...
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
5d154eee04
Visual Console Refactor: minor fixes
...
Former-commit-id: 9959423e5556abe8f3fa2cbcd289a7ca1b5367bd
2019-04-12 10:06:53 +02:00
08ffb3cd2f
Visual Console Refactor: fixes
...
Former-commit-id: 69203c99cd2890830f13fe135a44872f3b19faab
2019-04-12 09:51:53 +02:00
59c2734b5a
Deleted old files. Centered the map. Fixed broken image in meta. - #3806
...
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
2019-04-12 09:20:55 +02:00
153ba4279e
Added secondary groups in global search
...
Former-commit-id: a569f78754d1f683b1585c235f1f568425c83fad
2019-04-11 16:57:43 +02:00
3928a5a523
Visual Console Refactor: added the initial version of the background updates
...
Former-commit-id: 6c859ebebf4882b3e48e9ec5f99570687ec31117
2019-04-11 10:05:28 +02:00
52007832d8
removed refr in view and public_view
...
Former-commit-id: fbefbf31bcdb0686890077a85dc1e3a032c84b4d
2019-04-10 15:02:37 +02:00
00dbb83cfe
Visual Console Refactor: minor fixes
...
Former-commit-id: e1562bc91ab07db21ae41c4eed6bb8bea0990d62
2019-04-10 11:54:01 +02:00
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
0769c61b19
add map user edit
...
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
2019-04-09 18:18:10 +02:00
aa01789b19
Added public_view
...
Former-commit-id: 15e3f67b28771eb56cd61bff56d1f09a4b3eec78
2019-04-09 17:45:21 +02:00
0e74c8f894
Visual Console Refactor: simplified code
...
Former-commit-id: 5b2f2e91733b99f8c5f18a8e34b7cec18101c242
2019-04-09 16:36:31 +02:00
c57b2b7611
Fixed item position and changed visual_console_view name
...
Former-commit-id: 985ca0cf474667284d60a025ffe1e4c0aa2e7d5a
2019-04-09 15:53:22 +02:00
cb2be4cd6f
Added DonutGraph
...
Former-commit-id: 09b54770531c96a6f5c504f06caaefc10463bba9
2019-04-08 16:21:26 +02:00
4c8736c3a1
Visual Console Refactor: refactored the visual console view
...
Former-commit-id: dbbed082521ea878edd4765971f058733f691c51
2019-04-08 10:31:04 +02:00
633ccc5f10
Update visual console view
...
Former-commit-id: f9d78c01055c88b2e2de62e5b14f3c17e116b155
2019-04-05 14:51:28 +02:00
aa640efc44
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
2019-04-05 13:19:42 +02:00
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
faecabb1cc
Fixed problem with openlayer
...
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
2019-04-03 12:54:36 +02:00
db30a8650e
Added visual_console_view
...
Former-commit-id: a121bb8ee6fe338561fcf7efda289727e1ba7afe
2019-04-03 10:08:01 +02:00
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
8b5744a6c1
Added unknown status image
...
Former-commit-id: 1b7da57a8f3f409902053a9e5c05edeb28b67033
2019-03-29 15:00:52 +01:00
59300bd757
Changed field for last contact to timestamp
...
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
2019-03-29 13:24:22 +01:00
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
34598f391b
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
b2f046e4d6
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
ba0ddfb826
style revission
...
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
2019-03-26 19:29:48 +01:00
ee6ab43a8c
minor fix
...
Former-commit-id: e1a238bd34f4264e6be9c8a826cc1057578dd0a7
2019-03-26 16:54:11 +01:00
2d1463ee0c
minor fixes networkmaps
...
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
2019-03-26 16:46:32 +01:00
94768935ee
Pending to review
...
Former-commit-id: c874be78a33585942c825f23b48010b2d604cd7c
2019-03-26 15:42:56 +01:00
f2e710907a
Normalized network/netflow interval-start ddate switch
...
Former-commit-id: 2cce98339fbcca9e7ef6bf29e7ace2d81c5ff525
2019-03-26 15:01:56 +01:00
a2f5b8502a
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
436e60c736
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
dcf40fed3d
Merge branch 'ent-3610-Vista-Edicion-de-Usuario' into 'develop'
...
Ent 3610 vista edicion de usuario
See merge request artica/pandorafms!2278
Former-commit-id: bf55b5206e79b5747b4215a05569b58ae70a35b0
2019-03-25 18:16:07 +01:00
c942242652
Changed map image size
...
Former-commit-id: 8e3757addb1c81bc4a5cdcff0fb45e396626d6b8
2019-03-25 17:59:02 +01:00
85474c6037
[Network usage map] Minor changes
...
Former-commit-id: 0dcbfaa911fad7d6ca6179689695d6829fd3822d
2019-03-25 16:40:07 +01:00
4a201bc74b
[Network usage map] Fixed menus and added header.
...
Former-commit-id: 1cdfc4f7f388f0705b32a362ce8c5f3ac1fb49b2
2019-03-25 16:00:57 +01:00
74e86768f8
Fixed no data message
...
Former-commit-id: 46b0c055d05a4c3309840fdb0eb697d78f1f6acd
2019-03-25 14:56:42 +01:00
d37acbb159
[Netflow usage map] Added data to show
...
Former-commit-id: ca4db091b4c0f40061b9f7b8f13c4fe915ce022e
2019-03-25 13:10:47 +01:00
4ea17bb0c6
fixed reload page twice
...
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
2019-03-25 12:53:50 +01:00
eba858d6c1
[Network usage map] Fixed timepickers
...
Former-commit-id: d5803cea0443eae7a0dca2846dfba199a5e35f3c
2019-03-25 12:32:39 +01:00
ddc01f9a4e
Added data from NTA to networl_usage_map
...
Former-commit-id: 9f6192faa1698959ce1ba44e13b974b8470a6a3c
2019-03-25 12:30:51 +01:00
6a1bf2fbce
Added first version of live map
...
Former-commit-id: c440a0d0785d83c17560438986b7b394223e4779
2019-03-25 11:34:03 +01:00
040f942c9f
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 9affd1c5f658a8c24c92f7e3b9868fc35868bd32
2019-03-25 10:29:49 +01:00
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
2711eb59ea
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
83a80b6aa2
minor fix
...
Former-commit-id: 0d68f24c418109858469dce32fb1cfd79e585775
2019-03-22 19:28:32 +01:00
45c7bea6e6
Fixed a bug: show map image alternative when offline
...
Former-commit-id: 9d3945a8fdff7c6c09db043037ae779b1b3ebecd
2019-03-22 10:57:22 +01:00
c19ec2b041
fix bug when filtering events by group
...
Former-commit-id: f5ee52f47cd615007f22ce54e67c1c345eed802b
2019-03-22 10:47:40 +01:00
26d231e78c
Improved user experience networkmaps
...
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
2019-03-21 20:52:01 +01:00
151fe6ac78
Fixed a bug: show map image alternative when offline
...
Former-commit-id: f800226594a46447c031e2e9273d33a04f86a810
2019-03-21 18:13:21 +01:00
95d2259236
Improvements. networkmap class
...
Former-commit-id: b2e940cbb28112fe2ac9088ce2e76fd5b48239f9
2019-03-21 16:16:53 +01:00
b8f1b5f6a1
Fixed a bug: show popup double authentication
...
Former-commit-id: a5a7d6f2cf2f3b90a277ccf9f4f042c1ab3be48d
2019-03-21 15:58:10 +01:00
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
Alejandro Gallardo Escobar
marcos.alconada
Daniel Barbero Martin
Tatiana Llorente
fermin831
Daniel Maya
Luis Calvo
fbsanchez
Daniel Rodriguez
Alejandro Fraguas
alejandro-campos
samucarc