Commit Graph

20981 Commits

Author SHA1 Message Date
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
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
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
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
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
Tatiana Llorente b3a4d9edf1 New View Create/Update Agent - #3611
Former-commit-id: fc6de6e82874a71477493eb1e9c93a8a7385e342
2019-05-03 13:24:15 +02:00
Tatiana Llorente 9f3c586b55 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
2019-05-03 13:11:26 +02:00
Tatiana Llorente 7721c0e605 New View Create/Update Agent - #3611
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
2019-05-03 13:07:58 +02:00
Daniel Rodriguez 16f687574e Merge branch 'ent-3847-Bug-en-edicion-de-modulos-locales-posible-condicion-especial' into 'develop'
Fixed bug in unlinked modules

See merge request artica/pandorafms!2347

Former-commit-id: 32bea7e188131ae6115f6c45012dafe648f811cd
2019-05-03 12:41:01 +02:00
manuel e424a2a684 Fixed bug in unlinked modules edition
Former-commit-id: ec9ee4ecbc53a5c617aaf2cee52f7cbbf8f94da8
2019-05-03 12:14:23 +02:00
artica b88456f696 Auto-updated build strings.
Former-commit-id: 21d8c77dbdf5653b73aed9a83b833ec8dc5cb243
2019-05-03 00:01:06 +02:00
artica 828d7830a5 Auto-updated build strings.
Former-commit-id: 646717be2ca7b947dc8acf0c9db4b8e4ab7762b0
2019-05-02 00:01:06 +02:00
artica a9e0acd3e1 Auto-updated build strings.
Former-commit-id: e2dcdd18fd18f75cff8c27ebd69b40940186166b
2019-05-01 00:01:10 +02:00
Daniel Rodriguez 3b73ea95ae Merge branch 'ent-3940-No-salen-IPs-en-mapas-netflow' into 'develop'
Fixed node name in netflow map

See merge request artica/pandorafms!2386

Former-commit-id: 14cf4f85a78b092fb7efe10a05e63702d4dbcbb2
2019-04-30 17:53:48 +02:00
Daniel Rodriguez 5be813e210 Merge branch 'ent-3877-custom-field-view-faltan-los-enlaces-en-los-contadores' into 'develop'
add links counters cfv

See merge request artica/pandorafms!2388

Former-commit-id: 8666427450be1b27f1c6b7ae08a3e9388e32aa97
2019-04-30 17:50:33 +02:00
Daniel Maya c31948b7c2 Fixed netflow node name
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
2019-04-30 17:30:57 +02:00
Daniel Maya 37d3737f82 Fixed number_format in group stadistic
Former-commit-id: 7580be83cce0432ab68e3698813fd7eef079665a
2019-04-30 16:23:14 +02:00
Alejandro Fraguas 39786e4d32 Merge branch 'ent-3395-Añadir-un-componente-de-red-por-CLI' into 'develop'
Added new functionality in CLI create_network_component

See merge request artica/pandorafms!2275

Former-commit-id: ca972d681e20579a32a1847bf4bfdce35f4f3de4
2019-04-30 13:42:23 +02:00
artica 310d217fb2 Auto-updated build strings.
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
2019-04-30 00:01:09 +02:00
Daniel Maya 61a0528717 Fixed EventHistory link
Former-commit-id: 431251e74f419123b4848e10edc5fe472accdf43
2019-04-29 17:37:36 +02:00
Daniel Barbero Martin 2aaeddd803 fixed errors IPAM subneting
Former-commit-id: 58fb50dd594be993a1f17413ab9466d8588fa19a
2019-04-29 16:42:26 +02:00