Commit Graph

20262 Commits

Author SHA1 Message Date
Fermin 86a8024daa Minor fix
Former-commit-id: 607950b830c329095bb011966df4a4f67d270ed9
2019-03-05 14:10:44 +01:00
Alejandro Fraguas 590accf90c Merge branch 'ent-3403-Pantalla_en_blanco_con_credenciales_erroneas_en_config_php' into 'develop'
Added new alert when failed database

See merge request artica/pandorafms!2229

Former-commit-id: b2fef57a8988766b75c048542c746977f03aba4e
2019-03-05 13:42:33 +01:00
Tatiana Llorente 033eb2ff7c Fixed problem with install.php #3432
Former-commit-id: 7b1ac63e6a032fe2b1511c15e783fc5bbb6ac537
2019-03-05 13:33:29 +01:00
Tatiana Llorente 35633d181b Merge remote-tracking branch 'origin/develop' into ent-3432-Nueva-cabecera-y-menu-lateral
Conflicts:
	pandora_console/install.php


Former-commit-id: 32eb8fd266b43ce01a297044da9117e8d48b64a6
2019-03-05 13:20:59 +01:00
fbsanchez 054bc070f7 WIP review netmaps
Former-commit-id: 167c0fa7aacf7b3e916e9572faf43e32eee116dc
2019-03-05 13:19:03 +01:00
Tatiana Llorente 7be5d3e9e0 new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
Fermin 233ede643b Added chart to network report
Former-commit-id: 3dab00002afd311e787f1f4fc062958e189948d7
2019-03-05 12:33:01 +01:00
Daniel Rodriguez f817a94609 Merge branch 'ent-3319-ldap-save-password-conf-not-saving' into 'develop'
Fixed ldap conf tooltips

See merge request artica/pandorafms!2238

Former-commit-id: 355e217947287e500ea146a8f3777ec1cb3bc219
2019-03-05 10:34:15 +01:00
Fermin a01319464e Added link with params html component and modify the network report
Former-commit-id: d95cfe164d67e70d5135feb68169bb825ee2d83a
2019-03-05 10:08:07 +01:00
Luis Calvo 2ceba76d22 Fixed ldap conf tooltips
Former-commit-id: 957a6c1d90ce99630fa2327c829f178561192a50
2019-03-05 09:09:24 +01:00
Fermin 942b160a3d Use multiples in network explorer table
Former-commit-id: 2aec7e59e4ea46c693f5fe89c847f524cd882f63
2019-03-05 08:03:18 +01:00
artica 930c527ad2 Auto-updated build strings.
Former-commit-id: 2bf7188690fce3ac4ff2b8d124b552f6a6f7d608
2019-03-05 00:01:26 +01:00
Fermin d62b7f0d79 Added filter by ip requesting network matrix datas
Former-commit-id: 20a88fe66f9bcb2c39a9121b46e7204ed006470d
2019-03-04 20:26:11 +01:00
fbsanchez d89e3993e7 WIP first tasks
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
2019-03-04 20:02:35 +01:00
fbsanchez ab453fde68 WIP: event extended reports
Former-commit-id: ad01e92854f766c1a1f35103807b8974c90720a2
2019-03-04 19:06:15 +01:00
fermin831 c95b057c14 Added simple table on network explorer
Former-commit-id: 9f2cdc58d7fc1f0375e6945c087aafbd521bacc9
2019-03-04 17:03:10 +01:00
fbsanchez 92974c71d9 Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: d6708f1ea30390850ca133f8bd474e177863b016
2019-03-04 16:43:55 +01:00
fbsanchez 756fdd2cd4 minor fix in supervisor - server status global counter
Former-commit-id: f34daeb57a442b7f3b299e3d72d40317b0e9e0c0
2019-03-04 16:43:48 +01:00
fermin831 32f14e8fe4 Added header to network explorer
Former-commit-id: ba49f7cb158affc89d006c77f64a1448c7da178e
2019-03-04 16:31:59 +01:00
fermin831 8480572e5a Added network explorer report filter
Former-commit-id: f50d86b3ba226cc8068b3eae0fb5c72f4d30dd0b
2019-03-04 16:29:08 +01:00
daniel 9d7c6854a8 fixed error in snmp browser change server
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
Daniel Maya 1f1c9de887 changes in default values in networkmap
Former-commit-id: 650abcc24fc19e565b9737e80e602f7188114148
2019-03-04 15:31:07 +01:00
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
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
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