Commit Graph

20834 Commits

Author SHA1 Message Date
Luis Calvo ad80b5b562 Merge remote-tracking branch 'origin/develop' into ent-3783-Error-date-last-contact-snmp-interfaces-view
Former-commit-id: 9c82f920608289d3f4fb49d4295c6356b7551f56
2019-04-01 10:36:27 +02:00
Daniel Barbero Martin 5ca01b0294 add ff_type linux agent
Former-commit-id: 0e903a7e304c5a2ea4dcf8570e45663524777748
2019-04-01 10:27:24 +02:00
Alejandro Gallardo Escobar ebbd131941 Visual Console Client: Upgraded the dependencies
Former-commit-id: cec7459402c6f3f6558c8a64918ad377ca0ea8f3
2019-04-01 09:56:33 +02:00
artica 2d26a74f9e Auto-updated build strings.
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
2019-03-31 00:01:22 +01:00
artica 69df187ae5 Auto-updated build strings.
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
2019-03-30 00:01:27 +01:00
fbsanchez b0a6ea7415 WIP atomic JS map. Minor fix to keep working
Former-commit-id: fee809008311942f1d9ad14aea70ba78e3d6eb3a
2019-03-29 20:52:51 +01:00
fbsanchez 4854d4b2df WIP atomic JS map
Former-commit-id: 95736d11295948e5dc20aefcf1293b7882729588
2019-03-29 20:31:55 +01:00
Fermin 4fd3aa3a51 Avoid to execute non cron complianced modules on creation
Former-commit-id: edfb13175ca00bc5aee99609c0eec30e06d5936e
2019-03-29 15:06:26 +01:00
Daniel Barbero b2e16848f9 add new ff type
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
marcos.alconada 48c4eb9c01 Add changes in migrate and 27.sql file
Former-commit-id: 60c2e2f2dc9a78ff9fb236efe7ac57a288d3717a
2019-03-29 13:58:53 +01:00
marcos.alconada b3c7a9fb4d change
Former-commit-id: 3fe44307ee0118db78b80a21d0aa209e709e0d7d
2019-03-29 13:38:36 +01:00
marcos.alconada 7412a7cef0 change
Former-commit-id: 47ccc5dce928453e1fac9c1036094e6a03c6cde7
2019-03-29 13:37:12 +01:00
Luis Calvo 59300bd757 Changed field for last contact to timestamp
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
2019-03-29 13:24:22 +01:00
Alejandro Gallardo Escobar 8be5cc6a38 Visual Console Item: removed some warning messages
Former-commit-id: e498e29eda0f790669a3343265c7b923773482b0
2019-03-29 11:57:14 +01:00
Alejandro Gallardo Escobar 470d0b71d1 Visual Console Refactor: finished the label support
Former-commit-id: d09e3ac1a35722d6531817e5c935e4b582a5e0eb
2019-03-29 11:54:01 +01:00
Fermin 05ce178854 Fixed week day cron in server
Former-commit-id: cfbd3601904c85fa1112eaf0f2310edb53f9afe8
2019-03-29 11:51:51 +01:00
Daniel Maya 4893c78f77 Added the label and colorcloud classes
Former-commit-id: 5a68272b63169f7d36520b3d4cdead28b26209d3
2019-03-29 11:49:40 +01:00
Tatiana Llorente 26451c41a1 New design for the tables - #3707
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
marcos.alconada 3f41561628 Added pandoradb.sql without output column in tnetflow_filter
Former-commit-id: 7bb1ce608678dbbc192bf734515ce96caba25c66
2019-03-29 09:23:38 +01:00
artica 2a96b610d9 Auto-updated build strings.
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
2019-03-29 00:01:24 +01:00
Alejandro Gallardo Escobar 129c4ad3dd Visual Console Refactor: WIP
Former-commit-id: f201bf5320f460fe1c57bd31c683a0cb7c7293b0
2019-03-28 17:59:35 +01:00
Daniel Maya 58f6fac29e Added colorCloud and changes in clock item
Former-commit-id: 19a053332ae6a30a60f2fb88611a0ad74d447bb5
2019-03-28 17:55:32 +01:00
Daniel Barbero Martin 33197df731 add new functionality flipflop
Former-commit-id: 00a71df0d228833dbe7211504e11418d91622d93
2019-03-28 17:33:49 +01:00
fbsanchez 783417cab5 rollback agent_get_agents
Former-commit-id: 95627afdb87777d0703fe57a82f7a3e0ec82b286
2019-03-28 12:20:15 +01:00
Daniel Maya 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
Daniel Barbero Martin e3222626dc fixed error in bbdd
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
2019-03-28 09:49:16 +01:00
Tatiana Llorente 1572949875 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 817d48af3803bd81f0cd3128b7b783c5b5bcc26b
2019-03-28 09:09:57 +01:00
Daniel Barbero Martin 626aacbf43 Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e
2019-03-28 08:49:08 +01:00
artica 98a9c62de9 Auto-updated build strings.
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
2019-03-28 00:01:30 +01:00
fbsanchez 1299d6c7d6 Merge branch 'fix/netmap' into 'develop'
minor fix

