tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-17 07:48:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
20,002 Commits 34 Branches 30 Tags
Commit Graph

20002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alejandro Fraguas
63cd5fe018 Merge branch 'ent-3530-SNMP-event-graph-not-working' into 'develop' 
Fixed width unit on graph, setted to px instead of %

See merge request artica/pandorafms!2234

Former-commit-id: 52caaa0de71150e62616b363471aa4bafadf4fcb
 2019-03-05 18:06:45 +01:00
Fermin
c09f89dffe Added expport to CSV button 
Former-commit-id: 7e8c23fbceb0e20bd0bc895212a52017241b68de
 2019-03-05 17:30:47 +01:00
alejandro-campos
4943521904 fix pandora migrate script 
Former-commit-id: 0d66837bf3f842aed32c3c64edc2608580d6ed7f
 2019-03-05 15:28:39 +01:00
Daniel Rodriguez
6bc73b54cb Merge branch 'ent-3529-7431-conteo-de-agentes-deshabilitados-en-metaconsola' into 'develop' 
Fixed downtimes disabled and enabled agents

Closes pandora_enterprise#3529

See merge request artica/pandorafms!2205

Former-commit-id: dc624b9b6f73ca1a56527c71ba4b0495ad219aaa
 2019-03-05 14:43:10 +01:00
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
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
fermin831
c95b057c14 Added simple table on network explorer 
Former-commit-id: 9f2cdc58d7fc1f0375e6945c087aafbd521bacc9
 2019-03-04 17:03:10 +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 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
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
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
Alejandro Gallardo Escobar
42d8e72400 Recovered the lost code for the current user macro at the event responses. 
(cherry picked from commit d554dcc7db0e8d007c645bc07d9160f3f57a3c4e [formerly 1a5860bc7a62efecba44d467df9eb9cf7e25070b])


Former-commit-id: de201ec04f1dc211c56db3fc0dbf8ae66a549ddf
 2019-03-01 09:40:36 +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