[arch-commits] Commit in beats/trunk (7 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Mon Oct 7 10:48:54 UTC 2019
Date: Monday, October 7, 2019 @ 10:48:54
Author: mtorromeo
Revision: 513707
upgpkg: beats 7.4.0-1
Added:
beats/trunk/magefile_text_file_busy.patch
Modified:
beats/trunk/PKGBUILD
beats/trunk/auditbeat.service
beats/trunk/filebeat.service
beats/trunk/heartbeat.service
beats/trunk/journalbeat.service
beats/trunk/metricbeat.service
-------------------------------+
PKGBUILD | 65 ++++++++++++++--------------------------
auditbeat.service | 13 +++++---
filebeat.service | 12 ++++---
heartbeat.service | 13 +++++---
journalbeat.service | 10 ++++--
magefile_text_file_busy.patch | 11 ++++++
metricbeat.service | 13 +++++---
7 files changed, 77 insertions(+), 60 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-07 10:46:42 UTC (rev 513706)
+++ PKGBUILD 2019-10-07 10:48:54 UTC (rev 513707)
@@ -3,7 +3,7 @@
pkgbase=beats
pkgname=(filebeat packetbeat metricbeat heartbeat-elastic auditbeat journalbeat)
-pkgver=7.3.2
+pkgver=7.4.0
pkgrel=1
pkgdesc='Data shippers for Elasticsearch'
arch=('x86_64')
@@ -20,15 +20,17 @@
"heartbeat.service"
"auditbeat.service"
"journalbeat.service"
- "tmpfile.conf")
-sha256sums=('513d0056f4de63f33052792ba690677844c8930104cb55236a421ca879db242e'
- '66d9061841e8b406135383e45d6db9ce6261b2bb08aa28224e3ed689e6e0efec'
+ "tmpfile.conf"
+ "magefile_text_file_busy.patch")
+sha256sums=('b6b689eb89051266c75342972736412e2d5d8fc78d0ed1f285377d6a1f346c69'
+ '7256be466b4255cf3ec9e3600998ec006e762508345a08db16e004a1f15083dc'
'9f4e33fc768d3500fa3428dcbfda241c6473a2cae8cc4dbadf8f61ca9f2bbec5'
- '26b123acd96808162a7f827ce6f0e9669140c2665fc28d76583a15996fbf853d'
- '212cb4ab5a02d7078025f7d1f50f48e5caa25debce0852cf68cd8f89ed0a8d09'
- 'b7f1c61950f21c7fab31166c68d4a9e5027f0c5bcc40a97913d6d89eaf643b85'
- '57d2f5bf75b4b5214065ba408c98ec941fb0042f19a623add7f4396d640225ba'
- 'f29361772f23ec42bb15b5e0ca7e93f17fe00d31cf08a9e2c0d0ab27f2277bbc')
+ '7d83a068e8c4da3de3f42bf21b840a86900e9cf02f5ba0851501a1620e5fa29d'
+ '878b28a891c9683da4b3d8b6914212e3de0f5e832633c54c6263b3099eb96ba2'
+ '5ee738b911022494bc9f8422a4fa7ab7862bd635ca7b08fa3bc8d789ef2785bf'
+ 'c3633d95314d11dd4e153197f22f308c239ced9240291a9aeaec4f6721911e01'
+ 'f29361772f23ec42bb15b5e0ca7e93f17fe00d31cf08a9e2c0d0ab27f2277bbc'
+ '6fdef755fe03d1c83aa9dfe0cba505b4a9d3e4134cb6d3f9c62e9795a3b7c85a')
prepare() {
mkdir -p "$srcdir/bin"
@@ -41,13 +43,8 @@
go get golang.org/x/sys/cpu
cd "$srcdir"/beats-$pkgver
+ patch -p1 -i "$srcdir"/magefile_text_file_busy.patch
- # 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
@@ -61,6 +58,7 @@
}
build() {
+ export GOFLAGS="-ldflags=-extldflags=-zrelro -ldflags=-extldflags=-znow"
export GOPATH="$srcdir"/gopath
export PATH="$GOPATH/bin:$srcdir/bin:$PATH"
@@ -75,20 +73,7 @@
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
+ make update
done
}
@@ -115,18 +100,11 @@
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/
+ 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
-
- 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() {
@@ -133,6 +111,8 @@
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() {
@@ -148,6 +128,7 @@
replaces=('topbeat')
_do_package_beat
+ cp -R modules.d "$pkgdir"/etc/$_pkgname/
}
package_heartbeat-elastic() {
@@ -156,6 +137,7 @@
replaces=('heartbeat')
_do_package_beat
+ cp -R monitors.d "$pkgdir"/etc/$_pkgname/
}
package_auditbeat() {
@@ -164,10 +146,11 @@
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 read and forward journal entries from journald to Elasticsearch'
+ pkgdesc='Data collector to ship systemd journal entries to Elasticsearch or Logstash'
_do_package_beat
}
Modified: auditbeat.service
===================================================================
--- auditbeat.service 2019-10-07 10:46:42 UTC (rev 513706)
+++ auditbeat.service 2019-10-07 10:48:54 UTC (rev 513707)
@@ -1,10 +1,15 @@
[Unit]
-Description=Audit agent and shipper for Elasticsearch
-Documentation=https://www.elastic.co/guide/en/beats/auditbeat/current/index.html
-After=network.target
+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]
-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
+
+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]
Modified: filebeat.service
===================================================================
--- filebeat.service 2019-10-07 10:46:42 UTC (rev 513706)
+++ filebeat.service 2019-10-07 10:48:54 UTC (rev 513707)
@@ -1,10 +1,14 @@
[Unit]
-Description=Log file forwarder to remote sources
-Documentation=https://www.elastic.co/guide/en/beats/filebeat/current/index.html
-After=network.target
+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]
-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
+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]
Modified: heartbeat.service
===================================================================
--- heartbeat.service 2019-10-07 10:46:42 UTC (rev 513706)
+++ heartbeat.service 2019-10-07 10:48:54 UTC (rev 513707)
@@ -1,10 +1,15 @@
[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
+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]
-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
+
+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]
Modified: journalbeat.service
===================================================================
--- journalbeat.service 2019-10-07 10:46:42 UTC (rev 513706)
+++ journalbeat.service 2019-10-07 10:48:54 UTC (rev 513707)
@@ -1,11 +1,15 @@
[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
+Wants=network-online.target
+After=network-online.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
+
+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]
Added: magefile_text_file_busy.patch
===================================================================
--- magefile_text_file_busy.patch (rev 0)
+++ magefile_text_file_busy.patch 2019-10-07 10:48:54 UTC (rev 513707)
@@ -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
Modified: metricbeat.service
===================================================================
--- metricbeat.service 2019-10-07 10:46:42 UTC (rev 513706)
+++ metricbeat.service 2019-10-07 10:48:54 UTC (rev 513707)
@@ -1,10 +1,15 @@
[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
+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]
-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
+
+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]
More information about the arch-commits
mailing list