summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorAustin S. Hemmelgarn <austin@netdata.cloud>2023-01-04 07:34:28 -0500
committerGitHub <noreply@github.com>2023-01-04 07:34:28 -0500
commitdf379e45fbaddf825f1f7972a75ae3f3daf80097 (patch)
treee24c9547792ff227ea0c750d4ae8dbb875c0b91f /packaging
parent7793b9c3bfe75b3649518ec78954a80b3e33bd38 (diff)
Finish renaming the `--install` option to `--install-prefix`. (#13881)
* Finish renaming the `--install` option to `--install-prefix`. * Fix remaining references to `--install` option.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/installer/UNINSTALL.md2
-rw-r--r--packaging/installer/UPDATE.md4
-rwxr-xr-xpackaging/installer/kickstart.sh8
-rw-r--r--packaging/installer/methods/freebsd.md4
-rw-r--r--packaging/installer/methods/kickstart.md1
-rw-r--r--packaging/installer/methods/macos.md4
-rw-r--r--packaging/installer/methods/manual.md2
-rwxr-xr-xpackaging/makeself/jobs/70-netdata-git.install.sh2
8 files changed, 10 insertions, 17 deletions
diff --git a/packaging/installer/UNINSTALL.md b/packaging/installer/UNINSTALL.md
index af2314f657..76608361a4 100644
--- a/packaging/installer/UNINSTALL.md
+++ b/packaging/installer/UNINSTALL.md
@@ -51,7 +51,7 @@ A workflow for uninstallation looks like this:
2. If you cannot find that file and would like to uninstall Netdata, then create a new file with the following content:
```sh
-NETDATA_PREFIX="<installation prefix>" # put what you used as a parameter to shell installed `--install` flag. Otherwise it should be empty
+NETDATA_PREFIX="<installation prefix>" # put what you used as a parameter to shell installed `--install-prefix` flag. Otherwise it should be empty
NETDATA_ADDED_TO_GROUPS="<additional groups>" # Additional groups for a user running the Netdata process
```
diff --git a/packaging/installer/UPDATE.md b/packaging/installer/UPDATE.md
index 009e970f28..170fc0e554 100644
--- a/packaging/installer/UPDATE.md
+++ b/packaging/installer/UPDATE.md
@@ -45,7 +45,7 @@ command:
wget -O /tmp/netdata-kickstart.sh https://my-netdata.io/kickstart.sh && sh /tmp/netdata-kickstart.sh --dry-run
```
-Note that if you installed Netdata using an installation prefix, you will need to add an `--install` option
+Note that if you installed Netdata using an installation prefix, you will need to add an `--install-prefix` option
specifying that prefix to make sure it finds the existing install.
If you see a line starting with `--- Would attempt to update existing installation by running the updater script
@@ -61,7 +61,7 @@ In most cases, you can update netdata using our one-line installation script. T
run the update script that was installed as part of the initial install (even if you disabled automatic updates)
and preserve the existing install options you specified.
-If you installed Netdata using an installation prefix, you will need to add an `--install` option specifying
+If you installed Netdata using an installation prefix, you will need to add an `--install-prefix` option specifying
that prefix to this command to make sure it finds Netdata.
```bash
diff --git a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh
index 8016032676..d671a593d0 100755
--- a/packaging/installer/kickstart.sh
+++ b/packaging/installer/kickstart.sh
@@ -183,7 +183,6 @@ USAGE: kickstart.sh [options]
--reinstall-even-if-unsafe Even try to reinstall if we don't think we can do so safely (implies --reinstall).
--disable-cloud Disable support for Netdata Cloud (default: detect)
--require-cloud Only install if Netdata Cloud can be enabled. Overrides --disable-cloud.
- --install <path> This option is deprecated and will be removed in a future version, use --install-prefix instead.
--install-prefix <path> Specify an installation prefix for local builds (default: autodetect based on system type).
--old-install-prefix <path> Specify an old local builds installation prefix for uninstall/reinstall (if it's not default).
--install-version <version> Specify the version of Netdata to install.
@@ -1046,7 +1045,7 @@ EOF
confirm_install_prefix() {
if [ -n "${INSTALL_PREFIX}" ] && [ "${NETDATA_ONLY_BUILD}" -ne 1 ]; then
- fatal "The --install-prefix and --install options are only supported together with the --build-only option." F0204
+ fatal "The --install-prefix option is only supported together with the --build-only option." F0204
fi
if [ -n "${INSTALL_PREFIX}" ]; then
@@ -2154,11 +2153,6 @@ parse_args() {
NETDATA_DISABLE_TELEMETRY="1"
NETDATA_INSTALLER_OPTIONS="${NETDATA_INSTALLER_OPTIONS} --disable-telemetry"
;;
- "--install")
- warning "--install flag is deprecated and will be removed in a future version. Please use --install-prefix instead."
- INSTALL_PREFIX="${2}"
- shift 1
- ;;
"--install-prefix")
INSTALL_PREFIX="${2}"
shift 1
diff --git a/packaging/installer/methods/freebsd.md b/packaging/installer/methods/freebsd.md
index 3523157bd5..d1e3af2699 100644
--- a/packaging/installer/methods/freebsd.md
+++ b/packaging/installer/methods/freebsd.md
@@ -45,7 +45,7 @@ gunzip netdata*.tar.gz && tar xf netdata*.tar && rm -rf netdata*.tar
Install Netdata in `/opt/netdata`. If you want to enable automatic updates, add `--auto-update` or `-u` to install `netdata-updater` in `cron` (**need root permission**):
```sh
-cd netdata-v* && ./netdata-installer.sh --install /opt && cp /opt/netdata/usr/sbin/netdata-claim.sh /usr/sbin/
+cd netdata-v* && ./netdata-installer.sh --install-prefix /opt && cp /opt/netdata/usr/sbin/netdata-claim.sh /usr/sbin/
```
You also need to enable the `netdata` service in `/etc/rc.conf`:
@@ -75,7 +75,7 @@ The `netdata-updater.sh` script will update your Agent.
## Optional parameters to alter your installation
| parameters | Description |
|:-----:|-----------|
-|`--install <path>`| Install netdata in `<path>.` Ex: `--install /opt` will put netdata in `/opt/netdata`|
+|`--install-prefix <path>`| Install netdata in `<path>.` Ex: `--install-prefix /opt` will put netdata in `/opt/netdata`|
| `--dont-start-it` | Do not (re)start netdata after installation|
| `--dont-wait` | Run installation in non-interactive mode|
| `--auto-update` or `-u` | Install netdata-updater in cron to update netdata automatically once per day|
diff --git a/packaging/installer/methods/kickstart.md b/packaging/installer/methods/kickstart.md
index 2555e4a830..85da480d27 100644
--- a/packaging/installer/methods/kickstart.md
+++ b/packaging/installer/methods/kickstart.md
@@ -68,7 +68,6 @@ The `kickstart.sh` script accepts a number of optional parameters to control how
- `--disable-cloud`: For local builds, don’t build any of the cloud code at all. For native packages and static builds,
use runtime configuration to disable cloud support.
- `--require-cloud`: Only install if Netdata Cloud can be enabled. Overrides `--disable-cloud`.
-- `--install`: Specify an installation prefix for local builds (by default, we use a sane prefix based on the type of system), this option is deprecated and will be removed in a future version, please use `--install-prefix` instead.
- `--install-prefix`: Specify an installation prefix for local builds (by default, we use a sane prefix based on the type of system).
- `--install-version`: Specify the version of Netdata to install.
- `--old-install-prefix`: Specify the custom local build's installation prefix that should be removed.
diff --git a/packaging/installer/methods/macos.md b/packaging/installer/methods/macos.md
index a1b5f60ce5..70d39909c7 100644
--- a/packaging/installer/methods/macos.md
+++ b/packaging/installer/methods/macos.md
@@ -48,7 +48,7 @@ area](https://learn.netdata.cloud/docs/cloud/spaces#manage-spaces).
For example:
```bash
-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
+curl https://my-netdata.io/kickstart.sh > /tmp/netdata-kickstart.sh && sh /tmp/netdata-kickstart.sh --install-prefix /usr/local/ --claim-token TOKEN --claim-rooms ROOM1,ROOM2 --claim-url https://api.netdata.cloud
```
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.
@@ -93,7 +93,7 @@ We don't recommend installing Netdata from source on macOS, as it can be difficu
```bash
cd netdata/
- sudo ./netdata-installer.sh --install /usr/local
+ sudo ./netdata-installer.sh --install-prefix /usr/local
```
> Your Netdata configuration directory will be at `/usr/local/netdata/`.
diff --git a/packaging/installer/methods/manual.md b/packaging/installer/methods/manual.md
index d320753949..c640dddf94 100644
--- a/packaging/installer/methods/manual.md
+++ b/packaging/installer/methods/manual.md
@@ -189,7 +189,7 @@ cd netdata
- You can also append `--stable-channel` to fetch and install only the official releases from GitHub, instead of the nightly builds.
-- If you don't want to install it on the default directories, you can run the installer like this: `./netdata-installer.sh --install /opt`. This one will install Netdata in `/opt/netdata`.
+- If you don't want to install it on the default directories, you can run the installer like this: `./netdata-installer.sh --install-prefix /opt`. This one will install Netdata in `/opt/netdata`.
- If your server does not have access to the internet and you have manually put the installation directory on your server, you will need to pass the option `--disable-go` to the installer. The option will prevent the installer from attempting to download and install `go.d.plugin`.
diff --git a/packaging/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh
index ea6902a44a..2c4fb3007b 100755
--- a/packaging/makeself/jobs/70-netdata-git.install.sh
+++ b/packaging/makeself/jobs/70-netdata-git.install.sh
@@ -27,7 +27,7 @@ export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig"
export CMAKE_FLAGS="-DOPENSSL_ROOT_DIR=/openssl-static -DOPENSSL_LIBRARIES=/openssl-static/lib -DCMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE=/openssl-static -DLWS_OPENSSL_INCLUDE_DIRS=/openssl-static/include -DLWS_OPENSSL_LIBRARIES=/openssl-static/lib/libssl.a;/openssl-static/lib/libcrypto.a"
run ./netdata-installer.sh \
- --install "${NETDATA_INSTALL_PARENT}" \
+ --install-prefix "${NETDATA_INSTALL_PARENT}" \
--dont-wait \
--dont-start-it \
--require-cloud \