See merge request artica/pandorafms!2307

Former-commit-id: cd6071765c1e9be5d05ed7283f0a49146ac46cb7
2019-03-27 18:34:35 +01:00
fbsanchez 086ee0620e minor fix
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
2019-03-27 18:31:02 +01:00
Daniel Barbero Martin a3865a3181 flip flop keep counters
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
fbsanchez c85a84673f Merge branch 'fix/mr26' into 'develop'
fix mr 26

See merge request artica/pandorafms!2306

Former-commit-id: d90f41df35dfbe7655af56648ca40ec9e9b3cc43
2019-03-27 17:57:24 +01:00
fbsanchez 128a97d254 fix mr 26
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
2019-03-27 17:38:08 +01:00
fbsanchez 0f30633094 Merge branch 'fix/mr' into 'develop'
minor fix

See merge request artica/pandorafms!2304

Former-commit-id: f24ca3e2617a696adb9de32ad5fd1bd5f5b14111
2019-03-27 17:27:39 +01:00
fbsanchez 144cf1177d fix tasklist map
Former-commit-id: 4f1195c265f4298b7303597be43b3399fa32f4e3
2019-03-27 17:12:38 +01:00
fbsanchez 66b2102052 Merge remote-tracking branch 'origin/develop' into fix/mr
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
2019-03-27 17:09:46 +01:00
fbsanchez 6ebbe54448 minor fix
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
2019-03-27 17:06:14 +01:00
Tatiana Llorente 34598f391b Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
2019-03-27 17:05:50 +01:00
Tatiana Llorente 845cb85c55 New design for tables - #3707
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
fbsanchez 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
fbsanchez 2dd427100e errata fix
Former-commit-id: 3e4ce53635dc02387ec1d2d46698fa4a81372dd0
2019-03-27 16:44:08 +01:00
artica 74cb6970dc Updated version and build strings.
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
2019-03-27 16:36:00 +01:00
Daniel Rodriguez 8426374776 Merge branch 'ent-3776-Menú-lateral-debe-aparecer-desplegado-por-defecto-2' into 'develop'
fix pandora logo image path

See merge request artica/pandorafms!2302

Former-commit-id: 7b4fbefe53b68c12ad8c4daf8e6d0c4dd283e2d1
2019-03-27 16:30:55 +01:00
alejandro-campos 082e5f06d6 fix pandora logo image path
Former-commit-id: 92bc151f8e988758af7381ca95b8055ec7a23d5e
2019-03-27 16:26:47 +01:00
Daniel Rodriguez 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
fbsanchez fb818064ed minor fix menu
Former-commit-id: 6d0ca2d3d86af083c91a098326dc073d90187ab0
2019-03-27 14:39:02 +01:00
Daniel Rodriguez 2aaa1b1412 Merge branch 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1' into 'develop'
Ent 3409 pandora network traffic analyzer ntop fork fase 1

See merge request artica/pandorafms!2152

Former-commit-id: 104e4bef1196931bce49c535ac7eb4dbe68b1802
2019-03-27 13:47:23 +01:00
Daniel Maya f516c6d36a Added EventsHistory, SimpleValue and StaticGraph
Former-commit-id: 9e56eb3df9997f0d601db774a7131f783cc3dfe9
2019-03-27 13:42:40 +01:00
Alejandro Gallardo Escobar faf2332329 Visual Console Refactor: added the label and simple value items to the client
Former-commit-id: d13d210abf0dcfaf2cb2567bc05b143a128cbd55
2019-03-27 13:37:00 +01:00