Commit Graph

20364 Commits

Author SHA1 Message Date
fbsanchez f557d09529 discoveryserver change default value (server) and minor fix in subst_column_macros
Former-commit-id: ff22af353cf794ae0600a23d61fd30256193d463
2019-03-04 15:01:50 +01:00
fbsanchez 9fd391a819 Make always basic checks while browsing pandora
Former-commit-id: db93bfdaa674cd2d632153825c37a8a41152dc2c
2019-03-04 14:57:57 +01:00
fbsanchez 5e496d0d7a Fixed url target in Supervisor
Former-commit-id: 4e69ec7a157d8bceb3cbfc88c52a886a4353dc0e
2019-03-04 14:52:57 +01:00
Daniel Rodriguez 1cfabda53e Merge branch 'ent-3224-7026-anadir-token-agent-name-as-alias-a-importacion-de-agentes-por-csv' into 'develop'
Modified agents_create_agent to permit create agents with name as alias

See merge request artica/pandorafms!2209

Former-commit-id: ef47fc540cedd0c06b58805a3fb162d5807ecc32
2019-03-04 13:22:56 +01:00
manuel 488be0d602 Changed radio buttons by checkbox switch
Former-commit-id: f0c64cecbf9e1197be08a9a95248d3b4ea8bd949
2019-03-04 13:12:01 +01:00
fermin831 f9b14072d8 Moved report nt_top_n requesting data to functions_network
Former-commit-id: a117a63c1b23c0104ffadb2741d049f02a81d6d4
2019-03-04 12:49:18 +01:00
Tatiana Llorente 12a287f322 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/install.php


Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
2019-03-04 09:52:05 +01:00
Tatiana Llorente 36fa0fc41f new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
artica 3ed6a2b089 Auto-updated build strings.
Former-commit-id: d8e95284d6eded43b5d1af26b172a034a06d3bed
2019-03-04 00:01:22 +01:00
artica 62c7e8dffc Auto-updated build strings.
Former-commit-id: dd2dc5dcc124d58611076b2e38dd65a596c23f3b
2019-03-03 00:01:24 +01:00
artica b194d439d2 Auto-updated build strings.
Former-commit-id: 8081bea8a9b82eca462bc1ae7b600162a08faea6
2019-03-02 00:01:29 +01:00
fbsanchez 41138fbfbb discovery tasks assimilate cron
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
2019-03-01 15:26:05 +01:00
Luis Calvo d4b79179d9 Fixed width unit on graph, setted to px instead of %
Former-commit-id: 2517a1bfad9c609709f30025c2d6927c0011ade1
2019-03-01 14:58:41 +01:00
Fermin b11fd87592 Added network explorer view
Former-commit-id: c34056a1cc0e2b700df8873a0b589d5bbfe36165
2019-03-01 14:51:13 +01:00
Fermin 568d187902 Style fix
Former-commit-id: d7d8ba5bdc7269496adf6a1caa2ffa0631102cd5
2019-03-01 14:26:59 +01:00
daniel c5a5df01f6 add tip SLA Services
Former-commit-id: da452d98c0b3b43d36c4c53de70df762f6530c8d
2019-03-01 14:26:25 +01:00
Fermin cbb4f971a2 Added new network menus
Former-commit-id: 885f092dbfcc561cca5bf1bf8c3ba8497d94ffc4
2019-03-01 14:23:10 +01:00
Fermin 3f53541c5e Added switch to enable NTA
Former-commit-id: 5fc3b47f8f9f92ac643db6a5dbe4fc320ca141f6
2019-03-01 13:38:48 +01:00
daniel fadf75a626 fixed minor error lenght str.warning and str.critical 1024 charts
Former-commit-id: c7c32a48731eff5c786bd0710652a31a64364861
2019-03-01 13:36:38 +01:00
Fermin 3eef1b3dbe Minor fix
Former-commit-id: 5e0e476822261c99c4c6e14d4be3b87880cce4a2
2019-03-01 13:26:15 +01:00
Alejandro Gallardo Escobar 8329e2f90e Visual Console Client: minor fix
Former-commit-id: 72669991e04eaab039390cb612abd9bbc24cdfa9
2019-03-01 12:52:48 +01:00
Fermin f0a3f4e9d7 Added configurable purge tnetwork_matrix
Former-commit-id: e5869879c2445c15c8332d245ac2dd0d3f8de5d5
2019-03-01 12:39:55 +01:00
daniel 02ff69ea0b fixed errors SLA With planned downtime
Former-commit-id: 7350d33d917f967ea624e4763ed816af97c0743a
2019-03-01 12:34:34 +01:00
Alejandro Fraguas a5c3136321 Merge branch 'ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into 'develop'
fix discover task view

See merge request artica/pandorafms!2223

Former-commit-id: f8c236623756ef6e76d54cf4ab905f706df1ea84
2019-03-01 12:16:08 +01:00
Alejandro Gallardo Escobar 2854b59826 Visual Console Client: fixed the analogic clock hand angles
Former-commit-id: 04390b4a2fde0f635035946981a05d4b880f364b
2019-03-01 11:21:42 +01:00
fbsanchez adb25e91f8 Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
Former-commit-id: 157ed627078c5e6cfedd6ed9d509a339cdb01632
2019-03-01 11:09:11 +01:00
fbsanchez b4170ca285 minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references
Former-commit-id: 46be3614b9aeb9837748149a805427d68a07f566
2019-03-01 11:08:49 +01:00
Daniel Rodriguez 1d48e337fc Merge branch 'ent-3497-event-responses-current-user-macro' into 'develop'
Recovered the lost code for the current user macro at the event responses.

