Commit Graph

26252 Commits

Author SHA1 Message Date
artica 4c1eaf929b Auto-updated build strings. 2021-02-18 01:00:24 +01:00
vgilc 11cf5ae627 Merge branch 'fixed-mr-version-44-752-2' into 'develop'
fixed mr version and remove updates mr

See merge request artica/pandorafms!3843
2021-02-17 14:45:50 +01:00
Daniel Barbero Martin 39e603e908 fixed mr version and remove updates mr 2021-02-17 14:27:16 +01:00
vgilc c371370ac1 Merge branch 'fixed-mr-version-44-752' into 'develop'
fixed mr version and remove updates mr

See merge request artica/pandorafms!3841
2021-02-17 13:08:44 +01:00
Daniel Barbero Martin 234097320f fixed mr version and remove updates mr 2021-02-17 13:04:59 +01:00
Daniel Rodriguez 8a0b4fd090 Merge branch 'ent-7032-boton-ok-wizard-snmp-interfaces' into 'develop'
Hide OK button meanwhile is loading data

Closes pandora_enterprise#7032

See merge request artica/pandorafms!3837
2021-02-17 09:50:25 +01:00
artica a33a94eb89 Auto-updated build strings. 2021-02-17 01:00:18 +01:00
Jose Gonzalez ed6c6dfad5 Hide OK button meanwhile is loading data 2021-02-16 13:43:10 +01:00
artica c2ec312e72 Auto-updated build strings. 2021-02-16 01:00:18 +01:00
artica 2a7ba5fbe0 Auto-updated build strings. 2021-02-15 01:00:15 +01:00
artica 2ef0a1b395 Auto-updated build strings. 2021-02-14 01:00:15 +01:00
artica 3c29314dc7 Auto-updated build strings. 2021-02-13 01:00:18 +01:00
Daniel Rodriguez 51e7a6f593 Merge branch 'ent-6864-guardia-10968-graficas-por-mail' into 'develop'
Pandora sendmail control write all data in socket

See merge request artica/pandorafms!3831
2021-02-12 15:30:44 +01:00
Luis 0469c3c9a8 Pandora sendmail control write all data in socket 2021-02-12 15:30:44 +01:00
Daniel Rodriguez 6a514a2c99 Merge branch 'ent-fix-api-create-network-module' into 'develop'
Fixed that 'use_agent_alias' cannot be specified in 'set create_network_module'.

See merge request artica/pandorafms!3832
2021-02-12 09:39:01 +01:00
Junichi Satoh 5ce8d6dafc Fixed that 'use_agent_alias' cannot be specified in 'set create_network_module'. 2021-02-12 12:21:35 +09:00
artica 768494e796 Auto-updated build strings. 2021-02-12 01:00:20 +01:00
artica 16f2a60490 Auto-updated build strings. 2021-02-11 01:00:22 +01:00
artica 40852de906 Auto-updated build strings. 2021-02-10 01:00:22 +01:00
Daniel Rodriguez 4ef97ae494 Merge branch 'ent-6908-10801-cambio-funcionamiento-snmp-browser' into 'develop'
Ent 6908 10801 cambio funcionamiento snmp browser

See merge request artica/pandorafms!3826
2021-02-09 16:44:16 +01:00
Daniel Rodriguez df603853ad Merge branch 'ent-7020-movidas-del-wizard' into 'develop'
Ent 7020 movidas del wizard

See merge request artica/pandorafms!3816
2021-02-09 16:25:06 +01:00
fbsanchez b17d6349f7 Multiple fixes port defition 2021-02-09 13:44:21 +01:00
Daniel Rodriguez 9b177272b5 Merge branch 'ent-improve-api-alert-template2' into 'develop'
Fixed permission problems and improved function for api calls, 'set create_alert_template', 'set update_alert_template' and 'set delete_alert_template'.

