Take over maintainership, upgrade to 7.16.2, drop journalbeat

as journalbeat as dropped upstream with 7.16 release in elastic/beats#29131

Signed-off-by: Knut Ahlers <knut@ahlers.me>

4 files changed, 10 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 351dc9913117..35f9fafa8d33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = beats
 	pkgdesc = Data shippers for Elasticsearch
-	pkgver = 7.10.2
+	pkgver = 7.16.2
 	pkgrel = 1
 	url = https://www.elastic.co/products/beats
 	arch = x86_64
@@ -16,15 +16,14 @@ pkgbase = beats
 	optdepends = elasticsearch: for standalone installation
 	optdepends = python: for migration script
 	options = !makeflags
-	source = https://github.com/elastic/beats/archive/v7.10.2/beats-7.10.2.tar.gz
+	source = https://github.com/elastic/beats/archive/v7.16.2/beats-7.16.2.tar.gz
 	source = filebeat.service
 	source = packetbeat.service
 	source = metricbeat.service
 	source = heartbeat.service
 	source = auditbeat.service
-	source = journalbeat.service
 	source = tmpfile.conf
-	sha512sums = eba0cda8521068f4d15dfb39808695a8de47a568e4d11949746a8f698aaff6825848d5e524bd16b0e555786e277512014dfe33d4daee8c3acef9a9867653c1c3
+	sha512sums = 0e0545bc41efc31b4c94cd9db6d50488e0f8540138506a7ff8015a3128c0e8e47f22fd85d2abedc6240c0b729f914e7dc855f377bfe486cc8ae2c39e583efa38
 	sha512sums = 4d8b160482ba27bdc63c79592f310f2c9bcd2e8e5d3aec5ba9d953f37916bffef57c0f21e3776f4712f87e9a1b90e42dba6058f72bbc4c75380a959276183a59
 	sha512sums = f1e6fe6b677db31326433f4e3eef72356573c6947d653dbe6bc2151581444f80e09343fbf8544952aae82a061b87705e39c8741ea8e402ad53ac3552f532cfea
 	sha512sums = 7e4081b5173d1b58a783f1808f1a9ba4548498de87bdfc1960538d6df4f4da8f900f0e027aeff83ebfe0d81e6aa91db77c520bda76441e6bcaa6fd8a79fbb57a
@@ -54,6 +53,3 @@ pkgname = auditbeat
 	pkgdesc = Audit the activities of users and processes on your system
 	install = auditbeat.install
 	depends = audit
-
-pkgname = journalbeat
-	pkgdesc = Data collector to ship systemd journal entries to Elasticsearch or Logstash
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..a4b53dbebd61
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.tar.gz
+*.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index cd4152e4ddac..c7fbe3c5a719 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Maintainer: Knut Ahlers <knut at ahlers dot me>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Tyler Langlois <ty |at| tjll |dot| net>
 
 pkgbase=beats
-pkgname=(metricbeat filebeat packetbeat heartbeat-elastic auditbeat journalbeat)
-pkgver=7.10.2
+pkgname=(metricbeat filebeat packetbeat heartbeat-elastic auditbeat)
+pkgver=7.16.2
 pkgrel=1
 pkgdesc='Data shippers for Elasticsearch'
 arch=('x86_64')
@@ -20,9 +21,8 @@ source=("https://github.com/elastic/beats/archive/v$pkgver/beats-$pkgver.tar.gz"
         "metricbeat.service"
         "heartbeat.service"
         "auditbeat.service"
-        "journalbeat.service"
         "tmpfile.conf")
-sha512sums=('eba0cda8521068f4d15dfb39808695a8de47a568e4d11949746a8f698aaff6825848d5e524bd16b0e555786e277512014dfe33d4daee8c3acef9a9867653c1c3'
+sha512sums=('0e0545bc41efc31b4c94cd9db6d50488e0f8540138506a7ff8015a3128c0e8e47f22fd85d2abedc6240c0b729f914e7dc855f377bfe486cc8ae2c39e583efa38'
             '4d8b160482ba27bdc63c79592f310f2c9bcd2e8e5d3aec5ba9d953f37916bffef57c0f21e3776f4712f87e9a1b90e42dba6058f72bbc4c75380a959276183a59'
             'f1e6fe6b677db31326433f4e3eef72356573c6947d653dbe6bc2151581444f80e09343fbf8544952aae82a061b87705e39c8741ea8e402ad53ac3552f532cfea'
             '7e4081b5173d1b58a783f1808f1a9ba4548498de87bdfc1960538d6df4f4da8f900f0e027aeff83ebfe0d81e6aa91db77c520bda76441e6bcaa6fd8a79fbb57a'
@@ -152,10 +152,4 @@ package_auditbeat() {
     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
-}
-
 # vim: ts=4 sw=4 et:
diff --git a/journalbeat.service b/journalbeat.service
deleted file mode 100644
index efc9af6f7118..000000000000
--- a/journalbeat.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[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