manuel
1acde54a3f
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
...
Conflicts:
pandora_console/install.php
Former-commit-id: 89c947d8a835c4a63a8f9a91df5542a3fbc230d9
2019-03-11 09:46:59 +01:00
manuel
ccb669a204
Fixed minor errors in setup_ehorus
...
Former-commit-id: ed0ba17641714a87446b4db88d933d7b176e531e
2019-03-11 09:37:08 +01:00
artica
0210c2381d
Auto-updated build strings.
...
Former-commit-id: 7f83037f89edf17156828a793fa1ae3a5920d818
2019-03-11 00:01:58 +01:00
artica
b79815bb06
Auto-updated build strings.
...
Former-commit-id: e002aa51a4e0ad634ed459dcccd4444cb1d0081c
2019-03-10 00:01:25 +01:00
artica
fd68b49710
Auto-updated build strings.
...
Former-commit-id: 6b07eeeea7577d37282399b23c8b409ab7253507
2019-03-09 00:01:32 +01:00
Daniel Rodriguez
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
Fermin
fbd5648d60
Added filter to ntop part in network explorer
...
Former-commit-id: 688f737c26599da309ed414f4291e24e521d74a0
2019-03-08 12:11:18 +01:00
Luis Calvo
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
Fermin
ed25536a97
Added top by other metric in netflow report
...
Former-commit-id: 48f5b58ea255c59ffaa109805032c1b35de61a48
2019-03-08 11:57:32 +01:00
Fermin
e9061d74b6
Added ordering header element
...
Former-commit-id: 11ffbe8c00a8ea9d881321be7c7541eaf0babe92
2019-03-08 11:46:47 +01:00
Daniel Rodriguez
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
Daniel Rodriguez
b19161ed3c
Merge branch 'ent-2687-Añadir-nuevo-custom-field-de-agente-de-tipo-combo' into 'develop'
...
Added custom field combo values in agent custom field
See merge request artica/pandorafms!2246
Former-commit-id: 3dbf90c17c8964761a53b062a1b9144196ec3cba
2019-03-08 10:34:44 +01:00
Alejandro Fraguas
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
manuel
c41c9d10e0
Changed sql files
...
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
2019-03-08 10:01:55 +01:00
Fermin
7b9bbe6b9c
Fixed reporting menu
...
Former-commit-id: efaf4d26e0d48bbdea3df7afb2c462a1b70a6701
2019-03-08 09:29:12 +01:00
Fermin
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
artica
e43d1aa356
Auto-updated build strings.
...
Former-commit-id: d9a712a382713bbbbb82849a2be70991acd7e72f
2019-03-08 00:01:31 +01:00
fermin831
471770ec85
Reduced icon size on netflow explorer
...
Former-commit-id: 6d16a2583dcdbf62386b29662a914a538bae9275
2019-03-07 19:16:24 +01:00
fermin831
6fc0a4924b
Do not calculate percentages. Catch it from netflow
...
Former-commit-id: b06a18df02d90a29660a34309a9d40c5774816b9
2019-03-07 19:11:30 +01:00
Luis Calvo
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
fermin831
a191823d83
Added pct to netflow explorer datas
...
Former-commit-id: 63907ccffb70dd2b2fc98cee065b2100d827ed2a
2019-03-07 17:25:18 +01:00
Daniel Rodriguez
962e519bc9
Merge branch 'ent-3590-Ampliar_limite_de_caracteres_en_str_warning_y_str_critical_en_consola' into 'develop'
...
fixed minor error lenght str.warning and str.critical 1024 charts
See merge request artica/pandorafms!2233
Former-commit-id: d79f8f1b2b293544dd463387d33bd36669accb4c
2019-03-07 15:50:59 +01:00
fermin831
aecbdabbe0
Change period by a module interval input
...
Former-commit-id: 9f1b25e803d62a6ab501ba701083fd823a14bd64
2019-03-07 15:15:16 +01:00
fermin831
1f89cccbbe
Change item link filter by image filter in network/flow explorer
...
Former-commit-id: 521cca18646273361711e75ad85f64a9b9988046
2019-03-07 15:10:38 +01:00
daniel
cfcb427676
fixed minor error
...
Former-commit-id: 5025e19699e773afee950a31bdceeeb0eb4bc47d
2019-03-07 14:52:31 +01:00
fermin831
1fa4ef4555
Change start date by end date and vice versa
...
Former-commit-id: 193fff3013e21d8fc812bd8c6092bbf203fb104e
2019-03-07 14:04:29 +01:00
fermin831
76422928e8
Added version check on netflow explorer
...
Former-commit-id: 2786b7a6c0282920d11808e77a2f66fc549d01e9
2019-03-07 14:01:50 +01:00
manuel
1020ec1bd7
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
...
Conflicts:
pandora_console/godmode/setup/setup_visuals.php
Former-commit-id: c193f6995a3a4115270cf45d635e310bf0f8cd3a
2019-03-07 13:45:56 +01:00
fermin831
1abe88c375
Show post in first step in netflow explorer
...
Former-commit-id: 21263d2d4ce0e9f5249156345c837f90b5227381
2019-03-07 13:38:03 +01:00
manuel
d4f5482e99
Added custom field combo values in agent custom field
...
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
Daniel Rodriguez
06705e7e25
Merge branch 'ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva' into 'develop'
...
add new functionality in event response
See merge request artica/pandorafms!2212
Former-commit-id: e32962100f2f2b71f1977f29e10c0772b6c27e17
2019-03-07 11:13:36 +01:00
marcos.alconada
2d6636bb51
Revert changes on dbmanager.php
...
Former-commit-id: 3c9eaec695b923ea81f60d8dcfb5716af6515e37
2019-03-07 10:36:06 +01:00
daniel
798567bf8e
fixed minor errors change word command for parameters
...
Former-commit-id: 6e6e56bded99331c606f7a9f6179826afee22d16
2019-03-07 09:05:38 +01:00
daniel
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
daniel
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
daniel
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
artica
4eb6c16339
Auto-updated build strings.
...
Former-commit-id: 4c22b36dac2410ec75f5cae1c0e6ec7b81e5d78f
2019-03-07 00:01:27 +01:00
marcos.alconada
e79e2a4fbc
Finished
...
Former-commit-id: 529f6297404b74dc41af77ae672a034530f18727
2019-03-06 17:25:36 +01:00
alejandro-campos
d760c7d701
fix bug in functions_filemanager
...
Former-commit-id: 93507790a70eb673a5660357acfcdf9c68279047
2019-03-06 17:07:37 +01:00
marcos.alconada
18ca3a191b
ticket changed
...
Former-commit-id: 532d461aa9ff0c956dbbe0dd931dc6f03d56498b
2019-03-06 16:47:56 +01:00
fermin
9e87585e4b
Merge branch 'ent-3618-meter-las-dependencias-del-modo-debug-en-la-imagen-de-docker' into 'develop'
...
Added debugger and profiler deps to Dockerfile
See merge request artica/pandorafms!2220
Former-commit-id: 82ba7af10d0d644fc91e2af5d0a43b21afa6f27d
2019-03-06 15:47:55 +01:00
Daniel Rodriguez
9152e2f236
Merge branch 'ent-3504-Bug-pandoradbmigrate' into 'develop'
...
add changes to migrate script
See merge request artica/pandorafms!2214
Former-commit-id: 24ef182bbdf7b7daabb613e865c88befaec09acc
2019-03-06 14:27:56 +01:00
fermin831
962284f8c5
Added action to hidden params en network explorer
...
Former-commit-id: e87bab9db0bb00a0b13f2bb6e0cc58a000b18c17
2019-03-06 13:41:13 +01:00
fermin831
de35de6689
Added flows to CSV
...
Former-commit-id: 2cff3714b1502c3abcb36ec20e5a2fc354242a8b
2019-03-06 13:36:28 +01:00
fermin831
ccb8078a5a
Added listeners and talkers netflow explorer
...
Former-commit-id: aabd4c468ae9163a89447da170861a5ab1dcc2a0
2019-03-06 13:31:55 +01:00
Daniel Rodriguez
7ded65d162
Merge branch 'ent-3432-Nueva-cabecera-y-menu-lateral' into 'develop'
...
Ent 3432 nueva cabecera y menu lateral
See merge request artica/pandorafms!2240
Former-commit-id: ea97a0795a923bb4a72d30c96de90490fb3a879b
2019-03-06 10:59:13 +01:00
Tatiana Llorente
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
Tatiana Llorente
b2bf411608
Resolve conflict with install.php - #3432
...
Former-commit-id: 7b082b9f2f4aaae5dd2218abc6ae67d17640735e
2019-03-06 08:59:41 +01:00
artica
88f1f16a5a
Auto-updated build strings.
...
Former-commit-id: 4e42c790d0cc4e621a9cd231c77b3d04fc8443c4
2019-03-06 00:01:33 +01:00
Fermin
2e65301ace
Make IP filter permanent and added a remove button
...
Former-commit-id: f36766f60881edd7825c7aa992c832f8b74cda38
2019-03-05 18:14:38 +01:00
