Use new MQTT as default (revert #13258)" (#13287)
This reverts commit b92f5a3271bb0fb7d16b2c406e473eec7bd68102.
Timotej S committed
Jul 6, 2022 at 09:40 UTC
8d5850fd49bf6308cd6cab690cdbba4a35505b39
3 files changed
+4
-4
aclk/README.md
+2
-2
@@ -50,12 +50,12 @@ You can configure following keys in the `netdata.conf` section `[cloud]`:
50
[cloud]
51
statistics = yes
52
query thread count = 2
53
- mqtt5 = no
53
+ mqtt5 = yes
54
```
55
56
- `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.
57
- `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).
58
-- `mqtt5` enables the new MQTT5 protocol implementation in the Agent. Currently a technical preview.
58
+- `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.
59
60
## Disable the ACLK
61
aclk/aclk.c
+1
-1
@@ -660,7 +660,7 @@ void *aclk_main(void *ptr)
660
if (wait_till_agent_claim_ready())
661
goto exit;
662
663
- use_mqtt_5 = config_get_boolean(CONFIG_SECTION_CLOUD, "mqtt5", CONFIG_BOOLEAN_NO);
663
+ use_mqtt_5 = config_get_boolean(CONFIG_SECTION_CLOUD, "mqtt5", CONFIG_BOOLEAN_YES);
664
665
if (!(mqttwss_client = mqtt_wss_new("mqtt_wss", aclk_mqtt_wss_log_cb, msg_callback, puback_callback, use_mqtt_5))) {
666
error("Couldn't initialize MQTT_WSS network library");
aclk/aclk_api.c
+1
-1
@@ -61,7 +61,7 @@ void add_aclk_host_labels(void) {
61
}
62
63
64
- int mqtt5 = config_get_boolean(CONFIG_SECTION_CLOUD, "mqtt5", CONFIG_BOOLEAN_NO);
64
+ int mqtt5 = config_get_boolean(CONFIG_SECTION_CLOUD, "mqtt5", CONFIG_BOOLEAN_YES);
65
66
rrdlabels_add(labels, "_mqtt_version", mqtt5 ? "5" : "3", RRDLABEL_SRC_AUTO);
67
rrdlabels_add(labels, "_aclk_impl", "Next Generation", RRDLABEL_SRC_AUTO);