Updated to v1.10.0

4 files changed, 59 insertions, 64 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 06524ba21e16..5f45e78de79a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,66 @@
-# Maintainer: Nicolas Leclercq <nicolas.private@gmail.com>
-# Maintainer: Adam S Levy <adam@aslevy.com>
+# Maintainer: "Amhairghin" Oscar Garcia Amor (https://ogarcia.me)
+# Contributor: Nicolas Leclercq <nicolas.private@gmail.com>
+# Contributor: Adam S Levy <adam@aslevy.com>
+
 
 pkgname='telegraf'
-pkgver='1.9.0'
+pkgver='1.10.0'
 pkgrel='1'
-pkgdesc='Server-level metric gathering agent for InfluxDB'
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-url='https://github.com/InfluxData/telegraf'
+pkgdesc='Plugin-driven server agent for reporting metrics into InfluxDB'
+arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
+url='http://influxdb.org/'
 license=('MIT')
 makedepends=('go' 'git')
-provides=('telegraf')
 backup=('etc/telegraf/telegraf.conf')
-install="telegraf.install"
-options=('emptydirs')
-source=("git+https://github.com/influxdata/telegraf#tag=$pkgver"
-        'telegraf.sysusers'
-        'telegraf.tmpfiles')
-sha256sums=('SKIP'
-            '31c038721ff674519a506418b0d70045e2c51115a78a5939743886c44ef5e1bb'
-            '36b309e79422ddbaf6067f814c8bd69bd842cc662c3c9dbbf507ee5716282779')
-
-build()
-{
-  export GOPATH="$srcdir"
-  export GOBIN="$GOPATH/bin"
-  export PATH="$GOBIN:$PATH"
-  mkdir -p "$GOPATH/src/github.com/influxdata"
-  cp -af "$srcdir/telegraf" "$GOPATH/src/github.com/influxdata/"
-
-  cd "$GOPATH/src/github.com/influxdata/telegraf"
-
-  echo "Downloading dependencies"
+install="${pkgname}.install"
+source=("https://github.com/influxdata/${pkgname}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        "${pkgname}.install"
+        "${pkgname}.service"
+        "${pkgname}.sysusers"
+        "${pkgname}.tmpfiles")
+sha256sums=('83eedb62c771ef3854f79fcd6fbb7ecb4ddabf7b1aa45bcc11e9c6a1f1553ac6'
+            'b8494d35b868a256eace5f7baa7caa9d8561ee506aded3c47bd6b2ee031b0745'
+            'ef54a27c036f11c44f32a42c81787dd0253f84e77170c2e8f9e268aca8773c33'
+            'acf95397a51077b7684e8e4f4db7266c42cf82f24bc969ef2bc112a0f914f4cd'
+            '95284d1e92f812c4c301cd1f35692850ae127397e33b910a5af7f54bbeb8986e')
+
+prepare() {
+  export GOPATH="${srcdir}/gopath"
+  export GOBIN="${GOPATH}/bin"
+  export GOFLAGS="-gcflags=all=-trimpath=${PWD} -asmflags=all=-trimpath=${PWD} -ldflags=-extldflags=-zrelro -ldflags=-extldflags=-znow"
+  export TELEGRAFPATH="${GOPATH}/src/github.com/influxdata/${pkgname}"
+  mkdir -p ${TELEGRAFPATH%/*}
+  ln -fsT ${srcdir}/${pkgname}-${pkgver} \
+    ${GOPATH}/src/github.com/influxdata/${pkgname}
+  cd ${TELEGRAFPATH}
   go get -v -u github.com/golang/dep/cmd/dep
-  dep ensure -v -vendor-only
+  ${GOBIN}/dep ensure -v -vendor-only
+}
 
-  revision=`git rev-parse HEAD`
-  version=`git describe --tags`
-  echo "Building ${pkgname} version=$version commit=$revision branch=master"
-  _LDFLAGS="-X main.version=$version -X main.commit=$revision -X main.branch=master"
-  go install -ldflags="$_LDFLAGS" ./...
+build() {
+  cd ${TELEGRAFPATH}
+  go install -ldflags="-X main.version=${pkgver}" ./...
 }
 
-package()
-{
-  cd "$srcdir"
-  install -Dm644 telegraf.sysusers "$pkgdir/usr/lib/sysusers.d/telegraf.conf"
-  install -Dm644 telegraf.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/telegraf.conf"
+package() {
+  # binary
+  install -D -m755 "${GOBIN}/telegraf" "${pkgdir}/usr/bin/telegraf"
+
+  # configuration files
+  install -dD -m755 "${pkgdir}/etc/telegraf/telegraf.d"
+  ${GOBIN}/telegraf -sample-config > "${pkgdir}/etc/telegraf/telegraf.conf"
+
+  # license
+  install -Dm644 "${TELEGRAFPATH}/LICENSE" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  cd "$GOBIN"
-  install -Dsm755 telegraf "$pkgdir/usr/bin/telegraf"
+  # service
+  install -D -m644 "${srcdir}/${pkgname}.service" \
+    "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 
-  cd "$GOPATH/src/github.com/influxdata/telegraf"
-  install -d "$pkgdir/etc/telegraf/telegraf.d/"
-  install -Dm644 scripts/telegraf.service "$pkgdir/usr/lib/systemd/system/telegraf.service"
-  install -Dm644 etc/telegraf.conf        "$pkgdir/etc/telegraf/telegraf.conf"
-  install -Dm644 LICENSE                  "$pkgdir/usr/share/licenses/telegraf/LICENSE"
+  # systemd user and home directory
+  install -D -m644 "${srcdir}/${pkgname}.sysusers" \
+    "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -D -m644 "${srcdir}/${pkgname}.tmpfiles" \
+    "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }
diff --git a/telegraf.install b/telegraf.install
index 0072686eb57c..893c28368f5c 100644
--- a/telegraf.install
+++ b/telegraf.install
@@ -1,15 +1,5 @@
-#/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  systemd-sysusers /usr/lib/sysusers.d/telegraf.conf
-  systemd-tmpfiles --create /usr/lib/tmpfiles.d/telegraf.conf
-  systemctl daemon-reload
+post_remove() {
+  echo "Remember that the following directories aren't removed."
+  echo "  -> /etc/telegraf"
+  echo "  -> /var/lib/telegraf"
 }
-
-post_upgrade() {
-  systemctl daemon-reload
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/telegraf.sysusers b/telegraf.sysusers
index 98300a78c42d..73daa378c03c 100644
--- a/telegraf.sysusers
+++ b/telegraf.sysusers
@@ -1 +1 @@
-u telegraf - - /etc/telegraf
+u telegraf - - /var/lib/telegraf
diff --git a/telegraf.tmpfiles b/telegraf.tmpfiles
index 293eafb9749a..39fc35256abd 100644
--- a/telegraf.tmpfiles
+++ b/telegraf.tmpfiles
@@ -1,4 +1 @@
-d /var/lib/telegraf   0755 telegraf telegraf
-d /etc/telegraf       0755 telegraf telegraf
-x /var/lib/telegraf/*
-x /etc/telegraf/*
+d /var/lib/telegraf 0755 telegraf telegraf