Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from netdata:master #260

Merged
merged 3 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions packaging/installer/netdata-updater.sh
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,10 @@ else:
commit_date="$(python3 -c "${python_version_check}" < "${commit_check_file}")"
fi

if [ -z "${NETDATA_TMPDIR_PATH}" ]; then
rm -rf "${ndtmpdir}" >&3 2>&3
fi

if [ -z "${commit_date}" ] ; then
return 0
elif [ "$(uname)" = "Linux" ]; then
Expand Down Expand Up @@ -582,11 +586,13 @@ self_update() {
if _safe_download "https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/netdata-updater.sh" ./netdata-updater.sh; then
chmod +x ./netdata-updater.sh || exit 1
export ENVIRONMENT_FILE="${ENVIRONMENT_FILE}"
force_update=""
[ "$NETDATA_FORCE_UPDATE" = "1" ] && force_update="--force-update"
interactive=""
[ "$INTERACTIVE" = "0" ] && interactive="--non-interactive"
exec ./netdata-updater.sh --not-running-from-cron --no-updater-self-update "$force_update" "$interactive" --tmpdir-path "$(pwd)"

cmd="./netdata-updater.sh --not-running-from-cron --no-updater-self-update"
[ "$NETDATA_FORCE_UPDATE" = "1" ] && cmd="$cmd --force-update"
[ "$INTERACTIVE" = "0" ] && cmd="$cmd --non-interactive"
cmd="$cmd --tmpdir-path $(pwd)"

exec $cmd
else
error "Failed to download newest version of updater script, continuing with current version."
fi
Expand Down
1 change: 0 additions & 1 deletion src/go/plugin/go.d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ All capabilities are set automatically during Netdata installation using the [of
| [web_log](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/weblog) | Apache/NGINX |
| [wireguard](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/wireguard) | WireGuard |
| [whoisquery](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/whoisquery) | Domain Expiry |
| [windows](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/windows) | Windows |
| [x509check](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/x509check) | Digital Certificates |
| [zfspool](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/zfspool) | ZFS Pools |
| [zookeeper](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/zookeeper) | ZooKeeper |
Expand Down
1 change: 0 additions & 1 deletion src/go/plugin/go.d/collector/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ import (
_ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/w1sensor"
_ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/weblog"
_ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/whoisquery"
_ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/windows"
_ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/wireguard"
_ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/x509check"
_ "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/zfspool"
Expand Down
837 changes: 0 additions & 837 deletions src/go/plugin/go.d/collector/windows/README.md

This file was deleted.

Loading
Loading