tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,158 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

21158 Commits

Author SHA1 Message Date
Daniel Maya 3833eb6463 elex's recommendations :D 2019-05-08 15:27:22 +02:00
marcos.alconada 0b118f63ad Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola 2019-05-08 15:19:40 +02:00
marcos.alconada 1ffc6bd028 Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag 
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
 2019-05-08 14:36:04 +02:00
marcos.alconada 645730f11f Merge remote-tracking branch 'refs/remotes/origin/ent-3770-texto-del-pandora-diag' into ent-3770-texto-del-pandora-diag 
Former-commit-id: b273f92815e176976254a8c67cb0edd34e4bf9ca
 2019-05-08 14:35:00 +02:00
fbsanchez 9bc5a2d346 IPAM vlan wizard ExtremeXOS 2019-05-08 14:17:40 +02:00
Daniel Rodriguez 0ebf89a9eb Merge branch 'ent-3533-Mostrar-Contact-en-informacion-de-los-eventos' into 'develop' 
Show contact in events information

See merge request artica/pandorafms!2373
 2019-05-08 14:13:08 +02:00
Daniel Rodriguez 0c8fab6cb3 Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop' 
Ent 3574 7598 bug botones y casillas vista de eventos

See merge request artica/pandorafms!2222
 2019-05-08 13:52:45 +02:00
Daniel Rodriguez 72a127c085 Merge branch 'ent-3773-fallo-paginacion-templates-alerts' into 'develop' 
Fixed pagination in Alert templates

See merge request artica/pandorafms!2391
 2019-05-08 13:40:18 +02:00
Daniel Rodriguez d9e0d44a66 Merge branch 'ent-3782-module-visualization-bug' into 'develop' 
Added unknown status image

See merge request artica/pandorafms!2314
 2019-05-08 13:34:41 +02:00
Daniel Rodriguez f13162abf1 Merge branch 'ent-3802-visual-constole-warning-state-bug' into 'develop' 
Fixed select bug not selectig value

See merge request artica/pandorafms!2346
 2019-05-08 13:17:02 +02:00
Daniel Rodriguez 247605f308 Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop' 
Eliminated the cache when update agents

See merge request artica/pandorafms!2242
 2019-05-08 12:50:40 +02:00
Luis Calvo ef1149d3bb Fixed get agent status on linked map 2019-05-08 12:39:53 +02:00
Luis Calvo 5b75b671aa Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-08 12:37:10 +02:00
Ramon Novoa a9bf83cc5b Fix the call to docker build to always build the latest image. 2019-05-08 11:22:07 +02:00
Alejandro Fraguas 297f53b9de Merge branch 'ent-3608-Update-Manager-Online' into 'develop' 
Ent 3608 update manager online

See merge request artica/pandorafms!2379
 2019-05-08 11:20:12 +02:00
Daniel Maya 610e0dabbf Merge branch 'develop' into ent-3773-fallo-paginacion-templates-alerts 2019-05-08 11:17:15 +02:00
Daniel Barbero Martin 99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
Tatiana Llorente cb49de4d81 New menu module graph - #3617 2019-05-08 10:28:00 +02:00
manuel f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
Tatiana Llorente 5e0b53e3c2 New menu module graph - #3617 2019-05-08 09:35:28 +02:00
artica f2873714a6 Auto-updated build strings. 2019-05-08 00:01:08 +02:00
marcos.alconada fa14fa9510 Show new values after update 2019-05-07 17:47:47 +02:00
Luis Calvo 954aac3aeb Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-07 17:13:54 +02:00
Daniel Maya e565ddee42 Round decimal value in percentil item and fixed value font size 2019-05-07 16:43:27 +02:00
Luis Calvo 3221bcf55a Merge remote-tracking branch 'origin/develop' into ent-3782-module-visualization-bug 2019-05-07 16:08:29 +02:00
Tatiana Llorente 283be8f632 New menu module graph - #3617 2019-05-07 16:07:07 +02:00
Ramon Novoa a92f81272a Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop 2019-05-07 15:05:03 +02:00
Ramon Novoa 10fd9c4b57 Merge branch 'ent-3755-Vista-de-eventos-se-carga-dos-veces' into develop 2019-05-07 15:02:47 +02:00
Alejandro Fraguas 547348440f Merge branch '206-anadido-soporte-para-aix-en-plugin-de-inventario' into 'develop' 
Resolve "Añadido soporte para AIX en plugin de inventario"

