32ba3aa1d4
Visual Console Refactor: error fix
...
Former-commit-id: f627143575317076eb9998f7e09029c3063870ca
2019-04-03 12:11:13 +02:00
24d8964fd9
Visual Console Refactor: added a system to abstract the html validation, extraction and encoding
...
Former-commit-id: d53b9fba38b1a57f2c00c627b30d6a3f2d8e64ef
2019-04-03 12:07:48 +02:00
ca4997fd7f
Visual Console Refactor: fixed the events history model
...
Former-commit-id: 9228339af7213996fb969ee631a93a3e972e102a
2019-04-03 11:40:40 +02:00
eb6757e91c
Visual Console Refactor: fixes
...
Former-commit-id: c9ae864cba26c6085e4e7390db26e32204ec7397
2019-04-03 11:25:35 +02:00
eb17b01adc
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 357f606489e6328157f6090484f0141914bbc482
2019-04-03 10:30:15 +02:00
0dca571e2d
Visual Console Refactor: minor fix
...
Former-commit-id: aaa840b7145ff0a449ab31f850095ca5574761e1
2019-04-03 10:28:41 +02:00
b7ed6f9a7b
Visual Console Refactor: refactores the SimpleValue model and added value retrieval
...
Former-commit-id: 97ef5c92852b8fc5fd7f71e960f947d22222abcd
2019-04-03 10:28:07 +02:00
8e89f07961
Visual Console Refactor: changed some functions from instance to static
...
Former-commit-id: 64fdb9086b5028570fea02de1bbe5e8c22e45c08
2019-04-03 10:27:22 +02:00
db30a8650e
Added visual_console_view
...
Former-commit-id: a121bb8ee6fe338561fcf7efda289727e1ba7afe
2019-04-03 10:08:01 +02:00
5670157e06
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: a97cbb6723fb51b583c98af381bfd92f1a1413f2
2019-04-02 17:26:27 +02:00
62792c078f
Visual Console Refactor: refactored the events history item to return its HTML representation
...
Former-commit-id: 8b29503a24b1877c645a3b9856d09ee2db947f99
2019-04-02 13:00:49 +02:00
6c53833484
Visual Console Refactor: changed the visibility of a pair of functions
...
Former-commit-id: 8c42603b455cfda671a5eee5a3054a77c3eda845
2019-04-02 13:00:03 +02:00
92408f2ac1
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: fb37c8e84e264cd27158a481774c3712650df647
2019-04-01 16:11:49 +02:00
07e464d52b
Merge branch 'develop' into visual-console-refactor
...
Former-commit-id: c986c2d40359b2d35808037b857ae931becf7e91
2019-04-01 16:04:20 +02:00
2d26a74f9e
Auto-updated build strings.
...
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
2019-03-31 00:01:22 +01:00
69df187ae5
Auto-updated build strings.
...
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
2019-03-30 00:01:27 +01:00
4893c78f77
Added the label and colorcloud classes
...
Former-commit-id: 5a68272b63169f7d36520b3d4cdead28b26209d3
2019-03-29 11:49:40 +01:00
2a96b610d9
Auto-updated build strings.
...
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
2019-03-29 00:01:24 +01:00
58f6fac29e
Added colorCloud and changes in clock item
...
Former-commit-id: 19a053332ae6a30a60f2fb88611a0ad74d447bb5
2019-03-28 17:55:32 +01:00
4c08987ece
Merge branch 'develop' into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
...
Former-commit-id: f235e3324cbf60afc015a870b9464b6bcf7bd89a
2019-03-28 09:52:14 +01:00
98a9c62de9
Auto-updated build strings.
...
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
2019-03-28 00:01:30 +01:00
086ee0620e
minor fix
...
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
2019-03-27 18:31:02 +01:00
128a97d254
fix mr 26
...
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
2019-03-27 17:38:08 +01:00
144cf1177d
fix tasklist map
...
Former-commit-id: 4f1195c265f4298b7303597be43b3399fa32f4e3
2019-03-27 17:12:38 +01:00
66b2102052
Merge remote-tracking branch 'origin/develop' into fix/mr
...
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
2019-03-27 17:09:46 +01:00
6ebbe54448
minor fix
...
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
2019-03-27 17:06:14 +01:00
160a72d780
Merge branch 'fix/delete' into 'develop'
...
errata fix
See merge request artica/pandorafms!2303
Former-commit-id: 2dc2834075b9491712dbd37ac087b9e20c274059
2019-03-27 16:51:19 +01:00
2dd427100e
errata fix
...
Former-commit-id: 3e4ce53635dc02387ec1d2d46698fa4a81372dd0
2019-03-27 16:44:08 +01:00
74cb6970dc
Updated version and build strings.
...
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
2019-03-27 16:36:00 +01:00
082e5f06d6
fix pandora logo image path
...
Former-commit-id: 92bc151f8e988758af7381ca95b8055ec7a23d5e
2019-03-27 16:26:47 +01:00
f7cf7c65ac
Merge branch 'fix/menu' into 'develop'
...
minor fix menu
See merge request artica/pandorafms!2300
Former-commit-id: d40a7d3a84f1de2de7283ff134bc720ed14a59ca
2019-03-27 16:00:56 +01:00
fb818064ed
minor fix menu
...
Former-commit-id: 6d0ca2d3d86af083c91a098326dc073d90187ab0
2019-03-27 14:39:02 +01:00
f516c6d36a
Added EventsHistory, SimpleValue and StaticGraph
...
Former-commit-id: 9e56eb3df9997f0d601db774a7131f783cc3dfe9
2019-03-27 13:42:40 +01:00
7b901be5fa
Changed default font size name on NetworkMap class
...
Former-commit-id: b1437a7e03eba758d83386166db0063a5fcaf12f
2019-03-27 12:42:54 +01:00
edefd16a21
Merge branch 'ent-3595-discovery-fase-2' into 'develop'
...
Ent 3595 discovery fase 2
See merge request artica/pandorafms!2230
Former-commit-id: 2d5e2e4ff57612c727f20357bfb9de5b8c29ae72
2019-03-27 12:13:06 +01:00
b2f046e4d6
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
9ee095406b
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
2019-03-27 11:59:25 +01:00
eacdf6ffc9
Merge branch 'ent-3666-fallo-rendimiento-informes-sla-disponibilidad-carrefour' into 'develop'
...
removed old useless code
See merge request artica/pandorafms!2241
Former-commit-id: 53aecf83239855335278d2b7068fd32dfe856c96
2019-03-27 11:52:55 +01:00
3c853ff508
widget networkmap simple working
...
Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee
2019-03-27 11:47:09 +01:00
3038de3a9d
minor fixes
...
Former-commit-id: 73dbbaa42f3b6120400da688dee7a0499bf31796
2019-03-27 11:06:57 +01:00
c717baafc0
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 70601a390ebca2a1530b77c86a83c19e29e98261
2019-03-27 10:53:46 +01:00
8160983e36
Auto-updated build strings.
...
Former-commit-id: 00a94a2b9b56bbb245f3389855c734f7af14d874
2019-03-27 00:01:24 +01:00
ca5c214472
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 8952ebd872b4030cb8e1bd4ad3f0425afd13fd09
2019-03-26 19:30:55 +01:00
94bb818e6d
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 9e6ab3e90c11a0849550bca777aead3a25ee7bdd
2019-03-26 19:30:40 +01:00
ba0ddfb826
style revission
...
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
2019-03-26 19:29:48 +01:00
b7267dfafa
Merge branch 'ent-3774-Autorefresh_no_se_deshabilita' into 'develop'
...
fixed minor error header disabled
See merge request artica/pandorafms!2297
Former-commit-id: ffc6904ecfa47e41ea87b867f8650c237ee1877a
2019-03-26 18:49:27 +01:00
5504741a9d
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: d734637dea22b18b1d30a3d8575cd45500558e29
2019-03-26 18:48:49 +01:00
8d95afc9ea
Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
...
Former-commit-id: 40a12a5a5331fb53fed7fcfce30ba1e327494c59
2019-03-26 18:46:52 +01:00
ab793257ad
Visual Console Refactor: minor fix
...
Former-commit-id: 4350b8342f0a813c7283bd8a2bf2a3a76b677c5a
2019-03-26 18:46:48 +01:00
4cd06539a2
fixed minor error refresh header
...
Former-commit-id: 5fd75dd4fe634760c37fb06a16cc127c9cbfc71d
2019-03-26 18:37:49 +01:00
004fec7454
Revert "fixed minor error header disabled"
...
This reverts commit 2cf945a5e3
2019-03-26 18:35:56 +01:00
0982cd61b5
Merge branch 'ent-3568-limitar-acceso-a-la-consola-cuando-se-supere-el-limite-de-agentes' into 'develop'
...
Ent 3568 limitar acceso a la consola cuando se supere el limite de agentes
See merge request artica/pandorafms!2293
Former-commit-id: caedaf6470c3fbea8d76db4b61a5a8d241dc7830
2019-03-26 18:04:56 +01:00
2cf945a5e3
fixed minor error header disabled
...
Former-commit-id: 87ac8d400ac83f316bf8efb1fca6afe2d60e6c8c
2019-03-26 17:59:00 +01:00
64af349041
added class clock
...
Former-commit-id: ad23dd5fe0f6eb2251851cf794d0b1464d286ff5
2019-03-26 17:32:02 +01:00
08a240746c
breadcrum improvement discovery
...
Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad
2019-03-26 17:28:31 +01:00
19bf0ae940
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: f1c63c2e0be43e9c01306375446fc1eaa3c039ef
2019-03-26 17:22:36 +01:00
db39c3921b
fixed minor error tasklist
...
Former-commit-id: 1ee10794b09e17c3b8403dfe5540195047595577
2019-03-26 17:22:14 +01:00
3316d19bd3
minor fix
...
Former-commit-id: ff5da555c29cdde5d632e090f2b9ac779ead262f
2019-03-26 17:00:20 +01:00
ee6ab43a8c
minor fix
...
Former-commit-id: e1a238bd34f4264e6be9c8a826cc1057578dd0a7
2019-03-26 16:54:11 +01:00
a76ad27825
minor fixes
...
Former-commit-id: f885316b4f063daac744ca458fa3d41a16d5d81b
2019-03-26 16:51:09 +01:00
2d1463ee0c
minor fixes networkmaps
...
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
2019-03-26 16:46:32 +01:00
e93cb8f9e7
Visual Console Refactor: removed a unused function
...
Former-commit-id: 786dac0e5ab299e91f5f645179c125f80332f17f
2019-03-26 16:36:44 +01:00
511295f1c6
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: f43d6ace220a8058f91d115386bdf56e59550cbe
2019-03-26 16:32:19 +01:00
a0f4eb1910
change discovery page title
...
Former-commit-id: 81bf2dc3d489acc1871f6c4cd385fc0f1c1b43aa
2019-03-26 16:10:03 +01:00
0d8322aeda
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: a9ac8888641116a4e98fbe7ac2d99901e771f275
2019-03-26 15:42:47 +01:00
ec999341ba
change discovery headers and add breadcrumbs to them
...
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
e3b0b7ad11
fixed update progress bars task for 3 second
...
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
2019-03-26 15:38:47 +01:00
fa7cdc020b
Add a countdown to license error messages.
...
Former-commit-id: bba7ccf777c05801731a790351dc9920b1546262
2019-03-26 15:32:57 +01:00
aa0ab53cf3
Clear license errors when logging in.
...
Former-commit-id: 1f68f190ebc84202b0e39b92c12d065f8b52543c
2019-03-26 15:31:51 +01:00
f880d9202a
Adde no popup configuration token to avoid to show tooltips
...
Former-commit-id: d5b6260a065b40dfbc498db077a610c35a9e0fb3
2019-03-26 15:27:45 +01:00
f2e710907a
Normalized network/netflow interval-start ddate switch
...
Former-commit-id: 2cce98339fbcca9e7ef6bf29e7ace2d81c5ff525
2019-03-26 15:01:56 +01:00
d1bd5fbb1a
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 914a944b96af8bceb26bbb89dbac25452097e20a
2019-03-26 13:06:12 +01:00
a79a401530
Visual Console Refactor: renamed a pair of directories
...
Former-commit-id: 50a02b73c368f9957dfdcbd6c9ca8bdfdd9e0175
2019-03-26 12:12:10 +01:00
a7ff654826
Removed output in netflow filter
...
Former-commit-id: 4f2cfac6efe1482c86179601bac88826057e7d5c
2019-03-26 11:58:31 +01:00
c4f22e2015
Visual Console Refactor: added linked visual console capabilities to the group item
...
Former-commit-id: 4f314c53781cd478078198b99b4ea02943579fd0
2019-03-26 11:56:42 +01:00
c25143c27e
Add a notification for 'limited mode'.
...
Former-commit-id: dce72c7a9ea452029e5650a2012ff35cc6eca9b8
2019-03-26 11:53:03 +01:00
d740b32810
Add support for DESTDIR.
...
Former-commit-id: 0252a660a3d8250657cd5f7b8fcfd620172c8a65
2019-03-26 11:47:20 +01:00
c1536b7978
Do not crash if an extension cannot be loaded.
...
Former-commit-id: f303be21ceabe052545e53e1a4b6bcd08a4526c2
2019-03-26 11:46:50 +01:00
ef1a1f1057
Visual Console Refactor: the model's JSON representation is now sorted alphabetically
...
Added the linked visual console capabilities to the Icon item
Former-commit-id: acda22da54a259404f201190af9e481262ddde03
2019-03-26 11:45:50 +01:00
d05b78520f
minor style fix tasklist popup
...
Former-commit-id: 628e94f56a92558e3af648520ca13d4fb658d184
2019-03-26 11:09:17 +01:00
174256ab70
minor approach csv report
...
Former-commit-id: a875a42dc53c85942dd8f80f0b5a0f788fb39ca5
2019-03-26 10:55:50 +01:00
1517ec8d3c
Visual Console Refactor: added fetching, extraction and validation for the linked agents, modules and visual consoles
...
Former-commit-id: fafc8c4a0e7306d918f22f1bdaea2e8ce147b31f
2019-03-26 10:12:43 +01:00
a2f5b8502a
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
b8eb44244f
Visual Console Refactor: minor fixes
...
Former-commit-id: 2cacb9769708ccf4dce00d39300dfd510c0d1108
2019-03-26 09:59:32 +01:00
ecfba2e00c
Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
...
Former-commit-id: e064684c8e12e7a9cf09fad9e56eccd4e52e6fe8
2019-03-26 09:49:34 +01:00
d6707d2747
Visual Console Refactor: minor name changes
...
Former-commit-id: 10973b070a566568dfc7f9236b184abee1f26c7a
2019-03-26 09:49:00 +01:00
7d66d0b0fe
Fixed Group class (VisualConsole)
...
Former-commit-id: 6a241cdc76935f92f99b9cc31b66acd3082571ca
2019-03-26 09:48:50 +01:00
5b0555e7cb
Merge branch 'ent-3754-Ajustes-menú-lateral' into 'develop'
...
Ent 3754 ajustes menú lateral
See merge request artica/pandorafms!2291
Former-commit-id: 2cfa456d9e49aa262f08c690426bcbabb180392b
2019-03-26 09:42:29 +01:00
c3f7dd38d0
Merge branch 'ent-3342-SLA-status-transalation-error-fail' into 'develop'
...
Added translation files with string Fail
See merge request artica/pandorafms!2290
Former-commit-id: 0ba45f1aad523dcf45585a2bb44becd3e92b2747
2019-03-26 09:33:39 +01:00
189d4864dc
[Network usage map] Refactorized some code
...
Former-commit-id: 83fe7cedef01b4d4d38045b15c6b37ec936d5fb3
2019-03-26 09:10:28 +01:00
205c95bcb8
Added Group, Icon and line
...
Former-commit-id: d13c4cdfd03f299812c588aa41685296d35675f9
2019-03-26 08:46:29 +01:00
58e74c1db1
Fixed minor warning
...
Former-commit-id: 38278d285faa6aea5f61d0933543b7e24926ae79
2019-03-26 08:40:22 +01:00
90a2e28247
Auto-updated build strings.
...
Former-commit-id: b835fca52692b4696092f9cd5c5737705b7c8153
2019-03-26 00:01:25 +01:00
4031ae9bf7
minor update in notification viewer
...
Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426
2019-03-25 20:23:07 +01:00
436e60c736
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
3d0f25cd6e
discovery task status overview
...
Former-commit-id: 5eeb3a3220c05f30f0559d50620aa29389fb145c
2019-03-25 20:00:05 +01:00
6cc6f6f125
discovery task status overview
...
Former-commit-id: 329d03c109b9e09788302212752f372647b19c56
2019-03-25 19:58:01 +01:00
9947fb8f34
remove console.log
...
Former-commit-id: 12feadfc9094d8507e5e7df595e7667a67964362
2019-03-25 19:42:12 +01:00
079f578830
fix bad behavior of pandoras side menu on page load
...
Former-commit-id: b1d4eb3e2464fa441f16190d29b2d57cfaa9e3c5
2019-03-25 19:37:45 +01:00
5a38be13ea
Added translation files with string Fail
...
Former-commit-id: a0176a1fd734b7bdc1d5ffa49d29c059eb96acda
2019-03-25 18:22:42 +01:00
Alejandro Gallardo Escobar
Daniel Maya
artica
fbsanchez
artica
alejandro-campos
Daniel Rodriguez
fermin831
Alejandro Fraguas
Daniel Barbero Martin
Ramon Novoa
Luis Calvo