841a9cf60b
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: a23fffb984a6edd4ef7eefe871814ea0120c615a
2019-01-23 11:08:48 +01:00
1e4a288f53
Auto-updated build strings.
...
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
2019-01-23 00:01:23 +01:00
2e2774f256
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 5729e346de91ebf8897bc5d0dbc9f3f451711e86
2019-01-22 17:42:47 +01:00
65fce762df
Merge branch 'Informes_Event_report_group_no_se_visualizan_exportan_2' into 'develop'
...
Fixed Event reports pie graphs in metaconsole
See merge request artica/pandorafms!2128
Former-commit-id: d134417a05ddb7fd323d8ed4cba93e21e2551f7f
2019-01-22 14:30:45 +01:00
d8ca12bd63
Merge branch 'ent-3296-Descarga-informe-CSV-con-Graficas-no-funcionan' into 'develop'
...
Fixed bug in export to csv report
See merge request artica/pandorafms!2135
Former-commit-id: 04d0af4a61212057c7e539fc4513e2b45a2bc31a
2019-01-22 14:06:59 +01:00
e8497bb80c
Changed the order of actions
...
Former-commit-id: ec733bfcf1705552f6257dc14c5a34e0a3e84e66
2019-01-22 11:03:52 +01:00
f1dbd40a6a
Merge branch 'ent-3421-error-en-un-push' into 'develop'
...
Ent 3421 error en un push
See merge request artica/pandorafms!2138
Former-commit-id: 6740a7f61adebbacaeb40b47b42973e4b518d12d
2019-01-22 10:04:07 +01:00
4236b55694
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 87b7d3a7591ed181be022b786deba8f090e43d49
2019-01-22 09:00:47 +01:00
0f29d6461e
Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: b7873c08910f08827387db6d92d8a656d8ca4bf2
2019-01-22 08:57:59 +01:00
2c208b5e29
fixed errors php7 mysqli and warning include
...
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
2019-01-22 08:57:48 +01:00
c586b68cb3
Auto-updated build strings.
...
Former-commit-id: 84dcfe707e9a70754b4ee72365bd549c8d1c09ef
2019-01-22 00:01:24 +01:00
da7e8e5487
Fixed conflict
...
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
2019-01-21 19:03:32 +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
75dc82f42f
Merged two branches into one
...
Former-commit-id: 1e15cd80a5ef0a03834c4d835c7ff0fe77b4c7e0
2019-01-21 18:41:46 +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
91f547b6f4
Save password option disabled if Fallback is enabled
...
Former-commit-id: 5ed747ab6e22478a46102104095f5d2d1ba32deb
2019-01-21 18:11:12 +01:00
f77373aa1d
Plugintools added ip2long & long2ip
...
Former-commit-id: 5c5f9589a32947ce2d9a725e504661a11c8311ee
2019-01-21 18:06:44 +01:00
5328a0e239
Added tnetwork_matrix data structure
...
Former-commit-id: aa49de6c04a3c7a612ce7041393fe521e23e281d
2019-01-21 17:42:41 +01:00
4c6cd847bd
Fixed bug in export to csv report
...
Former-commit-id: 4bb84abbbb42945974643207f4976131753ab257
2019-01-21 16:19:22 +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
bd48c96de4
Fixed duplicated function module group synch in API
...
Former-commit-id: 03b23a85223add6d8f730dbfebaf58fbf7839e2a
2019-01-21 15:03:02 +01:00
bd0aa4ea8a
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: 6545ada5fba710e8399e01f84d7503b289317abd
2019-01-21 12:26:46 +01:00
367c9fc6fc
Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d
2019-01-21 11:41:57 +01:00
1dbbc820ad
Merge branch 'develop' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: c8ce459cee080644b5184d74bdea56f34ab82eaf
2019-01-21 11:31:36 +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
dc2b738776
IPAM supernet
...
Former-commit-id: f34430ee824f4221b2922b02b844bd6c7d97614c
2019-01-21 09:24:00 +01:00
dc24599f18
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: f89cf021526d5e7f9fcaad080d0f8721c20c82cb
2019-01-21 09:22:42 +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
344589494a
Fixed minor error
...
Former-commit-id: 56aafe5689d627ac515c80b0158fc998992bd457
2019-01-18 17:33:29 +01:00
0c9446fceb
Added new functionality in CLI and API to update module counts and alert counts
...
Former-commit-id: aca543eb33de0dc231d18a4776676a4700b37120
2019-01-18 17:24:32 +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
c24bea32a8
ip to long utils moved to Tools
...
Former-commit-id: 737257575dc1ac69ad9f1a284d7165077d7d6d4e
2019-01-18 12:55:49 +01:00
979a87762e
Auto-updated build strings.
...
Former-commit-id: 56c567b92e7aad5a2aabd6551b3aa2f07517fb0b
2019-01-18 00:01:26 +01:00
d57e6db0c0
Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: e65828cb880c2e11f7e54b61d748bf43d8e0f53b
2019-01-17 18:42:46 +01:00
81a6584d1c
Discovery modules (IPAM: DHCP)
...
Former-commit-id: 1849f6625fbd19dd2d6362d3ea20dc16ac73c29b
2019-01-17 18:42:38 +01:00
fd2dcb3281
Changed radio buttons by toogle switch checkbox
...
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
2019-01-17 17:28:23 +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
3e25008c9f
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: b12bfcf0f580e011d1fa9ac9fab18d108b403b0a
2019-01-17 15:50:00 +01:00
1c8d846574
WIP IPAM Supernet
...
Former-commit-id: 9da8df381292bc79a49c1416fc6d2820f4b814ac
2019-01-17 15:49:41 +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
6e8e5d0dd6
Fixed Event reports pie graphs in metaconsole
...
Former-commit-id: 6fe0eb4035200dc4e22736098b810f31194e1a45
2019-01-16 19:44:29 +01:00
daniel
artica
Daniel Rodriguez
manuel.montes
samucarc
fermin831
fbsanchez
Alejandro Fraguas