Cleans up cloud config files [agent_cloud_link] -> [cloud] (#8501)
* config move from [agent_cloud_link] to [cloud]
Timo committed
Mar 30, 2020 at 12:00 UTC
b8a4c9dd25b1749124adc745dfbc2da6a679856a
5 files changed
+6
-7
aclk/README.md
+1
-1
@@ -13,7 +13,7 @@ custom_edit_url: https://github.com/netdata/netdata/edit/master/aclk/README.md
13
In `netdata.conf`:
14
15
```ini
16
-[agent_cloud_link]
16
+[cloud]
17
proxy = none
18
```
19
aclk/aclk_common.c
+1
-1
@@ -124,7 +124,7 @@ static inline int check_http_enviroment(const char **proxy)
124
125
const char *aclk_lws_wss_get_proxy_setting(ACLK_PROXY_TYPE *type)
126
{
127
- const char *proxy = config_get(CONFIG_SECTION_ACLK, ACLK_PROXY_CONFIG_VAR, ACLK_PROXY_ENV);
127
+ const char *proxy = config_get(CONFIG_SECTION_CLOUD, ACLK_PROXY_CONFIG_VAR, ACLK_PROXY_ENV);
128
*type = PROXY_DISABLED;
129
130
if (strcmp(proxy, "none") == 0)
aclk/mqtt.c
+3
-3
@@ -88,9 +88,9 @@ int _mqtt_lib_init()
88
89
// show library info so can have it in the logfile
90
//libmosq_version = mosquitto_lib_version(&libmosq_major, &libmosq_minor, &libmosq_revision);
91
- ca_crt = config_get(CONFIG_SECTION_ACLK, "agent cloud link cert", "*");
92
- server_crt = config_get(CONFIG_SECTION_ACLK, "agent cloud link server cert", "*");
93
- server_key = config_get(CONFIG_SECTION_ACLK, "agent cloud link server key", "*");
91
+ ca_crt = config_get(CONFIG_SECTION_CLOUD, "link cert", "*");
92
+ server_crt = config_get(CONFIG_SECTION_CLOUD, "link server cert", "*");
93
+ server_key = config_get(CONFIG_SECTION_CLOUD, "link server key", "*");
94
95
if (ca_crt[0] == '*') {
96
freez(ca_crt);
claim/README.md
+1
-1
@@ -89,7 +89,7 @@ netdata-claim.sh -token=MYTOKEN1234567 -rooms=room1,room2 -proxy=socks5h://127.0
89
90
When claiming via the `netdata` binary set the following options in the config:
91
```
92
-[agent_cloud_link]
92
+[cloud]
93
proxy = socks5://X.X.X.X:YYYY
94
```
95
Proceed to claim using the command-line syntax:
libnetdata/config/appconfig.h
-1
@@ -93,7 +93,6 @@
93
#define CONFIG_SECTION_STREAM "stream"
94
#define CONFIG_SECTION_EXPORTING "exporting:global"
95
#define CONFIG_SECTION_HOST_LABEL "host labels"
96
-#define CONFIG_SECTION_ACLK "agent_cloud_link"
96
#define EXPORTING_CONF "exporting.conf"
97
98
// these are used to limit the configuration names and values lengths