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
9aecc6b85b
NetworkClass RC1
...
Former-commit-id: 8b77646d618d157f0804b11cb7193a7f25bda97b
2019-03-20 13:10:20 +01:00
9b345ea947
[Netflow live] Hide netflow circular mesh
...
Former-commit-id: d00293853fc8b498ddee9798b1d1feaea3c13fbf
2019-03-20 12:16:30 +01:00
f32e022b1b
Fixed detailed host traffic chart
...
Former-commit-id: abdf6f9d171facf53260d90f28204d1e81bbeaf4
2019-03-20 10:26:44 +01:00
c598eb60fb
Auto-updated build strings.
...
Former-commit-id: 35d392b59c07d74a3a8fb8f9291b8835a669c0f2
2019-03-20 00:01:24 +01:00
1b99c5db49
WIP netclass editor
...
Former-commit-id: 2c7dffb63e4f9c587c3cdcbf8f87f134a82c1299
2019-03-19 20:43:08 +01:00
bc9192b98a
[Netflow] Merge three reports in one
...
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
2019-03-19 17:33:39 +01:00
392c0d0bff
Auto-updated build strings.
...
Former-commit-id: 143536a35d2458e1a118a4772803afd4a075a26f
2019-03-19 00:01:25 +01:00
97b53db82b
wip relationships
...
Former-commit-id: 7f582f8c0197f488438226120eaea4c4dcc1646e
2019-03-18 18:11:54 +01:00
bf633e891c
[Netflow live] Merged summatory pie and statistic into a single view called Summary
...
Former-commit-id: 367adc7ff96bdd6b16c4d4acf9fff2fb02cd4a75
2019-03-18 16:44:16 +01:00
80c79b532b
[Netflow live] Removed aggregate by protocol
...
Former-commit-id: 2f02a384966bc4200f8b9b294e02fbd90ab440ef
2019-03-18 15:44:23 +01:00
60870efad6
[Netflow live] Removed aggregate and resolution from report content and move to header subtitle
...
Former-commit-id: 205e5f8ff7633016fe83667b2fc237bc1bdae03f
2019-03-18 10:54:37 +01:00
c2033715a9
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 4e097a7169f1ecb05c843076b67f98f0ea1370af
2019-03-18 09:06:20 +01:00
d13e7bbf44
new generic functions
...
Former-commit-id: 09352ca97ea73505acdb44d14cde79b0d916d286
2019-03-18 09:05:47 +01:00
8a7702e054
Update networkmap class with simple map
...
Former-commit-id: cb6bd489ba973cf0f9c6eda8dee062518f33f382
2019-03-18 09:01:53 +01:00
e91335ae21
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/install.php
Former-commit-id: 3d8ef5634d3c1b87e09db11180047bedc0518028
2019-03-18 08:21:25 +01:00
4772f84850
Auto-updated build strings.
...
Former-commit-id: d3bb4e970fb058410a3f4889b4706f4a79aef09c
2019-03-18 00:01:24 +01:00
1ddeda295c
WIP networkmap class
...
Former-commit-id: fbd4ed5e5784c510bc1ea66f1627e61fa176573c
2019-03-17 01:39:56 +01:00
093404eedc
Auto-updated build strings.
...
Former-commit-id: d2bb79b1e176c0047307b57816022ab1834c7da0
2019-03-17 00:01:29 +01:00
16d5bf5f66
Auto-updated build strings.
...
Former-commit-id: 34092826c1d38aedddf8c660c527ebcec3816c18
2019-03-16 00:01:30 +01:00
fe045962e7
wip generate_dot
...
Former-commit-id: f41d5a55ec9cd8f27124d6697e92c5fb3009a2d2
2019-03-15 20:44:57 +01:00
fbce6d8aba
Fixed code style
...
Former-commit-id: 0292582ee1d12de325929e77053f1f15985791fb
2019-03-15 14:24:49 +01:00
d5108efb0d
fixed error update manager delete files
...
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
c123d9d9fd
[Netflow live] Recalculate multiplier time if resolution is too high
...
Former-commit-id: 60861c9e220a9d69841939dd485265e52542b1ae
2019-03-15 11:36:13 +01:00
bf5dfd8bdb
Extend class to pencil image in html interval component
...
Former-commit-id: baf46a4b64f58e300b092a8ee71c438931e2d840
2019-03-15 10:52:46 +01:00
916d11c625
Merge remote-tracking branch 'origin/develop' into ent-3612_Update_manager_eliminar_archivos_obsoletos
...
Former-commit-id: 70641758194522782cc1041f51a278350a7877f1
2019-03-15 10:39:23 +01:00
7e345035e1
add height and round border in d3 graph progress
...
Former-commit-id: 8eacfe068c1ae744fd04a752f65ed44f747d6158
2019-03-15 10:22:55 +01:00
0593e72f3e
move custom net scan and script to OPEN
...
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
2019-03-15 09:11:18 +01:00
be08d76e6c
Auto-updated build strings.
...
Former-commit-id: b661529d620964e946ecb4973030f2518f332458
2019-03-15 00:01:22 +01:00
8c8f368993
WIP: NetworkMaps rebuild
...
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
2019-03-14 18:51:48 +01:00
a1aa480421
add delete files in update manager
...
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +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
da08acce4f
[Netflow live] Removed units
...
Former-commit-id: 37d9182a46a85b44a400a50eae48cd7778a3dc84
2019-03-14 10:36:15 +01:00
cf8915af36
[Netflow live] Removed unit from circular mesh
...
Former-commit-id: 4f6fceadcf504ccf5006722b26a5b2259adc2970
2019-03-14 10:05:21 +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
834c18e49e
[Netflow live] Remove unit from statistics table
...
Former-commit-id: 2b0289fef0b663b558794b2ac1b16d0128c68bc9
2019-03-14 09:07:17 +01:00
0ccbb1198a
Auto-updated build strings.
...
Former-commit-id: 9f80809f181718d9c5fe97439b4d23c856bf9c93
2019-03-14 00:01:25 +01:00
473a40e7d2
[Netflow live] Removed unit functionallity from area graph and data table
...
Former-commit-id: 2d60141028e01e1fdf5a9d5716aa69a2cfe08d08
2019-03-13 21:14:43 +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
f4290e52fe
Minor fix notif. ball margins
...
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
2019-03-13 15:55:24 +01:00
95c61024f7
Cleanup Networkmaps
...
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
2019-03-13 11:38:03 +01:00
046a126889
Merge branch 'ent-3696-7723-No-inserta-comentario-create_event-API' into 'develop'
...
disable cache for events_comment
See merge request artica/pandorafms!2257
Former-commit-id: 1293d55a9bc009b79e37dd54cd848544ae6c3286
2019-03-13 10:32:56 +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
99afea22cb
Auto-updated build strings.
...
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
2019-03-13 00:01:24 +01:00
e61d409acc
fix in redirection after map creation
...
Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0
2019-03-12 19:23:40 +01:00
bf9b84f266
discarded ranksep var as recommended edge len
...
Former-commit-id: 24fe2b0f7ff49b9bdf4e4ef6463ddf5f66de04d8
2019-03-12 18:38:58 +01:00
663c1e0841
NetworkMap class rc1
...
Former-commit-id: 871da4e80cd5909f6bb1da567e3fbe55709690a5
2019-03-12 18:32:55 +01:00
1bc326c00c
WIP: NetworkMap class
...
Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec
2019-03-12 18:17:18 +01:00
cb1fc5dc67
Merge branch 'ent-3616-Pantalla-de-login' into 'develop'
...
Ent 3616 pantalla de login
See merge request artica/pandorafms!2248
Former-commit-id: c6e02af2b50a12933ec31cd5496fafb10a646c7a
2019-03-12 17:23:04 +01:00
c91c79a735
WIP experiments with graphviz
...
Former-commit-id: cee005851cd7ed05aa43fd3037c5c7d743d06fa7
2019-03-12 16:52:42 +01:00
06f8aae91a
WIP NetworkMap class
...
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
2019-03-12 16:22:28 +01:00
96d6e12546
disable cache for events_comment
...
Former-commit-id: 4a3477e1911d7d5cc02ac5207ccc30cb43e7f220
2019-03-12 16:12:58 +01:00
d314062623
Merge branch 'ent-2674-Nueva_macro_event_timestamp' into 'develop'
...
Ent 2674 nueva macro event timestamp
See merge request artica/pandorafms!2244
Former-commit-id: 9414e607f69637c19a5d8e61e80a2d43abb9ce0b
2019-03-12 13:51:47 +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
aaf5d7bf89
New view user edit
...
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
d7983bec4e
WIP NetworkMap class
...
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +01:00
29f00dd1da
New login page
...
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
2019-03-12 11:09:12 +01:00
c5722d2e10
New view user edit
...
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
e5190a91ee
WIP NetworkMap class
...
Former-commit-id: 90763db5291c638e89216da48e1fc4fdba92bc82
2019-03-12 10:29:35 +01:00
0ad8a0383f
WIP NetworkMap class
...
Former-commit-id: f2594c8388e4cb235e39f08945ad064e999cfbcb
2019-03-12 10:29:19 +01:00
9a702a90a1
New view user edit
...
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
67080c72d9
Auto-updated build strings.
...
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
2019-03-12 00:01:23 +01:00
1d660d259f
WIP NetworkMap class
...
Former-commit-id: 6694ee84fe5e9dc783010a3092753b4041370993
2019-03-11 20:10:08 +01:00
e672456998
fixes satellite contact interval detector
...
Former-commit-id: b3536e29fd7ae1330667eee7bf98a55ef3f65e4b
2019-03-11 18:04:23 +01:00
80fb8679a3
Merge branch 'ent-3578-ACL-visual-consol-not-working-properly' into 'develop'
...
Ent 3578 acl visual consol not working properly
See merge request artica/pandorafms!2250
Former-commit-id: 66f3e799ed124327f73061962a40dd1f63174b21
2019-03-11 17:02:10 +01:00
ccb41f1b68
Fixed z_dash(zoom) in networkmap
...
Former-commit-id: 2d19cd9234717cd5066d2ddd7094d367262ed1c4
2019-03-11 16:57:54 +01:00
e0d41957f9
Netflow graphs display as stacked
...
Former-commit-id: 58bdd14900b5d6e36041417d31b242f31af9358b
2019-03-11 16:25:10 +01:00
5f7680f4ee
WIP NetworkMap class
...
Former-commit-id: 0380bec0023a1c6a5eb3f902ed66738c1d297754
2019-03-11 15:40:44 +01:00
81bc8daa73
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: ad74ff783b7a5747a85057c73c04bca37a622109
2019-03-11 15:38:14 +01:00
2188caaec2
WIP NetworkMap class
...
Former-commit-id: 5af817aef635798f1ebdfcf596f30939b327e2a7
2019-03-11 15:37:08 +01:00
9db8078e72
Fixed first painted map
...
Former-commit-id: 8f1098e312b4524568501a25642a533615e899f9
2019-03-11 15:18:09 +01:00
c8bad2b68a
WIP NetworkMap class
...
Former-commit-id: e6918056fa9d71d33cc3b06e3c265dc3856e45af
2019-03-11 15:10:22 +01:00
fcab1ae612
WIP NetworkMap class
...
Former-commit-id: da5ce8681313cdf5c5a7ec7a005c3ebd273fea43
2019-03-11 15:09:31 +01:00
f4208a35f2
Changede sec=reporting to sec=network on visual console link to another console
...
Former-commit-id: 5cbbae6f99993a7b250feea354eb197fe6355969
2019-03-11 13:25:28 +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
cfa2c08b16
Merge branch 'ent-3668-No-se-puede-subir-ficheros-en-colecciones' into 'develop'
...
fix bug in functions_filemanager
See merge request artica/pandorafms!2243
Former-commit-id: 8a00098cb8917cc309dc5fe3bc327e5c70f9417b
2019-03-11 12:37:23 +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
c6c04fd0c9
Merge remote-tracking branch 'origin/develop' into ent-3616-Pantalla-de-login
...
Former-commit-id: e3261f935989cbc06f503abe6d8b762cef1b78f0
2019-03-11 10:08:44 +01:00
71afb7a741
New login page
...
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
2019-03-11 10:07:22 +01:00
b6bb7b2697
Merge remote-tracking branch 'origin/develop' into ent-3578-ACL-visual-consol-not-working-properly
...
Former-commit-id: ebd11459b73a64d43228e4d764fc5fc7585ae056
2019-03-11 09:47:24 +01:00
0210c2381d
Auto-updated build strings.
...
Former-commit-id: 7f83037f89edf17156828a793fa1ae3a5920d818
2019-03-11 00:01:58 +01:00
b79815bb06
Auto-updated build strings.
...
Former-commit-id: e002aa51a4e0ad634ed459dcccd4444cb1d0081c
2019-03-10 00:01:25 +01:00
fd68b49710
Auto-updated build strings.
...
Former-commit-id: 6b07eeeea7577d37282399b23c8b409ab7253507
2019-03-09 00:01:32 +01:00
75b92a57c4
Created function run_graphviz
...
Former-commit-id: 3baf21fc620a09518641d63b456c43de32e305ed
2019-03-08 14:12:58 +01:00
eb1917eed3
Merge branch 'ent-3605-Informe_de_servicios_casca_con_paradas_planificadas' into 'develop'
...
fixed errors SLA With planned downtime
See merge request artica/pandorafms!2232
Former-commit-id: 6e38f88f9b06e38e5fa1cb8dc770a410a04ba249
2019-03-08 12:14:55 +01:00
fbd5648d60
Added filter to ntop part in network explorer
...
Former-commit-id: 688f737c26599da309ed414f4291e24e521d74a0
2019-03-08 12:11:18 +01:00
5d33d7468e
Merge remote-tracking branch 'origin/develop' into ent-3578-ACL-visual-consol-not-working-properly
...
Former-commit-id: 506c3611ff578c95f07753113d1bc46d80069c95
2019-03-08 12:04:57 +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
82a239240c
Merge branch 'ent-3677-SLA-Graphics-not-viewing-properly' into 'develop'
...
Restored width in % and forced Agent SNMP view to enter if with widget=true
See merge request artica/pandorafms!2247
Former-commit-id: 8c579cdb697ff55426bee8c6f3d1a94fda99c7fb
2019-03-08 10:53:43 +01:00
c76558c66e
Merge branch 'ent-3564-sincronizar-colecciones-desde-meta-con-modo-centralizado-edicion-de-directorios-nodo' into 'develop'
...
Fixed synchronize collections in node
See merge request artica/pandorafms!2226
Former-commit-id: 18310b2aa7ae2275e2c19196118f00738a64daf4
2019-03-08 10:25:08 +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
e43d1aa356
Auto-updated build strings.
...
Former-commit-id: d9a712a382713bbbbb82849a2be70991acd7e72f
2019-03-08 00:01:31 +01:00
471770ec85
Reduced icon size on netflow explorer
...
Former-commit-id: 6d16a2583dcdbf62386b29662a914a538bae9275
2019-03-07 19:16:24 +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
98ec2f31e6
Restored width in % and forced Agent SNMP view to enter if with widget=true
...
Former-commit-id: 25ca763789d5d30d298b6bf77bd5f0630aff526f
2019-03-07 18:05:03 +01:00
a191823d83
Added pct to netflow explorer datas
...
Former-commit-id: 63907ccffb70dd2b2fc98cee065b2100d827ed2a
2019-03-07 17:25:18 +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
00283a5c6a
progress task list
...
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +01:00
76422928e8
Added version check on netflow explorer
...
Former-commit-id: 2786b7a6c0282920d11808e77a2f66fc549d01e9
2019-03-07 14:01:50 +01:00
1abe88c375
Show post in first step in netflow explorer
...
Former-commit-id: 21263d2d4ce0e9f5249156345c837f90b5227381
2019-03-07 13:38:03 +01:00
97e6c7c77d
minor fix notif. satellite crashed
...
Former-commit-id: 829dc9d8ab224698bfb33582917ca8008ba7b255
2019-03-07 11:57:31 +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
20a0a64149
Merge remote-tracking branch 'origin/develop' into 3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local
...
Former-commit-id: 8cd0faa32438d2f8f14c409a64c24a4684b3d16f
2019-03-07 08:19:39 +01:00
f224ec19de
Merge remote-tracking branch 'origin/develop' into ent-2674-Nueva_macro_event_timestamp
...
Former-commit-id: 3f8a5700ea1555758a56bc47eb219d00cb5df34f
2019-03-07 08:16:19 +01:00
4eb6c16339
Auto-updated build strings.
...
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
2019-03-07 00:01:27 +01:00
aef10cf649
Fixed grown in notifications
...
Former-commit-id: c563f2388d27d4fffbcfaf34fbd1c4d83ad4ef84
2019-03-06 19:39:07 +01:00
a860b293e3
minor fixes in url and descriptions (discovery)
...
Former-commit-id: a53542c61164a41cd4c2befea73191e9f74e5800
2019-03-06 18:28:00 +01:00
b9357b6b73
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 275cfc7046e2155a6b9d1860372f59cc175924c8
2019-03-06 18:02:47 +01:00
aa67c6b157
Improved notifications text avoiding entities
...
Former-commit-id: ef21786881bcd1b7bc332275e533757fc7bddd33
2019-03-06 18:00:28 +01:00
d722c39393
add custom net scan
...
Former-commit-id: 61df342754f17b2ecfe3ad06055e9c5b73617d03
2019-03-06 17:14:32 +01:00
d760c7d701
fix bug in functions_filemanager
...
Former-commit-id: 93507790a70eb673a5660357acfcdf9c68279047
2019-03-06 17:07:37 +01:00
40bc938000
notifications font color and some minor changes
...
Former-commit-id: d56c7ed04a10ef693867df7709002169f865bbc3
2019-03-06 16:38:06 +01:00
05c6e82e93
WIP: netmap
...
Former-commit-id: 9d269c2829df2c2e4eaddb7432ff1071ee1adb3a
2019-03-06 16:30:40 +01:00
ccb8078a5a
Added listeners and talkers netflow explorer
...
Former-commit-id: aabd4c468ae9163a89447da170861a5ab1dcc2a0
2019-03-06 13:31:55 +01:00
acc44ff9ce
Merge branch 'develop' into 'ent-3432-Nueva-cabecera-y-menu-lateral'
...
Conflicts:
pandora_console/install.php
Former-commit-id: 35214830b309620c88c44b32f93cfae93775e9a8
2019-03-06 09:18:38 +01:00
88f1f16a5a
Auto-updated build strings.
...
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
2019-03-06 00:01:33 +01:00
825128e31e
WIP: minor updates in notification wrapper
...
Former-commit-id: 1dd6fcf1ca43cc9d3b0c633c7bd6487240c2b5bf
2019-03-05 19:10:44 +01:00
63ee3b0329
wip: style checks
...
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
2019-03-05 19:02:23 +01:00
70e4e86cdf
Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
...
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
2019-03-05 18:58:26 +01:00
c03631ec9b
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 1e68380f62f61e9ac895a0c2bade2e6c8f5b589f
2019-03-05 18:56:14 +01:00
39805c3f0c
removed old useless code
...
Former-commit-id: d378a359085f9ad8d45f40bff6c280b456a86c33
2019-03-05 18:29:42 +01:00
63cd5fe018
Merge branch 'ent-3530-SNMP-event-graph-not-working' into 'develop'
...
Fixed width unit on graph, setted to px instead of %
See merge request artica/pandorafms!2234
Former-commit-id: 52caaa0de71150e62616b363471aa4bafadf4fcb
2019-03-05 18:06:45 +01:00
5c65f2541d
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 12579e897dc21339580e7b52f4de593714431c58
2019-03-05 16:48:41 +01:00
0548fdd95f
Change english strings
...
Former-commit-id: 47d1b455f4997ce7b63672678aaeb42a8205e957
2019-03-05 16:48:27 +01:00
4c0263206e
WIP: Networkmap & recon improvements
...
Former-commit-id: 25e6fb140f4cf52e919eed941b6659ed377ac26c
2019-03-05 16:12:29 +01:00
e26c81aa6c
Fixed images and reset map in networkmap
...
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
2019-03-05 15:33:27 +01:00
da0f0b492a
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: dbfc5603652eacc4214e6503b5603bd79f834984
2019-03-05 15:06:18 +01:00
09897591c3
Add extended events to event reporting tables
...
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
2019-03-05 15:03:05 +01:00
6bc73b54cb
Merge branch 'ent-3529-7431-conteo-de-agentes-deshabilitados-en-metaconsola' into 'develop'
...
Fixed downtimes disabled and enabled agents
Closes pandora_enterprise#3529
See merge request artica/pandorafms!2205
Former-commit-id: dc624b9b6f73ca1a56527c71ba4b0495ad219aaa
2019-03-05 14:43:10 +01:00
590accf90c
Merge branch 'ent-3403-Pantalla_en_blanco_con_credenciales_erroneas_en_config_php' into 'develop'
...
Added new alert when failed database
See merge request artica/pandorafms!2229
Former-commit-id: b2fef57a8988766b75c048542c746977f03aba4e
2019-03-05 13:42:33 +01:00
35633d181b
Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral
...
Conflicts:
pandora_console/install.php
Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6
2019-03-05 13:20:59 +01:00
054bc070f7
WIP review netmaps
...
Former-commit-id: 167c0fa7aacf7b3e916e9572faf43e32eee116dc
2019-03-05 13:19:03 +01:00
7be5d3e9e0
new header and menu
...
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +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
930c527ad2
Auto-updated build strings.
...
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
2019-03-05 00:01:26 +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
92974c71d9
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: d6708f1ea30390850ca133f8bd474e177863b016
2019-03-04 16:43:55 +01:00
756fdd2cd4
minor fix in supervisor - server status global counter
...
Former-commit-id: f34daeb57a442b7f3b299e3d72d40317b0e9e0c0
2019-03-04 16:43:48 +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
Tatiana Llorente
fbsanchez
fermin831
artica
Daniel Maya
Daniel Barbero
Daniel Rodriguez
Alejandro Fraguas
Luis Calvo
alejandro-campos