netdata/packaging: Expect .tar.gz version of go.d plugin (#6590)
* netdata/packaging: Expect .tar.gz version of go.d plugin, after go.d PR248 * netdata/packaging: Checksum comes on the tarball * netdata/packaging: dont mv the file after extraction, just directly extract to destination, its cleaner. Also, make sure you remove the tmp folder * netdata/packaging: bump go.d to v0.8.0 * netdata/packaging: actually fix * netdata/packaging: change the way we extract it, wasnt right after all * netdata/packaging: update go.d checksums
Paul Emm. Katsoulakis committed
Aug 8, 2019 at 00:24 UTC
66d6498ed4fa433fdd397da5ef1470312e539bd6
4 files changed
+32
-25
contrib/debian/install_go.sh
+6
-3
@@ -36,7 +36,7 @@ download_go() {
36
37
install_go() {
38
# When updating this value, ensure correct checksums in packaging/go.d.checksums
39
- GO_PACKAGE_VERSION="v0.7.0"
39
+ GO_PACKAGE_VERSION="v0.8.0"
40
ARCH_MAP=(
41
'i386::386'
42
'i686::386'
@@ -62,7 +62,7 @@ install_go() {
62
fi
63
done
64
tmp=$(mktemp -d /tmp/netdata-go-XXXXXX)
65
- GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}"
65
+ GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}.tar.gz"
66
download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/${GO_PACKAGE_BASENAME}" "${tmp}/${GO_PACKAGE_BASENAME}"
67
download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/config.tar.gz" "${tmp}/config.tar.gz"
68
@@ -88,7 +88,10 @@ install_go() {
88
89
# Install files
90
tar -xf "${tmp}/config.tar.gz" -C "${LIB_DIR}/conf.d/"
91
- mv "${tmp}/$GO_PACKAGE_BASENAME" "${LIBEXEC_DIR}/plugins.d/go.d.plugin"
91
+ tar xf "${tmp}/${GO_PACKAGE_BASENAME}"
92
+ mv "${GO_PACKAGE_BASENAME/\.tar\.gz/}" "${LIBEXEC_DIR}/plugins.d/go.d.plugin"
93
+
94
+ rm -rf "${tmp}"
95
fi
96
return 0
97
}
netdata-installer.sh
+5
-3
@@ -774,7 +774,7 @@ fi
774
775
install_go() {
776
# When updating this value, ensure correct checksums in packaging/go.d.checksums
777
- GO_PACKAGE_VERSION="v0.7.0"
777
+ GO_PACKAGE_VERSION="v0.8.0"
778
ARCH_MAP=(
779
'i386::386'
780
'i686::386'
@@ -800,7 +800,7 @@ install_go() {
800
fi
801
done
802
tmp=$(mktemp -d /tmp/netdata-go-XXXXXX)
803
- GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}"
803
+ GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}.tar.gz"
804
805
download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/${GO_PACKAGE_BASENAME}" "${tmp}/${GO_PACKAGE_BASENAME}"
806
@@ -833,11 +833,13 @@ install_go() {
833
run tar -xf "${tmp}/config.tar.gz" -C "${NETDATA_STOCK_CONFIG_DIR}/"
834
run chown -R "${ROOT_USER}:${NETDATA_GROUP}" "${NETDATA_STOCK_CONFIG_DIR}"
835
836
- run mv "${tmp}/$GO_PACKAGE_BASENAME" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
836
+ run tar xf "${tmp}/${GO_PACKAGE_BASENAME}"
837
+ run mv "${GO_PACKAGE_BASENAME/\.tar\.gz/}" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
838
if [ "${UID}" -eq 0 ]; then
839
run chown "root:${NETDATA_GROUP}" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
840
fi
841
run chmod 0750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
842
+ rm -rf "${tmp}"
843
fi
844
return 0
845
}
netdata.spec.in
+5
-3
@@ -322,7 +322,7 @@ download_go() {
322
323
install_go() {
324
# When updating this value, ensure correct checksums in packaging/go.d.checksums
325
- GO_PACKAGE_VERSION="v0.7.0"
325
+ GO_PACKAGE_VERSION="v0.8.0"
326
ARCH_MAP=(
327
'i386::386'
328
'i686::386'
@@ -348,7 +348,7 @@ install_go() {
348
fi
349
done
350
tmp=$(mktemp -d /tmp/netdata-go-XXXXXX)
351
- GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}"
351
+ GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}.tar.gz"
352
download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/${GO_PACKAGE_BASENAME}" "${tmp}/${GO_PACKAGE_BASENAME}"
353
download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/config.tar.gz" "${tmp}/config.tar.gz"
354
@@ -374,7 +374,9 @@ install_go() {
374
375
# Install files
376
tar -xf "${tmp}/config.tar.gz" -C "${RPM_BUILD_ROOT}%{_libdir}/%{name}/conf.d/"
377
- mv "${tmp}/$GO_PACKAGE_BASENAME" "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/go.d.plugin"
377
+ tar xf "${tmp}/${GO_PACKAGE_BASENAME}"
378
+ mv "${GO_PACKAGE_BASENAME/\.tar\.gz/}" "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/go.d.plugin"
379
+ rm -rf "${tmp}"
380
fi
381
return 0
382
}
packaging/go.d.checksums
+16
-16
@@ -1,16 +1,16 @@
1
-133e138307a52a1c3af5abeec4d368c7bcb27f3398f0f380cfacc23db57b9911 *config.tar.gz
2
-7795ff9058852e9e03ceecd432e5c462ef141b3dd2e1f8e7c3cb13a6c4b685ce *go.d.plugin-v0.7.0.darwin-386
3
-a8db5312e803376bd96ab3c4cfd6f2d8288795fde97a2aefca7916cd8743f2a4 *go.d.plugin-v0.7.0.darwin-amd64
4
-a130a6aa7a98d37b648d41f8c3f0b939bfb8f343d1a3a6c8267a7fe604aae96f *go.d.plugin-v0.7.0.freebsd-386
5
-078c8a9607aea92ee8346cb2567a73b2a2ac317ea72c6975de07b47fdba2de80 *go.d.plugin-v0.7.0.freebsd-amd64
6
-bf7bff1f6fa32055242b627534ec5936fa1b8eb2f42edc736bbe041bee11129e *go.d.plugin-v0.7.0.freebsd-arm
7
-2e15dc67736b29cf736ad7a05271f462467f84e80073fd1a7084dd5e2ac83115 *go.d.plugin-v0.7.0.linux-386
8
-3b0b5b0faa319201ecac554cb300789546b7f51847d202ff913e29339acca48b *go.d.plugin-v0.7.0.linux-amd64
9
-1be3860bea67e2ac789a37bf4dae24f8925f93bebe72a57cc2218c9e9a702f19 *go.d.plugin-v0.7.0.linux-arm
10
-cba7cbfeda2e5146c8229d455aaf61f29f196d24291a509f4bf36ae12a2729e7 *go.d.plugin-v0.7.0.linux-arm64
11
-5f263cd5a032149618483a50486ce69c6e1a32b7e568c498d42b4d94691167f5 *go.d.plugin-v0.7.0.linux-mips
12
-9558e7aa633331afea78c682a15fc9e6cf10ed39fb4c26f03034a7b0cbdfcc1a *go.d.plugin-v0.7.0.linux-mips64
13
-0f93f4cac9b21cdb28ef88b9f1ba42afcc1e913c0227deb266440c205ff9a224 *go.d.plugin-v0.7.0.linux-mips64le
14
-51c0763f07de48e9f9dd9625a647aacecdd4a1bd39f13298b4f7c123436f4327 *go.d.plugin-v0.7.0.linux-mipsle
15
-7e7e53fff1852c9756d6117d35d1f061a8bd97135b231b010ad1461e789b1f66 *go.d.plugin-v0.7.0.linux-ppc64
16
-6d4203f9c4d5778add09ef2679dc025a72914b68dce5fb816e7cc38f4f36945f *go.d.plugin-v0.7.0.linux-ppc64le
1
+bd5e9f2e2677413eeb1390c750fcafa83875dbe6890de4d501db98d06640a0fe *config.tar.gz
2
+941e6319798a5eea2ddabb3c9b40e06830e2aee5758708c182c4072de720be4e *go.d.plugin-v0.8.0.darwin-386.tar.gz
3
+96b0d2c39854c3d4a3636b68a98f7d8d1b05754599499c456c2af0a6c477cea8 *go.d.plugin-v0.8.0.darwin-amd64.tar.gz
4
+351051a43e5d4059ffb8f91e95a64310f3342420bd058bf120ae84c900ef75c9 *go.d.plugin-v0.8.0.freebsd-386.tar.gz
5
+5b30abb8373956e3330202259cef7b0058a284f21367e573542901b8d1572a36 *go.d.plugin-v0.8.0.freebsd-amd64.tar.gz
6
+ba90aeae716f66bb6cd4306134e8151de749fd2259b9fc99d57e4b41fc36c6ef *go.d.plugin-v0.8.0.freebsd-arm.tar.gz
7
+9fcf0a2e4592eda0b6e7c8e4045ba2995239e41d910ef1ad9e48621e1ac2c98a *go.d.plugin-v0.8.0.linux-386.tar.gz
8
+f92efd1895fb54289c651955ad45627ad3c8a6c725915ac84c0223726a7fe153 *go.d.plugin-v0.8.0.linux-amd64.tar.gz
9
+60bb3636db91ba7b188d73fc7eeb97bbfab7a77b3eb8a91c456a173ef5982729 *go.d.plugin-v0.8.0.linux-arm.tar.gz
10
+062049e378349c98a2f629dc33bb44117e2f7dc60aa47a9d83660193850990bd *go.d.plugin-v0.8.0.linux-arm64.tar.gz
11
+ef57c14d3ca9ec7dca1b60d4d3bfb5cf04399139b1073f9713bb0536fadf9276 *go.d.plugin-v0.8.0.linux-mips.tar.gz
12
+735c4b3cfff31f1ffdf60ff35cc617914641e22406e70c92a884270f77c9001e *go.d.plugin-v0.8.0.linux-mips64.tar.gz
13
+3cafad1d94f7001d0c9aff9d60a384fb477210af2967cc7145572b635e180a7a *go.d.plugin-v0.8.0.linux-mips64le.tar.gz
14
+f1099a482bedcb92e3ac8857a06adbc55d9e612838cbc79d3c04b616af1d1ca3 *go.d.plugin-v0.8.0.linux-mipsle.tar.gz
15
+978f31c64215193b228c3ee9fc7c3fdf324ca4b543207fbe8e459730ae6409b2 *go.d.plugin-v0.8.0.linux-ppc64.tar.gz
16
+b5566fc280e4b9e7b07c3ae1f1296f232530c29eb2635398b7124c2caf14e53a *go.d.plugin-v0.8.0.linux-ppc64le.tar.gz