Merging upstream version 1.35.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 10 insertions, 12 deletions

diff --git a/claim/README.md b/claim/README.md
index d694990d3..9202645ed 100644
--- a/claim/README.md
+++ b/claim/README.md
@@ -492,16 +492,13 @@ sudo rm -rf cloud.d/
 This node no longer has access to the credentials it was used when connecting to Netdata Cloud via the ACLK.
 You will still be able to see this node in your War Rooms in an **unreachable** state.
 
-If you want to reconnect this node, you need to create a new identity by adding `-id=$(uuidgen)` to
-the claiming script parameters (not yet supported on the kickstart script). Make sure that you have the `uuidgen-runtime` package installed, as it is used to run the command `uuidgen`. For example:
+If you want to reconnect this node, you need to:
+1. Ensure that the `/var/lib/netdata/cloud.d` directory doesn't exist. In some installations, the path is `/opt/netdata/var/lib/netdata/cloud.d`.
+2. Stop the agent.
+3. Ensure that the `uuidgen-runtime` package is installed. Run ```echo "$(uuidgen)"``` and validate you get back a UUID.
+4. Copy the kickstart.sh command to add a node from your space and add to the end of it `--claim-id "$(uuidgen)"`. Run the command and look for the message `Node was successfully claimed.`
+5. Start the agent
 
-**Claiming script**
-
-```bash
-sudo netdata-claim.sh -token=TOKEN -rooms=ROOM1,ROOM2 -url=https://app.netdata.cloud -id=$(uuidgen)
-```
-
-The agent _must be restarted_ after this change.
 
 ## Connecting reference
 In the sections below, you can find reference material for the kickstart script, claiming script, connecting via the Agent's command line
diff --git a/claim/claim.c b/claim/claim.c
index 9c7e97e9e..f06679786 100644
--- a/claim/claim.c
+++ b/claim/claim.c
@@ -134,6 +134,10 @@ void load_claiming_state(void)
     netdata_cloud_setting = 0;
 #else
     uuid_t uuid;
+
+    // Propagate into aclk and registry. Be kind of atomic...
+    appconfig_get(&cloud_config, CONFIG_SECTION_GLOBAL, "cloud base url", DEFAULT_CLOUD_BASE_URL);
+
     rrdhost_aclk_state_lock(localhost);
     if (localhost->aclk_state.claimed_id) {
         if (aclk_connected)
@@ -148,9 +152,6 @@ void load_claiming_state(void)
     }
     aclk_disable_runtime = 0;
 
-    // Propagate into aclk and registry. Be kind of atomic...
-    appconfig_get(&cloud_config, CONFIG_SECTION_GLOBAL, "cloud base url", DEFAULT_CLOUD_BASE_URL);
-
     char filename[FILENAME_MAX + 1];
     snprintfz(filename, FILENAME_MAX, "%s/cloud.d/claimed_id", netdata_configured_varlib_dir);