[arch-commits] Commit in beats/repos/community-x86_64 (19 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Mon Oct 7 10:49:16 UTC 2019
Date: Monday, October 7, 2019 @ 10:49:15
Author: mtorromeo
Revision: 513708
archrelease: copy trunk to community-x86_64
Added:
beats/repos/community-x86_64/PKGBUILD
(from rev 513707, beats/trunk/PKGBUILD)
beats/repos/community-x86_64/auditbeat.install
(from rev 513707, beats/trunk/auditbeat.install)
beats/repos/community-x86_64/auditbeat.service
(from rev 513707, beats/trunk/auditbeat.service)
beats/repos/community-x86_64/filebeat.service
(from rev 513707, beats/trunk/filebeat.service)
beats/repos/community-x86_64/heartbeat.service
(from rev 513707, beats/trunk/heartbeat.service)
beats/repos/community-x86_64/journalbeat.service
(from rev 513707, beats/trunk/journalbeat.service)
beats/repos/community-x86_64/magefile_text_file_busy.patch
(from rev 513707, beats/trunk/magefile_text_file_busy.patch)
beats/repos/community-x86_64/metricbeat.service
(from rev 513707, beats/trunk/metricbeat.service)
beats/repos/community-x86_64/packetbeat.service
(from rev 513707, beats/trunk/packetbeat.service)
beats/repos/community-x86_64/tmpfile.conf
(from rev 513707, beats/trunk/tmpfile.conf)
Deleted:
beats/repos/community-x86_64/PKGBUILD
beats/repos/community-x86_64/auditbeat.install
beats/repos/community-x86_64/auditbeat.service
beats/repos/community-x86_64/filebeat.service
beats/repos/community-x86_64/heartbeat.service
beats/repos/community-x86_64/journalbeat.service
beats/repos/community-x86_64/metricbeat.service
beats/repos/community-x86_64/packetbeat.service
beats/repos/community-x86_64/tmpfile.conf
-------------------------------+
PKGBUILD | 329 ++++++++++++++++++----------------------
auditbeat.install | 12 -
auditbeat.service | 27 +--
filebeat.service | 26 +--
heartbeat.service | 27 +--
journalbeat.service | 28 +--
magefile_text_file_busy.patch | 11 +
metricbeat.service | 27 +--
packetbeat.service | 22 +-
tmpfile.conf | 4
10 files changed, 265 insertions(+), 248 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-07 10:48:54 UTC (rev 513707)
+++ PKGBUILD 2019-10-07 10:49:15 UTC (rev 513708)
@@ -1,173 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Tyler Langlois <ty |at| tjll |dot| net>
-
-pkgbase=beats
-pkgname=(filebeat packetbeat metricbeat heartbeat-elastic auditbeat journalbeat)
-pkgver=7.3.2
-pkgrel=1
-pkgdesc='Data shippers for Elasticsearch'
-arch=('x86_64')
-url='https://www.elastic.co/products/beats'
-license=('Apache')
-depends=('glibc')
-makedepends=('go-pie' 'git' 'libpcap' 'rsync' 'python2-virtualenv' 'audit')
-optdepends=('elasticsearch: for standalone installation'
- 'python: for migration script')
-source=("https://github.com/elastic/beats/archive/v$pkgver/beats-$pkgver.tar.gz"
- "filebeat.service"
- "packetbeat.service"
- "metricbeat.service"
- "heartbeat.service"
- "auditbeat.service"
- "journalbeat.service"
- "tmpfile.conf")
-sha256sums=('513d0056f4de63f33052792ba690677844c8930104cb55236a421ca879db242e'
- '66d9061841e8b406135383e45d6db9ce6261b2bb08aa28224e3ed689e6e0efec'
- '9f4e33fc768d3500fa3428dcbfda241c6473a2cae8cc4dbadf8f61ca9f2bbec5'
- '26b123acd96808162a7f827ce6f0e9669140c2665fc28d76583a15996fbf853d'
- '212cb4ab5a02d7078025f7d1f50f48e5caa25debce0852cf68cd8f89ed0a8d09'
- 'b7f1c61950f21c7fab31166c68d4a9e5027f0c5bcc40a97913d6d89eaf643b85'
- '57d2f5bf75b4b5214065ba408c98ec941fb0042f19a623add7f4396d640225ba'
- 'f29361772f23ec42bb15b5e0ca7e93f17fe00d31cf08a9e2c0d0ab27f2277bbc')
-
-prepare() {
- mkdir -p "$srcdir/bin"
- ln -s /usr/bin/python2 "$srcdir/bin/python"
- ln -s /usr/bin/pip2 "$srcdir/bin/pip"
- ln -s /usr/bin/virtualenv2 "$srcdir/bin/virtualenv"
-
- export GOPATH="$srcdir"/gopath
- mkdir -p "$GOPATH"
- go get golang.org/x/sys/cpu
-
- cd "$srcdir"/beats-$pkgver
-
- # Avoid installing extraneous configs
- sed '/[- ]win/d ; /[- ]darwin/d ; /[- ]binary/d' -i */Makefile
-
- # Install the Linux config as default
- sed -r 's#/([a-z]+)-linux.yml#/\1.yml#' -i */Makefile
-
- # Perform some timestomping to avoid make warnings
- LANG=C _t="$(date -r Makefile +'%Y-%m-%d %k:%M:%S')"
- touch -m -d "$_t" */Makefile
-
- # Use version instead of commit id
- sed -ri "s/^COMMIT_ID=.*/COMMIT_ID=$pkgver/" libbeat/scripts/Makefile
-
- # Workaround to place extracted release into GOPATH
- mkdir -p "$GOPATH"/src/github.com/elastic
- ln -sf ../../../../beats-$pkgver "$GOPATH"/src/github.com/elastic/beats
-}
-
-build() {
- export GOPATH="$srcdir"/gopath
- export PATH="$GOPATH/bin:$srcdir/bin:$PATH"
-
- cd "$GOPATH"/src/github.com/elastic/beats
- git init # git root required by one of the build scripts
-
- cd libbeat
- make update
-
- for beat in ${pkgname[@]}; do
- beat="${beat%-elastic}"
- msg2 "Building $beat..."
- cd ../$beat
- make $beat
-
- if grep -Eq '^kibana:' Makefile; then
- make kibana
- fi
-
- if [ "$beat" = "auditbeat" ]; then
- make fields
- else
- make update
- fi
-
- if grep -Eq '^kibana:' Makefile; then
- mv _meta/kibana{.generated,}
- fi
- done
-}
-
-_do_package_beat() {
- _pkgname="${pkgname%-elastic}"
-
- backup=(etc/$_pkgname/$_pkgname.yml)
-
- install -dm755 "$pkgdir"/{etc,usr/share,usr/share/licenses,var/lib}/$_pkgname
- install -dm755 "$pkgdir"/usr/lib/tmpfiles.d
-
- cd "$srcdir"/beats-$pkgver
- install -Dm644 NOTICE.txt "$pkgdir"/usr/share/licenses/$pkgname/NOTICE.txt
-
- cd $_pkgname
-
- cp $_pkgname.{yml,reference.yml} "$pkgdir"/etc/$_pkgname
- install -Dm644 fields.yml "$pkgdir"/etc/$_pkgname/fields.yml
-
- install -Dm755 $_pkgname \
- "$pkgdir"/usr/bin/$_pkgname
- install -Dm644 "$srcdir"/$_pkgname.service \
- "$pkgdir"/usr/lib/systemd/system/$_pkgname.service
-
- sed "s/BEATNAME/$_pkgname/g" "$srcdir"/tmpfile.conf > "$pkgdir"/usr/lib/tmpfiles.d/$_pkgname.conf
-
- if [ -d _meta/kibana ]; then
- cp -R _meta/kibana "$pkgdir"/usr/share/$_pkgname/
- fi
-
- if [ -d module ]; then
- cp -R module "$pkgdir"/usr/share/$_pkgname/
- rm -rf "$pkgdir"/usr/share/$_pkgname/module/*/{,info/}_meta
- fi
-
- if [ -d modules.d ]; then
- cp -R modules.d "$pkgdir"/etc/$_pkgname/
- fi
-}
-
-package_filebeat() {
- pkgdesc='Sends log files to Logstash or directly to Elasticsearch'
-
- _do_package_beat
-}
-
-package_packetbeat() {
- pkgdesc='Analyzes network traffic and sends the data to Elasticsearch'
- depends=('libpcap')
-
- _do_package_beat
-}
-
-package_metricbeat() {
- pkgdesc='Server monitoring agent that sends metrics to Elasticsearch'
- conflicts=('topbeat')
- replaces=('topbeat')
-
- _do_package_beat
-}
-
-package_heartbeat-elastic() {
- pkgdesc='Ping remote services for availability and log results to Elasticsearch or send to Logstash'
- conflicts=('heartbeat')
- replaces=('heartbeat')
-
- _do_package_beat
-}
-
-package_auditbeat() {
- pkgdesc='Audit the activities of users and processes on your system'
- depends=('audit')
- install='auditbeat.install'
-
- _do_package_beat
-}
-
-package_journalbeat() {
- pkgdesc='Data collector to read and forward journal entries from journald to Elasticsearch'
-
- _do_package_beat
-}
Copied: beats/repos/community-x86_64/PKGBUILD (from rev 513707, beats/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,156 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Tyler Langlois <ty |at| tjll |dot| net>
+
+pkgbase=beats
+pkgname=(filebeat packetbeat metricbeat heartbeat-elastic auditbeat journalbeat)
+pkgver=7.4.0
+pkgrel=1
+pkgdesc='Data shippers for Elasticsearch'
+arch=('x86_64')
+url='https://www.elastic.co/products/beats'
+license=('Apache')
+depends=('glibc')
+makedepends=('go-pie' 'git' 'libpcap' 'rsync' 'python2-virtualenv' 'audit')
+optdepends=('elasticsearch: for standalone installation'
+ 'python: for migration script')
+source=("https://github.com/elastic/beats/archive/v$pkgver/beats-$pkgver.tar.gz"
+ "filebeat.service"
+ "packetbeat.service"
+ "metricbeat.service"
+ "heartbeat.service"
+ "auditbeat.service"
+ "journalbeat.service"
+ "tmpfile.conf"
+ "magefile_text_file_busy.patch")
+sha256sums=('b6b689eb89051266c75342972736412e2d5d8fc78d0ed1f285377d6a1f346c69'
+ '7256be466b4255cf3ec9e3600998ec006e762508345a08db16e004a1f15083dc'
+ '9f4e33fc768d3500fa3428dcbfda241c6473a2cae8cc4dbadf8f61ca9f2bbec5'
+ '7d83a068e8c4da3de3f42bf21b840a86900e9cf02f5ba0851501a1620e5fa29d'
+ '878b28a891c9683da4b3d8b6914212e3de0f5e832633c54c6263b3099eb96ba2'
+ '5ee738b911022494bc9f8422a4fa7ab7862bd635ca7b08fa3bc8d789ef2785bf'
+ 'c3633d95314d11dd4e153197f22f308c239ced9240291a9aeaec4f6721911e01'
+ 'f29361772f23ec42bb15b5e0ca7e93f17fe00d31cf08a9e2c0d0ab27f2277bbc'
+ '6fdef755fe03d1c83aa9dfe0cba505b4a9d3e4134cb6d3f9c62e9795a3b7c85a')
+
+prepare() {
+ mkdir -p "$srcdir/bin"
+ ln -s /usr/bin/python2 "$srcdir/bin/python"
+ ln -s /usr/bin/pip2 "$srcdir/bin/pip"
+ ln -s /usr/bin/virtualenv2 "$srcdir/bin/virtualenv"
+
+ export GOPATH="$srcdir"/gopath
+ mkdir -p "$GOPATH"
+ go get golang.org/x/sys/cpu
+
+ cd "$srcdir"/beats-$pkgver
+ patch -p1 -i "$srcdir"/magefile_text_file_busy.patch
+
+ # Perform some timestomping to avoid make warnings
+ LANG=C _t="$(date -r Makefile +'%Y-%m-%d %k:%M:%S')"
+ touch -m -d "$_t" */Makefile
+
+ # Use version instead of commit id
+ sed -ri "s/^COMMIT_ID=.*/COMMIT_ID=$pkgver/" libbeat/scripts/Makefile
+
+ # Workaround to place extracted release into GOPATH
+ mkdir -p "$GOPATH"/src/github.com/elastic
+ ln -sf ../../../../beats-$pkgver "$GOPATH"/src/github.com/elastic/beats
+}
+
+build() {
+ export GOFLAGS="-ldflags=-extldflags=-zrelro -ldflags=-extldflags=-znow"
+ export GOPATH="$srcdir"/gopath
+ export PATH="$GOPATH/bin:$srcdir/bin:$PATH"
+
+ cd "$GOPATH"/src/github.com/elastic/beats
+ git init # git root required by one of the build scripts
+
+ cd libbeat
+ make update
+
+ for beat in ${pkgname[@]}; do
+ beat="${beat%-elastic}"
+ msg2 "Building $beat..."
+ cd ../$beat
+ make $beat
+ make update
+ done
+}
+
+_do_package_beat() {
+ _pkgname="${pkgname%-elastic}"
+
+ backup=(etc/$_pkgname/$_pkgname.yml)
+
+ install -dm755 "$pkgdir"/{etc,usr/share,usr/share/licenses,var/lib}/$_pkgname
+ install -dm755 "$pkgdir"/usr/lib/tmpfiles.d
+
+ cd "$srcdir"/beats-$pkgver
+ install -Dm644 NOTICE.txt "$pkgdir"/usr/share/licenses/$pkgname/NOTICE.txt
+
+ cd $_pkgname
+
+ cp $_pkgname.{yml,reference.yml} "$pkgdir"/etc/$_pkgname
+ install -Dm644 fields.yml "$pkgdir"/etc/$_pkgname/fields.yml
+
+ install -Dm755 $_pkgname \
+ "$pkgdir"/usr/bin/$_pkgname
+ install -Dm644 "$srcdir"/$_pkgname.service \
+ "$pkgdir"/usr/lib/systemd/system/$_pkgname.service
+
+ sed "s/BEATNAME/$_pkgname/g" "$srcdir"/tmpfile.conf > "$pkgdir"/usr/lib/tmpfiles.d/$_pkgname.conf
+
+ if [ -d build/kibana ]; then
+ cp -R build/kibana "$pkgdir"/usr/share/$_pkgname/
+ elif [ -d _meta/kibana.generated ]; then
+ cp -R _meta/kibana.generated "$pkgdir"/usr/share/$_pkgname/kibana
+ fi
+}
+
+package_filebeat() {
+ pkgdesc='Sends log files to Logstash or directly to Elasticsearch'
+
+ _do_package_beat
+ cp -R build/package/modules.d "$pkgdir"/etc/$_pkgname/
+ cp -R build/package/module "$pkgdir"/usr/share/$_pkgname/
+}
+
+package_packetbeat() {
+ pkgdesc='Analyzes network traffic and sends the data to Elasticsearch'
+ depends=('libpcap')
+
+ _do_package_beat
+}
+
+package_metricbeat() {
+ pkgdesc='Server monitoring agent that sends metrics to Elasticsearch'
+ conflicts=('topbeat')
+ replaces=('topbeat')
+
+ _do_package_beat
+ cp -R modules.d "$pkgdir"/etc/$_pkgname/
+}
+
+package_heartbeat-elastic() {
+ pkgdesc='Ping remote services for availability and log results to Elasticsearch or send to Logstash'
+ conflicts=('heartbeat')
+ replaces=('heartbeat')
+
+ _do_package_beat
+ cp -R monitors.d "$pkgdir"/etc/$_pkgname/
+}
+
+package_auditbeat() {
+ pkgdesc='Audit the activities of users and processes on your system'
+ depends=('audit')
+ install='auditbeat.install'
+
+ _do_package_beat
+ install -D module/auditd/_meta/audit.rules.d/sample-rules-linux-64bit.conf "$pkgdir"/etc/$_pkgname/audit.rules.d/sample-rules.conf.disabled
+}
+
+package_journalbeat() {
+ pkgdesc='Data collector to ship systemd journal entries to Elasticsearch or Logstash'
+
+ _do_package_beat
+}
Deleted: auditbeat.install
===================================================================
--- auditbeat.install 2019-10-07 10:48:54 UTC (rev 513707)
+++ auditbeat.install 2019-10-07 10:49:15 UTC (rev 513708)
@@ -1,6 +0,0 @@
-post_install() {
- echo "CONFIG_AUDIT is disabled in the Arch kernel packages so a custom kernel"
- echo "is required for the Auditbeat auditd module to work. However, some features"
- echo "like the the file integrity module will work fine without kernel audit support."
- echo "The package linux-hardened has full support for audit."
-}
Copied: beats/repos/community-x86_64/auditbeat.install (from rev 513707, beats/trunk/auditbeat.install)
===================================================================
--- auditbeat.install (rev 0)
+++ auditbeat.install 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,6 @@
+post_install() {
+ echo "CONFIG_AUDIT is disabled in the Arch kernel packages so a custom kernel"
+ echo "is required for the Auditbeat auditd module to work. However, some features"
+ echo "like the the file integrity module will work fine without kernel audit support."
+ echo "The package linux-hardened has full support for audit."
+}
Deleted: auditbeat.service
===================================================================
--- auditbeat.service 2019-10-07 10:48:54 UTC (rev 513707)
+++ auditbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Audit agent and shipper for Elasticsearch
-Documentation=https://www.elastic.co/guide/en/beats/auditbeat/current/index.html
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/auditbeat -c /etc/auditbeat/auditbeat.yml -path.home /usr/share/auditbeat -path.config /etc/auditbeat -path.data /var/lib/auditbeat -path.logs /var/log/auditbeat
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
Copied: beats/repos/community-x86_64/auditbeat.service (from rev 513707, beats/trunk/auditbeat.service)
===================================================================
--- auditbeat.service (rev 0)
+++ auditbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,16 @@
+[Unit]
+Description=Audit the activities of users and processes on your system.
+Documentation=https://www.elastic.co/products/beats/auditbeat
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+
+Environment="BEAT_LOG_OPTS=-e"
+Environment="BEAT_CONFIG_OPTS=-c /etc/auditbeat/auditbeat.yml"
+Environment="BEAT_PATH_OPTS=-path.home /usr/share/auditbeat -path.config /etc/auditbeat -path.data /var/lib/auditbeat -path.logs /var/log/auditbeat"
+ExecStart=/usr/bin/auditbeat $BEAT_LOG_OPTS $BEAT_CONFIG_OPTS $BEAT_PATH_OPTS
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
Deleted: filebeat.service
===================================================================
--- filebeat.service 2019-10-07 10:48:54 UTC (rev 513707)
+++ filebeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Log file forwarder to remote sources
-Documentation=https://www.elastic.co/guide/en/beats/filebeat/current/index.html
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/filebeat -c /etc/filebeat/filebeat.yml -path.home /usr/share/filebeat -path.config /etc/filebeat -path.data /var/lib/filebeat -path.logs /var/log/filebeat
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
Copied: beats/repos/community-x86_64/filebeat.service (from rev 513707, beats/trunk/filebeat.service)
===================================================================
--- filebeat.service (rev 0)
+++ filebeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Filebeat sends log files to Logstash or directly to Elasticsearch.
+Documentation=https://www.elastic.co/products/beats/filebeat
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Environment="BEAT_LOG_OPTS=-e"
+Environment="BEAT_CONFIG_OPTS=-c /etc/filebeat/filebeat.yml"
+Environment="BEAT_PATH_OPTS=-path.home /usr/share/filebeat -path.config /etc/filebeat -path.data /var/lib/filebeat -path.logs /var/log/filebeat"
+ExecStart=/usr/bin/filebeat $BEAT_LOG_OPTS $BEAT_CONFIG_OPTS $BEAT_PATH_OPTS
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
Deleted: heartbeat.service
===================================================================
--- heartbeat.service 2019-10-07 10:48:54 UTC (rev 513707)
+++ heartbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Uptime monitoring agent that stores metrics in Elasticsearch
-Documentation=https://www.elastic.co/guide/en/beats/heartbeat/current/index.html
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/heartbeat -c /etc/heartbeat/heartbeat.yml -path.home /usr/share/heartbeat -path.config /etc/heartbeat -path.data /var/lib/heartbeat -path.logs /var/log/heartbeat
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
Copied: beats/repos/community-x86_64/heartbeat.service (from rev 513707, beats/trunk/heartbeat.service)
===================================================================
--- heartbeat.service (rev 0)
+++ heartbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,16 @@
+[Unit]
+Description=Ping remote services for availability and log results to Elasticsearch or send to Logstash.
+Documentation=https://www.elastic.co/products/beats/heartbeat
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+
+Environment="BEAT_LOG_OPTS=-e"
+Environment="BEAT_CONFIG_OPTS=-c /etc/heartbeat/heartbeat.yml"
+Environment="BEAT_PATH_OPTS=-path.home /usr/share/heartbeat -path.config /etc/heartbeat -path.data /var/lib/heartbeat -path.logs /var/log/heartbeat"
+ExecStart=/usr/bin/heartbeat $BEAT_LOG_OPTS $BEAT_CONFIG_OPTS $BEAT_PATH_OPTS
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
Deleted: journalbeat.service
===================================================================
--- journalbeat.service 2019-10-07 10:48:54 UTC (rev 513707)
+++ journalbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Journalbeat ships systemd journal entries to Elasticsearch or Logstash.
-Documentation=https://www.elastic.co/products/beats/journalbeat
-Wants=network.target
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/journalbeat -c /etc/journalbeat/journalbeat.yml -path.home /usr/share/journalbeat -path.config /etc/journalbeat -path.data /var/lib/journalbeat -path.logs /var/log/journalbeat
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
Copied: beats/repos/community-x86_64/journalbeat.service (from rev 513707, beats/trunk/journalbeat.service)
===================================================================
--- journalbeat.service (rev 0)
+++ journalbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,16 @@
+[Unit]
+Description=Journalbeat ships systemd journal entries to Elasticsearch or Logstash.
+Documentation=https://www.elastic.co/products/beats/journalbeat
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+
+Environment="BEAT_LOG_OPTS=-e"
+Environment="BEAT_CONFIG_OPTS=-c /etc/journalbeat/journalbeat.yml"
+Environment="BEAT_PATH_OPTS=-path.home /usr/share/journalbeat -path.config /etc/journalbeat -path.data /var/lib/journalbeat -path.logs /var/log/journalbeat"
+ExecStart=/usr/bin/journalbeat $BEAT_LOG_OPTS $BEAT_CONFIG_OPTS $BEAT_PATH_OPTS
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
Copied: beats/repos/community-x86_64/magefile_text_file_busy.patch (from rev 513707, beats/trunk/magefile_text_file_busy.patch)
===================================================================
--- magefile_text_file_busy.patch (rev 0)
+++ magefile_text_file_busy.patch 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,11 @@
+diff --git a/metricbeat/Makefile b/metricbeat/Makefile
+index 9f4e5f1..8934187 100644
+--- a/metricbeat/Makefile
++++ b/metricbeat/Makefile
+@@ -75,4 +75,5 @@ test-module: python-env update metricbeat.test
+ assets:
+ go run ${ES_BEATS}/metricbeat/scripts/assets/assets.go ${ES_BEATS}/metricbeat/module
+ mkdir -p include/fields
+- go run ${ES_BEATS}/libbeat/scripts/cmd/global_fields/main.go -es_beats_path ${ES_BEATS} -beat_path ${PWD} | go run ${ES_BEATS}/dev-tools/cmd/asset/asset.go -license ${LICENSE} -out ./include/fields/fields.go -pkg include -priority asset.LibbeatFieldsPri ${ES_BEATS}/libbeat/fields.yml $(BEAT_NAME)
++ go run ${ES_BEATS}/libbeat/scripts/cmd/global_fields/main.go -es_beats_path ${ES_BEATS} -beat_path ${PWD} > tmp_global_fields.bin
++ go run ${ES_BEATS}/dev-tools/cmd/asset/asset.go -license ${LICENSE} -out ./include/fields/fields.go -pkg include -priority asset.LibbeatFieldsPri ${ES_BEATS}/libbeat/fields.yml $(BEAT_NAME) < tmp_global_fields.bin
Deleted: metricbeat.service
===================================================================
--- metricbeat.service 2019-10-07 10:48:54 UTC (rev 513707)
+++ metricbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Server monitoring agent that stores metrics in Elasticsearch
-Documentation=https://www.elastic.co/guide/en/beats/metricbeat/current/index.html
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/metricbeat -c /etc/metricbeat/metricbeat.yml -path.home /usr/share/metricbeat -path.config /etc/metricbeat -path.data /var/lib/metricbeat -path.logs /var/log/metricbeat
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
Copied: beats/repos/community-x86_64/metricbeat.service (from rev 513707, beats/trunk/metricbeat.service)
===================================================================
--- metricbeat.service (rev 0)
+++ metricbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,16 @@
+[Unit]
+Description=Metricbeat is a lightweight shipper for metrics.
+Documentation=https://www.elastic.co/products/beats/metricbeat
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+
+Environment="BEAT_LOG_OPTS=-e"
+Environment="BEAT_CONFIG_OPTS=-c /etc/metricbeat/metricbeat.yml"
+Environment="BEAT_PATH_OPTS=-path.home /usr/share/metricbeat -path.config /etc/metricbeat -path.data /var/lib/metricbeat -path.logs /var/log/metricbeat"
+ExecStart=/usr/bin/metricbeat $BEAT_LOG_OPTS $BEAT_CONFIG_OPTS $BEAT_PATH_OPTS
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
Deleted: packetbeat.service
===================================================================
--- packetbeat.service 2019-10-07 10:48:54 UTC (rev 513707)
+++ packetbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Real-Time Packet Analyzer
-Documentation=https://www.elastic.co/guide/en/beats/packetbeat/current/index.html
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/packetbeat -c /etc/packetbeat/packetbeat.yml -path.home /usr/share/packetbeat -path.config /etc/packetbeat -path.data /var/lib/packetbeat -path.logs /var/log/packetbeat
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
Copied: beats/repos/community-x86_64/packetbeat.service (from rev 513707, beats/trunk/packetbeat.service)
===================================================================
--- packetbeat.service (rev 0)
+++ packetbeat.service 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Real-Time Packet Analyzer
+Documentation=https://www.elastic.co/guide/en/beats/packetbeat/current/index.html
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/packetbeat -c /etc/packetbeat/packetbeat.yml -path.home /usr/share/packetbeat -path.config /etc/packetbeat -path.data /var/lib/packetbeat -path.logs /var/log/packetbeat
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
Deleted: tmpfile.conf
===================================================================
--- tmpfile.conf 2019-10-07 10:48:54 UTC (rev 513707)
+++ tmpfile.conf 2019-10-07 10:49:15 UTC (rev 513708)
@@ -1,2 +0,0 @@
-d /var/log/BEATNAME 0755 root root -
-d /var/lib/BEATNAME 0755 root root -
Copied: beats/repos/community-x86_64/tmpfile.conf (from rev 513707, beats/trunk/tmpfile.conf)
===================================================================
--- tmpfile.conf (rev 0)
+++ tmpfile.conf 2019-10-07 10:49:15 UTC (rev 513708)
@@ -0,0 +1,2 @@
+d /var/log/BEATNAME 0755 root root -
+d /var/lib/BEATNAME 0755 root root -
More information about the arch-commits
mailing list