See merge request artica/pandorafms!3755
2021-02-09 12:47:39 +01:00
fbsanchez 58354979d0 Minor fix 2021-02-09 12:08:19 +01:00
fbsanchez 2639533cc1 Fixes 2021-02-09 12:05:59 +01:00
fbsanchez 3db4a3a595 Merge remote-tracking branch 'origin/develop' into ent-6908-10801-cambio-funcionamiento-snmp-browser 2021-02-09 10:28:28 +01:00
fbsanchez ecf0f3d161 Force error catching while SNMP browsing 2021-02-09 10:25:42 +01:00
fbsanchez 40e97f6cf6 Removed warnings 2021-02-09 10:25:08 +01:00
artica e0d1cdd667 Auto-updated build strings. 2021-02-09 01:00:25 +01:00
fbsanchez e711239c69 Added port, limited base OID (default) removed timeout (browser) capturing error to message 2021-02-08 17:42:41 +01:00
fbsanchez 67c51b0e96 Merge remote-tracking branch 'origin/develop' into ent-7020-movidas-del-wizard 2021-02-08 15:22:04 +01:00
artica c828ca2061 Auto-updated build strings. 2021-02-08 01:00:16 +01:00
artica fe8a54aa48 Auto-updated build strings. 2021-02-07 01:00:17 +01:00
artica 0362e4a1a0 Auto-updated build strings. 2021-02-06 01:00:17 +01:00
fbsanchez 679ada717e filter with preload - filtering improved 2021-02-05 15:10:31 +01:00
Daniel Rodriguez 509ab9fd3a Merge branch 'ent-7015-establecer-las-nuevas-consolas-visuales-habilitadas-por-defecto-en-instalaciones-nuevas' into 'develop'
Ent 7015 establecer las nuevas consolas visuales habilitadas por defecto en instalaciones nuevas

See merge request artica/pandorafms!3823
2021-02-05 15:08:59 +01:00
Marcos Alconada 92cf6c60cb Ent 7015 establecer las nuevas consolas visuales habilitadas por defecto en instalaciones nuevas 2021-02-05 15:08:58 +01:00
Daniel Rodriguez 28efbe3a27 Merge branch 'ent-6146-10181-cambio-en-el-plugin-de-kafka' into 'develop'
Ent 6146 10181 cambio en el plugin de kafka

See merge request artica/pandorafms!3824
2021-02-05 15:07:14 +01:00
Kevin 0a432e574b Done right 2021-02-05 13:23:45 +01:00
Kevin cc9bf057f4 fixed slip-up 2021-02-05 13:20:56 +01:00
Kevin ab34a7daa8 Merge branch 'ent-6146-10181-cambio-en-el-plugin-de-kafka' of brutus.artica.es:artica/pandorafms into ent-6146-10181-cambio-en-el-plugin-de-kafka 2021-02-05 13:13:18 +01:00
Kevin ab12c782ef Changed exit code so error modules are created 2021-02-05 13:13:13 +01:00
Kevin b657138fad Changed exit code so error modules are created 2021-02-05 13:07:54 +01:00
fbsanchez 9a439a96e5 filtering interfaces in wizard 2021-02-05 12:37:27 +01:00
Daniel Rodriguez 64d27c6572 Merge branch 'ent-fix-api-update-agent' into 'develop'
Fixed allowing invalid parameters in API 'set update_agent'.

See merge request artica/pandorafms!3822
2021-02-05 11:58:25 +01:00
Daniel Rodriguez 1416135d86 Merge branch 'ent-5986-fallo-use_xml_timestamp-a-0' into 'develop'
Fix the description of use_xml_timestamp.

See merge request artica/pandorafms!3817
2021-02-05 10:00:23 +01:00
Junichi Satoh 83ac2a134a Fixed allowing invalid parameters in API 'set update_agent'. 2021-02-05 16:00:06 +09:00
artica fffea9fd99 Auto-updated build strings. 2021-02-05 01:00:20 +01:00
fbsanchez 63834c62a7 Awesome wizard 2021-02-04 18:26:34 +01:00
fbsanchez 7bb68abbad Wizard RC1 with filtering and improved comm 2021-02-04 18:19:35 +01:00