5b3dd6121b
Fixed error in event filters when is only new events
...
Former-commit-id: a1e0529b58e4a1c62c8c35cba7b133c218f59a93
2019-03-11 17:14:26 +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
0920328e0a
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 0064084ad35250594897ae6bb85a1b26c4dbfaa0
2019-03-11 15:10:26 +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
935db452d2
Network report. Fixed some styles
...
Former-commit-id: 19a181044bae3f5bcec1f873e20ec50c41a73f00
2019-03-11 15:02:22 +01:00
3b2d72308e
Merge branch 'ent-1800-Cambiar-informacion-de-los-instaladores' into 'develop'
...
Changed Maintainer in pandorafms-agent-unix
See merge request artica/pandorafms!2228
Former-commit-id: 861dfec496f2040810d0962e03cca41b2f180462
2019-03-11 14:23:00 +01:00
9a7bdd76ba
Merge branch 'ent-3681-Recuperar-el-boton-de-lista-de-servidores-con-estado' into 'develop'
...
Added button servers list in header
See merge request artica/pandorafms!2249
Former-commit-id: 21b5bfef18b66b8124fe8d3c26709675ecb14857
2019-03-11 14:12:25 +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
db2f23a9c2
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: d0a201e884ba53c33e83c10ff5e0bbe896d00ff5
2019-03-11 12:59:19 +01:00
8f9beccf76
Fixed url
...
Former-commit-id: 7bed92d53f59a0b01034d3630dcddce8a7bc5cfa
2019-03-11 12:47:27 +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
bf0e8633ff
Added button servers list in header
...
Former-commit-id: 96d9f7a49d617b0a9f04df601c41bbce71009e38
2019-03-11 12:36:52 +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
62c38173eb
Merge branch 'ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup' into 'develop'
...
Changed radio buttons by checkbox switch
See merge request artica/pandorafms!2235
Former-commit-id: 23face1e62093414afb9be18a4353eeab073105f
2019-03-11 11:18:10 +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
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
ccb669a204
Fixed minor errors in setup_ehorus
...
Former-commit-id: ed0ba17641714a87446b4db88d933d7b176e531e
2019-03-11 09:37:08 +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
1eaf187215
Visual Console Client: WIP work on the line item
...
Former-commit-id: 0f40636ebd9d01ccdf618579e5e7c25be015ad04
2019-03-08 14:05:31 +01:00
c0f8c289e6
Visual Console Client: minor fix
...
Former-commit-id: 7e20bc7972f98e2cfe1a991d82cbf2dbc12c21de
2019-03-08 13:39:17 +01:00
af26c7cdfc
Visual Console Client: added the box item
...
Former-commit-id: d4986307c2df713f86472ce383312fc5aa15b5f7
2019-03-08 13:32:56 +01:00
2ca41b4967
Visual Console Client: improvements into all items
...
Former-commit-id: 3d6b50d5305126361db0f308cf314ad218bc0e72
2019-03-08 12:51:03 +01:00
1151332d30
Visual Console Client: added a new lib function
...
Former-commit-id: 6bbfc18d06e36539f1b88084ecddcf8b65101e2e
2019-03-08 12:29:22 +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
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
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
35ff5ced90
add aws first task icon
...
Former-commit-id: b5e083e599ebe00194261cbb5a6da017c5723f2c
2019-03-08 10:14:17 +01:00
c41c9d10e0
Changed sql files
...
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
2019-03-08 10:01:55 +01:00
7b9bbe6b9c
Fixed reporting menu
...
Former-commit-id: efaf4d26e0d48bbdea3df7afb2c462a1b70a6701
2019-03-08 09:29:12 +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
samucarc
Daniel Rodriguez
Daniel Maya
fermin831
fbsanchez
Alejandro Fraguas
Luis Calvo
alejandro-campos
manuel
Tatiana Llorente
artica
Alejandro Gallardo Escobar