See merge request artica/pandorafms!2231

Former-commit-id: 21bb62cba0d22beba25b6105e2a44651937cb003
2019-03-01 10:38:14 +01:00
fbsanchez d547024274 fixes non-enterprise components
Former-commit-id: c22cec27d981c119531a0049469847b9d1a848eb
2019-03-01 09:51:16 +01:00
fbsanchez ed9b736299 Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
Former-commit-id: 9dcad6195eb21f84d90b570828791338ff069ddd
2019-03-01 09:50:09 +01:00
Alejandro Gallardo Escobar 42d8e72400 Recovered the lost code for the current user macro at the event responses.
(cherry picked from commit d554dcc7db [formerly 1a5860bc7a62efecba44d467df9eb9cf7e25070b])


Former-commit-id: de201ec04f1dc211c56db3fc0dbf8ae66a549ddf
2019-03-01 09:40:36 +01:00
Alejandro Gallardo Escobar 2ab938ded5 Visual Console Client: added an analogic clock
Former-commit-id: 642c1a39c14fe5db067d871448b3b9c8c8aa5d34
2019-03-01 09:31:54 +01:00
Alejandro Gallardo Escobar 850045f791 Visual Console Client: Improved the color cloud resizing
Former-commit-id: 4f6131a8368ea1af973527388ed641f104381fe6
2019-03-01 09:27:58 +01:00
artica 8fc432b934 Auto-updated build strings.
Former-commit-id: 818dfe6138fe1837c87d96d607b15e51e06336cb
2019-03-01 00:01:32 +01:00
Fermin 287ce78260 Move tnetwork_matrix to mr 26
Former-commit-id: 731ffaeb7253345bc83afe645f788e6a130080b4
2019-02-28 18:18:20 +01:00
samucarc 7e53461b94 Added new alert when failed database
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
2019-02-28 17:40:11 +01:00
Fermin 511c5e3d10 Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/extras/mr/25.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/install.php
	pandora_server/util/pandora_db.pl

Former-commit-id: 634d25e1ada208d27ba283506161682a9aa45949
2019-02-28 17:13:48 +01:00
Daniel Maya fb40ef7ce4 Changed Maintainer in pandorafms-agent-unix
Former-commit-id: c0bff759d2926ec1459e66205b3918ec3d02d3f4
2019-02-28 17:12:31 +01:00
Daniel Rodriguez 927ad30966 Merge branch 'ent-3594-Unificacion-de-tamaños-de-checkbox-switch' into 'develop'
Unified sizes of the checkbox switch

See merge request artica/pandorafms!2198

Former-commit-id: 9305bc60fd8b4815f6bbb2ece58dfcdd72e1ad70
2019-02-28 13:58:07 +01:00
manuel 46089b31a8 Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/install.php


Former-commit-id: 3dee86da8f6b6b1c2caa5e6e1529acd7f60c1433
2019-02-28 13:36:18 +01:00
Daniel Maya cefaccb651 Fixed synchronize collections in node
Former-commit-id: d48015ff7c41298fa87cbb5cf1f298beac501719
2019-02-28 13:02:59 +01:00
daniel 95b5c4ad01 add new macro for alert events
Former-commit-id: 08c5bf0168bcd5d9c23a23443187870269d61a40
2019-02-28 12:30:01 +01:00
alejandro-campos 52d6dfe815 fix discover task view
Former-commit-id: 5475d6be802cd4e7280d12aed6f8f91f7833ed98
2019-02-28 12:00:43 +01:00
artica a8a9a9d620 Auto-updated build strings.
Former-commit-id: 2c0ee9351e5f306085921bde697a1b10de102b2e
2019-02-28 00:01:32 +01:00
fermin831 4489afe137 Added debugger and profiler deps to Dockerfile
Former-commit-id: 805ed1cbef91065fa248d85003e87d3ba134f2ca
2019-02-27 17:17:50 +01:00
fbsanchez 715bdbb04d Merge branch 'fix/fraguas' into 'develop'
minor fixes

See merge request artica/pandorafms!2216

Former-commit-id: 856ba09c711fa9199e06518c42a05e4ae942b938
2019-02-27 14:04:54 +01:00
fbsanchez f979af0735 minor fixes
Former-commit-id: 51a2308e80a85c5a099410c5883c9b389d3a74ab
2019-02-27 13:56:06 +01:00
fbsanchez f8553b91e8 Merge branch 'fix/clippy' into 'develop'
clippy returns

See merge request artica/pandorafms!2215

Former-commit-id: 92fc5c2a79199fbd1b102edb0abad866eae1ab26
2019-02-27 13:45:40 +01:00
fbsanchez ec5c9d7c27 clippy returns
Former-commit-id: b9ed010f5af1002593471a0d0298848b3593e41e
2019-02-27 13:41:26 +01:00
daniel a718539919 Merge branch 'ent-change_mr_25' into 'develop'
change mr

See merge request artica/pandorafms!2213

Former-commit-id: 2500d4869601e900ec9f7437a9691cae38b76853
2019-02-27 11:41:44 +01:00