app to api netdata cloud (#13856)
Timotej S committed
Oct 24, 2022 at 15:17 UTC
de96dd73f2878346edaf1aa4e7c6cf45ad11173e
12 files changed
+27
-27
aclk/README.md
+3
-3
@@ -19,7 +19,7 @@ The Cloud App lives at app.netdata.cloud which currently resolves to the followi
19
20
:::caution
21
22
-This list of IPs can change without notice, we strongly advise you to whitelist the domain `app.netdata.cloud`, if
22
+This list of IPs can change without notice, we strongly advise you to whitelist following domains `api.netdata.cloud`, `mqtt.netdata.cloud`, if
23
this is not an option in your case always verify the current domain resolution (e.g via the `host` command).
24
25
:::
@@ -49,7 +49,7 @@ configuration uses two settings:
49
```conf
50
[global]
51
enabled = yes
52
- cloud base url = https://app.netdata.cloud
52
+ cloud base url = https://api.netdata.cloud
53
```
54
55
If your Agent needs to use a proxy to access the internet, you must [set up a proxy for
@@ -112,7 +112,7 @@ must contain only `EOF`.
112
```bash
113
[global]
114
enabled = no
115
- cloud base url = https://app.netdata.cloud
115
+ cloud base url = https://api.netdata.cloud
116
EOF
117
```
118
claim/README.md
+9
-9
@@ -73,7 +73,7 @@ When coming from [Nodes view page](https://learn.netdata.cloud/docs/cloud/visua
73
If you want to connect a node that is running on a Linux environment, the script that will be provided to you by Netdata Cloud is the [kickstart](/packaging/installer/README.md#automatic-one-line-installation-script) which will install the Netdata Agent on your node, if it isn't already installed, and connect the node to Netdata Cloud. It should be similar to:
74
75
```
76
-wget -O /tmp/netdata-kickstart.sh https://my-netdata.io/kickstart.sh && sh /tmp/netdata-kickstart.sh --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://app.netdata.cloud
76
+wget -O /tmp/netdata-kickstart.sh https://my-netdata.io/kickstart.sh && sh /tmp/netdata-kickstart.sh --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://api.netdata.cloud
77
```
78
The script should return `Agent was successfully claimed.`. If the connecting to Netdata Cloud process returns errors, or if you don't see
79
the node in your Space after 60 seconds, see the [troubleshooting information](#troubleshooting).
@@ -101,7 +101,7 @@ The default user is `netdata`. Yours may be different, so pay attention to the o
101
and run the script.
102
103
```bash
104
-wget -O /tmp/netdata-kickstart.sh https://my-netdata.io/kickstart.sh && sh /tmp/netdata-kickstart.sh --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://app.netdata.cloud
104
+wget -O /tmp/netdata-kickstart.sh https://my-netdata.io/kickstart.sh && sh /tmp/netdata-kickstart.sh --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://api.netdata.cloud
105
```
106
### Connect an agent running in Docker
107
@@ -212,7 +212,7 @@ docker run -d --name=netdata \
212
--cap-add SYS_PTRACE \
213
--security-opt apparmor=unconfined \
214
-e NETDATA_CLAIM_TOKEN=TOKEN \
215
- -e NETDATA_CLAIM_URL="https://app.netdata.cloud" \
215
+ -e NETDATA_CLAIM_URL="https://api.netdata.cloud" \
216
-e NETDATA_CLAIM_ROOMS=ROOM1,ROOM2 \
217
-e NETDATA_CLAIM_PROXY=PROXY \
218
netdata/netdata
@@ -256,7 +256,7 @@ services:
256
- /etc/os-release:/host/etc/os-release:ro
257
environment:
258
- NETDATA_CLAIM_TOKEN=TOKEN
259
- - NETDATA_CLAIM_URL="https://app.netdata.cloud"
259
+ - NETDATA_CLAIM_URL="https://api.netdata.cloud"
260
- NETDATA_CLAIM_ROOMS=ROOM1,ROOM2
261
262
volumes:
@@ -276,7 +276,7 @@ Connect a _running Netdata Agent container_, where you don't want to recreate th
276
`netdata` with the name of your running container:
277
278
```bash
279
-docker exec -it netdata netdata-claim.sh -token=TOKEN -rooms=ROOM1,ROOM2 -url=https://app.netdata.cloud
279
+docker exec -it netdata netdata-claim.sh -token=TOKEN -rooms=ROOM1,ROOM2 -url=https://api.netdata.cloud
280
```
281
The values for `ROOM1,ROOM2` can be found by by going to Netdata Cloud, clicking the **Nodes** tab, clicking **Connect Nodes**, selecting **Docker**, and copying the `rooms=` value in the command provided.
282
@@ -288,7 +288,7 @@ you don't see the node in your Space after 60 seconds, see the [troubleshooting
288
To connect a node that is running on a macOS environment the script that will be provided to you by Netdata Cloud is the [kickstart](/packaging/installer/methods/macos.md#install-netdata-with-our-automatic-one-line-installation-script) which will install the Netdata Agent on your node, if it isn't already installed, and connect the node to Netdata Cloud. It should be similar to:
289
290
```bash
291
-curl https://my-netdata.io/kickstart.sh > /tmp/netdata-kickstart.sh && sh /tmp/netdata-kickstart.sh --install /usr/local/ --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://app.netdata.cloud
291
+curl https://my-netdata.io/kickstart.sh > /tmp/netdata-kickstart.sh && sh /tmp/netdata-kickstart.sh --install /usr/local/ --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://api.netdata.cloud
292
```
293
The script should return `Agent was successfully claimed.`. If the connecting to Netdata Cloud process returns errors, or if you don't see
294
the node in your Space after 60 seconds, see the [troubleshooting information](#troubleshooting).
@@ -328,7 +328,7 @@ You can now move on to connecting. When you connect with the [kickstart](/packag
328
append the same proxy setting you added to `netdata.conf`.
329
330
```bash
331
-wget -O /tmp/netdata-kickstart.sh https://my-netdata.io/kickstart.sh && sh /tmp/netdata-kickstart.sh --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://app.netdata.cloud --claim-proxy http://[user:pass@]host:ip
331
+wget -O /tmp/netdata-kickstart.sh https://my-netdata.io/kickstart.sh && sh /tmp/netdata-kickstart.sh --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://api.netdata.cloud --claim-proxy http://[user:pass@]host:ip
332
```
333
334
Hit **Enter**. The script should return `Agent was successfully claimed.`. If the connecting to Netdata Cloud process returns errors, or if
@@ -511,7 +511,7 @@ using the [ACLK](/aclk/README.md).
511
512
| setting | default | info |
513
|:-------------- |:------------------------- |:-------------------------------------------------------------------------------------------------------------------------------------- |
514
-| cloud base url | https://app.netdata.cloud | The URL for the Netdata Cloud web application. You should not change this. If you want to disable Cloud, change the `enabled` setting. |
514
+| cloud base url | https://api.netdata.cloud | The URL for the Netdata Cloud web application. You should not change this. If you want to disable Cloud, change the `enabled` setting. |
515
| enabled | yes | The runtime option to disable the [Agent-Cloud link](/aclk/README.md) and prevent your Agent from connecting to Netdata Cloud. |
516
517
### kickstart script
@@ -551,7 +551,7 @@ using `sudo`, or as the user running the Agent (typically `netdata`), and passin
551
-rooms=ROOM1,ROOM2,...
552
where ROOMX is the War Room this node should be added to. This list is optional.
553
-url=URL_BASE
554
- where URL_BASE is the Netdata Cloud endpoint base URL. By default, this is https://app.netdata.cloud.
554
+ where URL_BASE is the Netdata Cloud endpoint base URL. By default, this is https://api.netdata.cloud.
555
-id=AGENT_ID
556
where AGENT_ID is the unique identifier of the Agent. This is the Agent's MACHINE_GUID by default.
557
-hostname=HOSTNAME
claim/netdata-claim.sh.in
+1
-1
@@ -136,7 +136,7 @@ MACHINE_GUID_FILE="@registrydir_POST@/netdata.public.unique.id"
136
CLAIMING_DIR="${NETDATA_VARLIB_DIR}/cloud.d"
137
TOKEN="unknown"
138
URL_BASE=$(get_config_value cloud global "cloud base url")
139
-[ -z "$URL_BASE" ] && URL_BASE="https://app.netdata.cloud" # Cover post-install with --dont-start
139
+[ -z "$URL_BASE" ] && URL_BASE="https://api.netdata.cloud" # Cover post-install with --dont-start
140
ID="unknown"
141
ROOMS=""
142
[ -z "$HOSTNAME" ] && HOSTNAME=$(hostname)
daemon/README.md
+1
-1
@@ -191,7 +191,7 @@ The command line options of the Netdata 1.10.0 version are the following:
191
-W simple-pattern pattern string
192
Check if string matches pattern and exit.
193
194
- -W "claim -token=TOKEN -rooms=ROOM1,ROOM2 url=https://app.netdata.cloud"
194
+ -W "claim -token=TOKEN -rooms=ROOM1,ROOM2 url=https://api.netdata.cloud"
195
Connect the agent to the workspace rooms pointed to by TOKEN and ROOM*.
196
197
Signals netdata handles:
docs/guides/troubleshoot/troubleshooting-agent-with-cloud-connection.md
+5
-5
@@ -65,7 +65,7 @@ With the introduction of our new architecture, Agents running versions lower tha
65
66
### Verify that your IP is whitelisted from Netdata Cloud
67
68
-Most of the nodes change IPs dynamically. It is possible that your current IP has been restricted from accessing `app.netdata.cloud` due to security concerns.
68
+Most of the nodes change IPs dynamically. It is possible that your current IP has been restricted from accessing `api.netdata.cloud` due to security concerns.
69
70
To verify this:
71
@@ -75,7 +75,7 @@ To verify this:
75
sudo netdatacli aclk-state | grep "Banned By Cloud"
76
```
77
78
- The output will contain a line indicating if the IP is banned from `app.netdata.cloud`:
78
+ The output will contain a line indicating if the IP is banned from `api.netdata.cloud`:
79
80
```bash
81
Banned By Cloud: yes
@@ -97,13 +97,13 @@ To verify this:
97
2. If you can reach external IPs, then check your domain resolution.
98
99
```bash
100
- host app.netdata.cloud
100
+ host api.netdata.cloud
101
```
102
103
The expected output should be something like this:
104
105
```bash
106
- app.netdata.cloud is an alias for main-ingress-545609a41fcaf5d6.elb.us-east-1.amazonaws.com.
106
+ api.netdata.cloud is an alias for main-ingress-545609a41fcaf5d6.elb.us-east-1.amazonaws.com.
107
main-ingress-545609a41fcaf5d6.elb.us-east-1.amazonaws.com has address 54.198.178.11
108
main-ingress-545609a41fcaf5d6.elb.us-east-1.amazonaws.com has address 44.207.131.212
109
main-ingress-545609a41fcaf5d6.elb.us-east-1.amazonaws.com has address 44.196.50.41
@@ -111,7 +111,7 @@ To verify this:
111
112
:::info
113
114
- There will be cases in which the firewall restricts network access. In those cases, you need to whitelist the `app.netdata.cloud` domain to be able to see your nodes in Netdata Cloud.
114
+ There will be cases in which the firewall restricts network access. In those cases, you need to whitelist `api.netdata.cloud` and `mqtt.netdata.cloud` domains to be able to see your nodes in Netdata Cloud.
115
If you can't whitelist domains in your firewall, you can whitelist the IPs that the above command will produce, but keep in mind that they can change without any notice.
116
117
:::
health/notifications/alarm-notify.sh.in
+1
-1
@@ -199,7 +199,7 @@ fi
199
[ -z "${NETDATA_STOCK_CONFIG_DIR}" ] && NETDATA_STOCK_CONFIG_DIR="@libconfigdir_POST@"
200
[ -z "${NETDATA_CACHE_DIR}" ] && NETDATA_CACHE_DIR="@cachedir_POST@"
201
[ -z "${NETDATA_REGISTRY_URL}" ] && NETDATA_REGISTRY_URL="https://registry.my-netdata.io"
202
-[ -z "${NETDATA_REGISTRY_CLOUD_BASE_URL}" ] && NETDATA_REGISTRY_CLOUD_BASE_URL="https://app.netdata.cloud"
202
+[ -z "${NETDATA_REGISTRY_CLOUD_BASE_URL}" ] && NETDATA_REGISTRY_CLOUD_BASE_URL="https://api.netdata.cloud"
203
204
# -----------------------------------------------------------------------------
205
# parse command line parameters
libnetdata/libnetdata.h
+1
-1
@@ -449,7 +449,7 @@ extern char *netdata_configured_host_prefix;
449
#include "worker_utilization/worker_utilization.h"
450
451
// BEWARE: Outside of the C code this also exists in alarm-notify.sh
452
-#define DEFAULT_CLOUD_BASE_URL "https://app.netdata.cloud"
452
+#define DEFAULT_CLOUD_BASE_URL "https://api.netdata.cloud"
453
454
#define RRD_STORAGE_TIERS 5
455
packaging/installer/kickstart.sh
+1
-1
@@ -27,7 +27,7 @@ KICKSTART_SOURCE="$(
27
)"
28
PACKAGES_SCRIPT="https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/install-required-packages.sh"
29
PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
30
-PUBLIC_CLOUD_URL="https://app.netdata.cloud"
30
+PUBLIC_CLOUD_URL="https://api.netdata.cloud"
31
REPOCONFIG_URL_PREFIX="https://packagecloud.io/netdata/netdata-repoconfig/packages"
32
REPOCONFIG_VERSION="1-2"
33
START_TIME="$(date +%s)"
packaging/installer/methods/kickstart.md
+1
-1
@@ -107,7 +107,7 @@ To automatically claim nodes after installation:
107
- `--claim-rooms`: Specify a comma-separated list of tokens for each War Room this node should appear in.
108
- `--claim-proxy`: Specify a proxy to use when connecting to the cloud in the form of `http://[user:pass@]host:ip` for an HTTP(S) proxy.
109
See [connecting through a proxy](/claim/README.md#connect-through-a-proxy) for details.
110
-- `--claim-url`: Specify a URL to use when connecting to the cloud. Defaults to `https://app.netdata.cloud`.
110
+- `--claim-url`: Specify a URL to use when connecting to the cloud. Defaults to `https://api.netdata.cloud`.
111
112
For example:
113
packaging/installer/methods/macos.md
+2
-2
@@ -44,11 +44,11 @@ area](https://learn.netdata.cloud/docs/cloud/spaces#manage-spaces).
44
- `--claim-rooms`: Specify a comma-separated list of tokens for each War Room this node should appear in.
45
- `--claim-proxy`: Specify a proxy to use when connecting to the cloud in the form of `http://[user:pass@]host:ip` for an HTTP(S) proxy.
46
See [connecting through a proxy](/claim/README.md#connect-through-a-proxy) for details.
47
-- `--claim-url`: Specify a URL to use when connecting to the cloud. Defaults to `https://app.netdata.cloud`.
47
+- `--claim-url`: Specify a URL to use when connecting to the cloud. Defaults to `https://api.netdata.cloud`.
48
49
For example:
50
```bash
51
-curl https://my-netdata.io/kickstart.sh > /tmp/netdata-kickstart.sh && sh /tmp/netdata-kickstart.sh --install /usr/local/ --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://app.netdata.cloud
51
+curl https://my-netdata.io/kickstart.sh > /tmp/netdata-kickstart.sh && sh /tmp/netdata-kickstart.sh --install /usr/local/ --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://api.netdata.cloud
52
```
53
The Netdata Agent is installed under `/usr/local/netdata` on your machine. Your machine will also show up as a node in your Netdata Cloud.
54
tests/alarm_repetition/netdata.conf_with_repetition
+1
-1
@@ -52,4 +52,4 @@
52
allow from = *
53
54
[cloud]
55
- cloud base url = https://app.netdata.cloud
55
+ cloud base url = https://api.netdata.cloud
tests/alarm_repetition/netdata.conf_without_repetition
+1
-1
@@ -52,4 +52,4 @@
52
allow from = *
53
54
[cloud]
55
- cloud base url = https://app.netdata.cloud
55
+ cloud base url = https://api.netdata.cloud