diff options
author | Timotej S <6674623+underhood@users.noreply.github.com> | 2022-06-27 09:18:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-27 09:18:52 +0200 |
commit | 862c5a9694be2069997408326f9cf7ee9403dce4 (patch) | |
tree | 54f9e1d85b92350edcce73088956903a5e0b4581 | |
parent | 1ffbb3c725c9c2d45a56fc860df43050d27d101d (diff) |
Use new mqtt implementation as default (#13132)
flips mqtt5 to be default instead of mqtt3
-rw-r--r-- | aclk/README.md | 4 | ||||
-rw-r--r-- | aclk/aclk.c | 2 | ||||
-rw-r--r-- | aclk/aclk_api.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/aclk/README.md b/aclk/README.md index f595726e3d..a6a4feeb2c 100644 --- a/aclk/README.md +++ b/aclk/README.md @@ -50,12 +50,12 @@ You can configure following keys in the `netdata.conf` section `[cloud]`: [cloud] statistics = yes query thread count = 2 - mqtt5 = no + mqtt5 = yes ``` - `statistics` enables/disables ACLK related statistics and their charts. You can disable this to save some space in the database and slightly reduce memory usage of Netdata Agent. - `query thread count` specifies the number of threads to process cloud queries. Increasing this setting is useful for nodes with many children (streaming), which can expect to handle more queries (and/or more complicated queries). -- `mqtt5` enables the new MQTT5 protocol implementation in the Agent. Currently a technical preview. +- `mqtt5` allows disabling the new MQTT5 implementation which is used now by default in case of issues. This option will be removed in future stable release. ## Disable the ACLK diff --git a/aclk/aclk.c b/aclk/aclk.c index 9593ff5564..5d2b5405c9 100644 --- a/aclk/aclk.c +++ b/aclk/aclk.c @@ -801,7 +801,7 @@ void *aclk_main(void *ptr) if (wait_till_agent_claim_ready()) goto exit; - use_mqtt_5 = config_get_boolean(CONFIG_SECTION_CLOUD, "mqtt5", CONFIG_BOOLEAN_NO); + use_mqtt_5 = config_get_boolean(CONFIG_SECTION_CLOUD, "mqtt5", CONFIG_BOOLEAN_YES); #ifdef ENABLE_NEW_CLOUD_PROTOCOL if (!(mqttwss_client = mqtt_wss_new("mqtt_wss", aclk_mqtt_wss_log_cb, msg_callback, puback_callback, use_mqtt_5))) { diff --git a/aclk/aclk_api.c b/aclk/aclk_api.c index 9f57f80638..1f63b748fe 100644 --- a/aclk/aclk_api.c +++ b/aclk/aclk_api.c @@ -71,7 +71,7 @@ void add_aclk_host_labels(void) { break; } - int mqtt5 = config_get_boolean(CONFIG_SECTION_CLOUD, "mqtt5", CONFIG_BOOLEAN_NO); + int mqtt5 = config_get_boolean(CONFIG_SECTION_CLOUD, "mqtt5", CONFIG_BOOLEAN_YES); rrdlabels_add(labels, "_mqtt_version", mqtt5 ? "5" : "3", RRDLABEL_SRC_AUTO); rrdlabels_add(labels, "_aclk_impl", "Next Generation", RRDLABEL_SRC_AUTO); rrdlabels_add(labels, "_aclk_proxy", proxy_str, RRDLABEL_SRC_AUTO); |