diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | telegraf.install | 3 | ||||
| -rw-r--r-- | telegraf.service | 7 | ||||
| -rw-r--r-- | telegraf.sysusers | 1 | ||||
| -rw-r--r-- | telegraf.tmpfiles | 1 |
7 files changed, 23 insertions, 34 deletions
@@ -1,6 +1,6 @@ pkgbase = telegraf pkgdesc = Plugin-driven server agent for reporting metrics into InfluxDB - pkgver = 1.16.1 + pkgver = 1.30.1 pkgrel = 1 url = http://influxdb.org/ install = telegraf.install @@ -12,17 +12,14 @@ pkgbase = telegraf license = MIT makedepends = go makedepends = git + depends = glibc + options = !lto backup = etc/telegraf/telegraf.conf - source = https://github.com/influxdata/telegraf/archive/v1.16.1/telegraf-v1.16.1.tar.gz + source = https://github.com/influxdata/telegraf/archive/v1.30.1/telegraf-v1.30.1.tar.gz source = telegraf.install source = telegraf.service - source = telegraf.sysusers - source = telegraf.tmpfiles - sha256sums = 8da2df0c05032f43a3bed06e333304d81871501737f248da932b92c23fd61ee6 - sha256sums = b8494d35b868a256eace5f7baa7caa9d8561ee506aded3c47bd6b2ee031b0745 - sha256sums = ef54a27c036f11c44f32a42c81787dd0253f84e77170c2e8f9e268aca8773c33 - sha256sums = acf95397a51077b7684e8e4f4db7266c42cf82f24bc969ef2bc112a0f914f4cd - sha256sums = 95284d1e92f812c4c301cd1f35692850ae127397e33b910a5af7f54bbeb8986e + b2sums = 90701b2b09cd924288ef6593faa79a0ec099ead05211852cc8b617b35c3b319a403a0a1517ed3d09639b146b07abcc73a2fd3dba4045cfb5ce768ae06bec1b81 + b2sums = a6b2fd7a688ef5a23539c1256380a6389e6fa474312ad9dee5cc77bcfabe92910a8913ffcf599c940a93bb3a5c89e01f3bedad4176f4d57dd33a68e0499c30bd + b2sums = d5a6845cb1ddb07f0cac20215c15d059f0c18aa43a7b549e7e738e58b8686b4db26b71426aafc8e682d6fd6f676fc0f468f53ea61968c4184feaaa22a23f5bc5 pkgname = telegraf - diff --git a/.gitignore b/.gitignore index 8e1aac5bdb95..c9d85b65ffab 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ !.SRCINFO !telegraf.install !telegraf.service -!telegraf.sysusers -!telegraf.tmpfiles @@ -2,27 +2,24 @@ # Contributor: Nicolas Leclercq <nicolas.private@gmail.com> # Contributor: Adam S Levy <adam@aslevy.com> - pkgname=telegraf -pkgver=1.16.1 +pkgver=1.30.1 pkgrel=1 pkgdesc='Plugin-driven server agent for reporting metrics into InfluxDB' arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') url='http://influxdb.org/' license=('MIT') +depends=('glibc') makedepends=('go' 'git') +options=('!lto') backup=('etc/telegraf/telegraf.conf') install="${pkgname}.install" source=("https://github.com/influxdata/${pkgname}/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz" "${pkgname}.install" - "${pkgname}.service" - "${pkgname}.sysusers" - "${pkgname}.tmpfiles") -sha256sums=('8da2df0c05032f43a3bed06e333304d81871501737f248da932b92c23fd61ee6' - 'b8494d35b868a256eace5f7baa7caa9d8561ee506aded3c47bd6b2ee031b0745' - 'ef54a27c036f11c44f32a42c81787dd0253f84e77170c2e8f9e268aca8773c33' - 'acf95397a51077b7684e8e4f4db7266c42cf82f24bc969ef2bc112a0f914f4cd' - '95284d1e92f812c4c301cd1f35692850ae127397e33b910a5af7f54bbeb8986e') + "${pkgname}.service") +b2sums=('90701b2b09cd924288ef6593faa79a0ec099ead05211852cc8b617b35c3b319a403a0a1517ed3d09639b146b07abcc73a2fd3dba4045cfb5ce768ae06bec1b81' + 'a6b2fd7a688ef5a23539c1256380a6389e6fa474312ad9dee5cc77bcfabe92910a8913ffcf599c940a93bb3a5c89e01f3bedad4176f4d57dd33a68e0499c30bd' + 'd5a6845cb1ddb07f0cac20215c15d059f0c18aa43a7b549e7e738e58b8686b4db26b71426aafc8e682d6fd6f676fc0f468f53ea61968c4184feaaa22a23f5bc5') prepare() { cd "${pkgname}-${pkgver}" @@ -34,8 +31,9 @@ build() { export CGO_CPPFLAGS="${CPPFLAGS}" export CGO_CFLAGS="${CFLAGS}" export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" - _LDFLAGS="-X main.version=${pkgver} -X main.branch=tag-${pkgver} -X main.commit=tag-${pkgver} -extldflags ${LDFLAGS}" + _LDFLAGS="-X main.goos=$(go env GOOS) -X main.goarch=$(go env GOARCH) -X main.version=${pkgver} -X main.branch=tag-${pkgver} -X main.commit=tag-${pkgver}" go build -o build -ldflags="${_LDFLAGS}" "./cmd/telegraf" } @@ -56,10 +54,4 @@ package() { # service install -D -m644 "${srcdir}/${pkgname}.service" \ "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" - - # 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 893c28368f5c..d6a3bb329258 100644 --- a/telegraf.install +++ b/telegraf.install @@ -1,5 +1,4 @@ post_remove() { - echo "Remember that the following directories aren't removed." + echo "Remember that the following directory isn't removed." echo " -> /etc/telegraf" - echo " -> /var/lib/telegraf" } diff --git a/telegraf.service b/telegraf.service index 4f874c021462..fdf6c40449bf 100644 --- a/telegraf.service +++ b/telegraf.service @@ -3,12 +3,17 @@ Description=Plugin-driven server agent for reporting metrics into InfluxDB After=network.target [Service] +Type=notify User=telegraf Group=telegraf +DynamicUser=yes ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ExecReload=/bin/kill -HUP $MAINPID -KillMode=control-group Restart=on-failure +RestartForceExitStatus=SIGPIPE +KillMode=mixed +TimeoutStopSec=5 +LimitMEMLOCK=8M:8M [Install] WantedBy=multi-user.target diff --git a/telegraf.sysusers b/telegraf.sysusers deleted file mode 100644 index 73daa378c03c..000000000000 --- a/telegraf.sysusers +++ /dev/null @@ -1 +0,0 @@ -u telegraf - - /var/lib/telegraf diff --git a/telegraf.tmpfiles b/telegraf.tmpfiles deleted file mode 100644 index 39fc35256abd..000000000000 --- a/telegraf.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/lib/telegraf 0755 telegraf telegraf |