See merge request artica/pandorafms!2294
 2019-05-07 14:57:09 +02:00
manuel b2b4372c9d Added helps 
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
 2019-05-07 11:34:09 +02:00
Alejandro Fraguas 0a96cfd696 Merge branch 'ent-3819-Bug-en-vista-monitor-details-con-tags' into 'develop' 
Fixed bug in monitor detail view

See merge request artica/pandorafms!2360

Former-commit-id: fcbe351e4a71b0827fa7e4919a3b4ae8ffa956bb
 2019-05-07 10:17:37 +02:00
artica 9116a72a2b Auto-updated build strings. 
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
 2019-05-07 00:01:09 +02:00
marcos.alconada ad00492ad6 se elimina la query del 27 
Former-commit-id: 1756d296ad9c13c62c4eb46a854291dfc4200256
 2019-05-06 18:23:12 +02:00
marcos.alconada fff3a783a1 Se restablece archivo modificado 
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
 2019-05-06 18:09:30 +02:00
marcos.alconada e1951c45a4 Se añade al 28 
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
 2019-05-06 18:06:59 +02:00
Daniel Maya b57adb38a5 added graph_precision for the float in static_graph and percentile item 
Former-commit-id: 7fda14add9bcb0d9c0a425caad752364e29b309c
 2019-05-06 17:12:00 +02:00
Alejandro Fraguas 11a16e4c2a Merge branch 'ent-3408-snmp-component-creation-api' into 'develop' 
Fixed wrong array index for id_group

See merge request artica/pandorafms!2286

Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
 2019-05-06 17:00:29 +02:00
manuel 00b5fc0a2c Added helps 
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
 2019-05-06 16:59:31 +02:00
Daniel Barbero Martin 3fcd854ae6 fixed error labels graphs and weight in chart 
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
 2019-05-06 16:43:59 +02:00
alejandro-campos a622dcc9d4 add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node 
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
 2019-05-06 15:06:26 +02:00
Daniel Maya 759c175d4f Added date in analogic clock 
Former-commit-id: 2436cac56b3910e23ce06defc5ce362f463b002f
 2019-05-06 11:36:20 +02:00
Alejandro Fraguas 545afcb684 Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop' 
Added secondary groups in global search

See merge request artica/pandorafms!2351

Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
 2019-05-06 10:33:30 +02:00
artica 6d7b748591 Auto-updated build strings. 
Former-commit-id: 0110fd44ff110c73a9bdb427e7a017258a48bfa8
 2019-05-06 00:01:06 +02:00
artica 83b6fe5a55 Auto-updated build strings. 
Former-commit-id: 24f76ce9d15cf44952fe148ff48f6017b5798942
 2019-05-05 00:01:07 +02:00
artica 168ee6cdc6 Auto-updated build strings. 
Former-commit-id: 0a99a82af6cebf9b798329e52e44819825c0bb05
 2019-05-04 00:01:07 +02:00
Daniel Barbero eb64dbae86 add new checkbox current date for SLA Weekly, Montly and Hourly for item and template item 
Former-commit-id: c9f8c2d93cea8ecc398fe4d89e7a7b7804640cdc
 2019-05-03 14:16:26 +02:00
Daniel Barbero c5884f1ac9 add changes sql for mr 28 
Former-commit-id: 0650b5ec91188a854fb756d7c2d8b1b8eccc3e0d
 2019-05-03 14:09:23 +02:00
Tatiana Llorente 7da5f518d8 Fixed the form when you try to create an agent without alias - #3611 
Former-commit-id: 48bacfeb69e9df8114f2421b5d6b40596a5c263c
 2019-05-03 14:00:24 +02:00
alejandro-campos 7d8f9f7798 fix lint errors 
Former-commit-id: fc0a4502e571495b5ac17174a594aa767e882b21
 2019-05-03 13:54:39 +02:00
alejandro-campos 5b3dfcbf74 add feature to enable obfuscation on command fields when creating or updating commands 
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
 2019-05-03 13:46:52 +02:00