775ebfe1d2
Created dummy Network Traffic Top N report
...
Former-commit-id: 7515d84dd40cc5ef9f50a2922e8a8a8fa5049eeb
2019-01-29 11:24:02 +01:00
1ecd656513
Data server can handle several events from a single agent
...
Former-commit-id: 2f47df007eb27cf181b130aac79d35698de67387
2019-01-22 12:59:54 +01:00
c9e11780bb
Added matrix_data XML
...
Former-commit-id: 8b927f2e3fd2c78058d4a736c371e4274c94bc1a
2019-01-21 18:49:20 +01:00
e0180aeebe
Added tnetwork_matrix data structure
...
Former-commit-id: e42bd0f0a78aab5cc9068270269262cfe7465c7b
2019-01-21 18:49:13 +01:00
e5eab4ca67
Added events in DataServer processed XML
...
Former-commit-id: db7be33ef7e6e5f58106dfef2cfb042637624f27
2019-01-21 18:49:00 +01:00
e540d96eb2
Revert "Added events in DataServer processed XML"
...
This reverts commit cbe518dc53
2019-01-21 18:43:47 +01:00
923c8ee0b8
Revert "Added tnetwork_matrix data structure"
...
This reverts commit 5328a0e239
2019-01-21 18:43:35 +01:00
64b8223f12
Revert "Added matrix_data XML"
...
This reverts commit d970c6628a
2019-01-21 18:43:09 +01:00
c75f94f9e0
Merge branch 'ent-3418-nueva-estructura-de-datos-tnetworkmatrix' into 'develop'
...
Ent 3418 nueva estructura de datos tnetworkmatrix
See merge request artica/pandorafms!2136
Former-commit-id: b04eaee2ce78625f9710b0851609ca8dfa2aea43
2019-01-21 18:32:05 +01:00
d970c6628a
Added matrix_data XML
...
Former-commit-id: cd26d436e6745a456df95484120d1b96439b274d
2019-01-21 18:27:31 +01:00
5328a0e239
Added tnetwork_matrix data structure
...
Former-commit-id: aa49de6c04a3c7a612ce7041393fe521e23e281d
2019-01-21 17:42:41 +01:00
965ef4d6f4
Merge branch 'ent-3410-eventos-data-server' into 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1'
...
Ent 3410 eventos data server
See merge request artica/pandorafms!2134
Former-commit-id: c9c8b1936355eab03dd3ec1909eff1a04428e95f
2019-01-21 15:22:03 +01:00
cbe518dc53
Added events in DataServer processed XML
...
Former-commit-id: e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6
2019-01-21 15:12:46 +01:00
f8ac525281
Merge branch '2527-listar-ycrear-filtros-de-eventos-desde-la-api' into 'develop'
...
implemented api functions to create/update/delete/list event filters
See merge request artica/pandorafms!2093
Former-commit-id: 03b530b0a118972a6af7b17fba9919b0fc45d611
2019-01-21 10:31:17 +01:00
e2471b376c
Auto-updated build strings.
...
Former-commit-id: 6c89b359049f06338695df7e9cabd3293885df10
2019-01-21 00:01:23 +01:00
14c5e9d48b
Auto-updated build strings.
...
Former-commit-id: 1eb9179a088600ca4e68930cf9e903997d8f20c7
2019-01-20 00:01:23 +01:00
5a75662b99
Auto-updated build strings.
...
Former-commit-id: 8eff24974e5b3cfbeb57d408c2d4817fe0cb7156
2019-01-19 00:01:25 +01:00
b3011e419a
Merge branch '3156-Translate-string-no-funciona' into 'develop'
...
fixed bug in function __()
See merge request artica/pandorafms!2023
Former-commit-id: 5fbbb662fdb7a044a3c616521158bcfa24e50413
2019-01-18 13:37:11 +01:00
979a87762e
Auto-updated build strings.
...
Former-commit-id: 56c567b92e7aad5a2aabd6551b3aa2f07517fb0b
2019-01-18 00:01:26 +01:00
d0ded14018
Merge branch 'ent-3328-7200-correcciones-consola-vmware' into 'develop'
...
Ent 3328 7200 correcciones consola vmware
See merge request artica/pandorafms!2126
Former-commit-id: e050791eefa12e7df5348fb190788be539e56c05
2019-01-17 16:29:11 +01:00
92aafb5953
Merge branch '2978-INTRACOM-Funciones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado-2' into 'develop'
...
Add traps, and other intracom API functions - #2978
See merge request artica/pandorafms!2119
Former-commit-id: 42bf67414f74d373ece3f83b4eecf2e4fd17f049
2019-01-17 12:08:03 +01:00
80d64f3d6b
Merge branch 'pandora_enterprise#2987' into 'develop'
...
Solved errors in mobile events view
See merge request artica/pandorafms!1907
Former-commit-id: 8efb7e917cf6a86b93d9c2905f1c63c292c742e3
2019-01-17 11:59:07 +01:00
bfecbc5337
Merge branch '2952_Mejora_en_wizard_para_crear_agentes_desde_la_metaconsola' into 'develop'
...
Added improvements in the creation of agents in the meta console
See merge request artica/pandorafms!1894
Former-commit-id: b5c450723740359204e4062a89a252247ee5157e
2019-01-17 10:04:30 +01:00
6bf6fd19d6
Auto-updated build strings.
...
Former-commit-id: f9fe79ec45febec900d21f62269f4352cc1a97a2
2019-01-17 00:01:26 +01:00
65d4c5aab7
Included control for user set filter and admin set filter
...
Former-commit-id: fe0ae14537a558e8f3ce423fd761a653ff8168e7
2019-01-16 17:53:32 +01:00
ab13faa788
Merge remote-tracking branch 'origin/develop' into pandora_enterprise#2987
...
Former-commit-id: 8d8324be8f876974cc0e33f18e9f0a93a6aff1a8
2019-01-16 17:49:10 +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
b2434229db
Merge branch '1851-Grafica_de_widget_de_WUX_se_descoloca_si_falla_la_primera_fase' into 'develop'
...
fixed error widgets wux
See merge request artica/pandorafms!2102
Former-commit-id: c47bc3fc71f671b9ae4d668a6f81711683bb43a2
2019-01-16 11:03:02 +01:00
fe13a117aa
Auto-updated build strings.
...
Former-commit-id: 04682af4f07a1cb2bae17db88c4a4f4e17ad5600
2019-01-16 00:01:27 +01:00
2e8e911ca7
added safe_input to custom_fields - value while storing them in db
...
Former-commit-id: e06e141883d87a7247a6426a75c03c7df6045e9b
2019-01-15 18:22:55 +01:00
a84db4d88f
Merge remote-tracking branch 'origin/develop' into ent-3328-7200-correcciones-consola-vmware
...
Former-commit-id: b09a410d415480efd4bcf6c387347e2e582febeb
2019-01-15 18:22:27 +01:00
f485b2f436
Merge branch 'ent-3380-Parametro-API--en-creacion-de-eventos-no-funciona-con-encoding-HTML-en-v730' into 'develop'
...
Fixed bug in functions_api
See merge request artica/pandorafms!2125
Former-commit-id: ee373ced704fd3162d6c72d9dd68aff2d5106674
2019-01-15 17:03:55 +01:00
aabcf73210
Fixed bug in functions_api
...
Former-commit-id: 28e5d9cf323dd04432ca5cabcd447e8cbf748706
2019-01-15 16:33:52 +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
6ba8b9ab9a
Merge branch '2299_Añadir_nueva_funcionalidad_en_el_CLI_remove_agent_from_policy' into 'develop'
...
2299 añadir nueva funcionalidad en el cli remove agent from policy
See merge request artica/pandorafms!2092
Former-commit-id: d9ef39c8571ab3558e76883e1afc9cbb00225c79
2019-01-15 14:37:08 +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
b38dc64ad8
Merge branch '3134-Tardanza_a_la_hora_de_aplicar_cambios_masivamente' into 'develop'
...
fixed errors in massive operation edit modules
See merge request artica/pandorafms!2101
Former-commit-id: 5c3a995d57b344ec860679b07b3624aec73cf4b8
2019-01-15 12:35:11 +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
6894623429
Auto-updated build strings.
...
Former-commit-id: 582bbf87e0972212cf48dc220871981f80974321
2019-01-15 00:01:25 +01:00
f68cc53bb2
Merge branch '2896-Vista-de-monitores-en-metaconsola' into 'develop'
...
first load it does not show the data
See merge request artica/pandorafms!2112
Former-commit-id: 5f88566e4123c079956274ac4f7db27316e11718
2019-01-14 19:21:01 +01:00
24260cea34
Merge branch 'ent-2753-meter-profiler-en-el-docker' into 'develop'
...
Added profiller to docker
See merge request artica/pandorafms!1966
Former-commit-id: 24ade418bbc05cc6a40ee6f988b53eb648fffec5
2019-01-14 14:59:50 +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
98c0bbec9a
Merge branch 'ent-2570-6239-ldap-grupos-secundarios' into 'develop'
...
Ent 2570 6239 ldap grupos secundarios
See merge request artica/pandorafms!2110
Former-commit-id: f710fa17c372e5dde1401d5cafa47a3e4ac56711
2019-01-14 10:53:45 +01:00
ad9a316a47
Auto-updated build strings.
...
Former-commit-id: 3426e636c31a7a9dcea09e442811310a4956d6ce
2019-01-14 00:01:23 +01:00
20a0aefe84
Auto-updated build strings.
...
Former-commit-id: aab4a872f690f104fe10dbdf7ef8ba86e02daef8
2019-01-13 00:01:23 +01:00
5abf8e14ff
Auto-updated build strings.
...
Former-commit-id: f78ab7f528f841aeda3dd7e28b1a2fcb34c9a05e
2019-01-12 00:01:24 +01:00
c3481933f5
Merge branch 'ent-3365-Javascript_roto_en_creacion_de_modulos' into 'develop'
...
fixed error create modules network
See merge request artica/pandorafms!2117
Former-commit-id: c522eeb2ded1442adb9a1282d350c9514e9ffa3f
2019-01-11 13:06:31 +01:00
5ead23014d
Add traps, and other intracom API functions - #2978
...
Former-commit-id: 6f4029434a36030206def701df0d6e66995c6ca3
2019-01-11 12:33:22 +01:00
fermin831
Alejandro Fraguas
artica
Daniel Rodriguez
Kike
fbsanchez
Manuel Montes
alejandro-campos
daniel
enriquecd