[arch-commits] Commit in beats/trunk (8 files)

[Massimiliano Torromeo]

    Date: Thursday, November 22, 2018 @ 13:42:50
  Author: mtorromeo
Revision: 409337

upgpkg: beats 6.5.1-1

Added:
  beats/trunk/journalbeat.service
  beats/trunk/tmpfile.conf
Modified:
  beats/trunk/PKGBUILD
Deleted:
  beats/trunk/auditbeat-tmpfile.conf
  beats/trunk/filebeat-tmpfile.conf
  beats/trunk/heartbeat-tmpfile.conf
  beats/trunk/metricbeat-tmpfile.conf
  beats/trunk/packetbeat-tmpfile.conf

-------------------------+
 PKGBUILD                |   31 ++++++++++++++++---------------
 auditbeat-tmpfile.conf  |    2 --
 filebeat-tmpfile.conf   |    2 --
 heartbeat-tmpfile.conf  |    2 --
 journalbeat.service     |   12 ++++++++++++
 metricbeat-tmpfile.conf |    2 --
 packetbeat-tmpfile.conf |    2 --
 tmpfile.conf            |    2 ++
 8 files changed, 30 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-22 13:30:42 UTC (rev 409336)
+++ PKGBUILD	2018-11-22 13:42:50 UTC (rev 409337)
@@ -2,8 +2,8 @@
 # Contributor: Tyler Langlois <ty |at| tjll |dot| net>
 
 pkgbase=beats
-pkgname=(filebeat packetbeat metricbeat heartbeat-elastic auditbeat)
-pkgver=6.4.3
+pkgname=(filebeat packetbeat metricbeat heartbeat-elastic auditbeat journalbeat)
+pkgver=6.5.1
 pkgrel=1
 pkgdesc='Data shippers for Elasticsearch'
 arch=('x86_64')
@@ -21,12 +21,9 @@
         "metricbeat.service"
         "heartbeat.service"
         "auditbeat.service"
-        "filebeat-tmpfile.conf"
-        "packetbeat-tmpfile.conf"
-        "metricbeat-tmpfile.conf"
-        "heartbeat-tmpfile.conf"
-        "auditbeat-tmpfile.conf")
-sha256sums=('437dfffe2e33e63df3281444a0ed409673957f95e79c9bc834bc108e8b1534ca'
+        "journalbeat.service"
+        "tmpfile.conf")
+sha256sums=('38564b896b83272228673638112865f654f60116661d01028ce282f105603a34'
             '75583a195b43d7345449bbac60359bf54661ccbd699386a6e59bb483c6054338'
             '33feb3690f8b31563cc1e2da557c2aa326501ce9ccd7e0a142036902bfdb05ff'
             '4d5394cfe3299c9a6af5ac34c1ad4bcdc2e79162379cccbf00fb414eb28253c0'
@@ -34,11 +31,8 @@
             '26b123acd96808162a7f827ce6f0e9669140c2665fc28d76583a15996fbf853d'
             '212cb4ab5a02d7078025f7d1f50f48e5caa25debce0852cf68cd8f89ed0a8d09'
             'b7f1c61950f21c7fab31166c68d4a9e5027f0c5bcc40a97913d6d89eaf643b85'
-            'ec999a29bc19d1b36b84e03cbd7b00b29d3e08c97ca03043b9fd6bfbe04c5e2d'
-            '3f3ead4168d5b4953cca883d8a3c4552c26a75f52cedfcf6c7785bfd7bbae3c4'
-            'cb927141d3bed94cb5570789dd9fc97713e967580ee354ff393020811f087dca'
-            '9629931db8455891f0a6e9f9c91272716f2b47ec88f8a49e601423a16c7cdba5'
-            'dcdf1be6acda30cc3e8949b5affbc1fe7b0a1efc2a08dfe2f878d6eb6de84d38')
+            '57d2f5bf75b4b5214065ba408c98ec941fb0042f19a623add7f4396d640225ba'
+            'f29361772f23ec42bb15b5e0ca7e93f17fe00d31cf08a9e2c0d0ab27f2277bbc')
 
 prepare() {
     export GOPATH="$srcdir"/gopath
@@ -99,6 +93,7 @@
     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
@@ -112,9 +107,9 @@
                    "$pkgdir"/usr/bin/$_pkgname
     install -Dm644 "$srcdir"/$_pkgname.service \
                    "$pkgdir"/usr/lib/systemd/system/$_pkgname.service
-    install -Dm644 "$srcdir"/$_pkgname-tmpfile.conf \
-                   "$pkgdir"/usr/lib/tmpfiles.d/$_pkgname.conf
 
+    sed "s/BEATNAME/$_pkgname/g" "$srcdir"/tmpfile.conf > "$pkgdir"/usr/lib/tmpfiles.d/$_pkgname.conf
+
     cp -R _meta/kibana "$pkgdir"/usr/share/$_pkgname/
 
     if [ -d module ]; then
@@ -167,3 +162,9 @@
 
     _do_package_beat
 }
+
+package_journalbeat() {
+    pkgdesc='Data collector to read and forward journal entries from journald to Elasticsearch'
+
+    _do_package_beat
+}

Deleted: auditbeat-tmpfile.conf
===================================================================
--- auditbeat-tmpfile.conf	2018-11-22 13:30:42 UTC (rev 409336)
+++ auditbeat-tmpfile.conf	2018-11-22 13:42:50 UTC (rev 409337)
@@ -1,2 +0,0 @@
-d /var/log/auditbeat 0755 root root -
-d /var/lib/auditbeat 0755 root root -

Deleted: filebeat-tmpfile.conf
===================================================================
--- filebeat-tmpfile.conf	2018-11-22 13:30:42 UTC (rev 409336)
+++ filebeat-tmpfile.conf	2018-11-22 13:42:50 UTC (rev 409337)
@@ -1,2 +0,0 @@
-d /var/log/filebeat 0755 filebeat filebeat -
-d /var/lib/filebeat 0755 filebeat filebeat -

Deleted: heartbeat-tmpfile.conf
===================================================================
--- heartbeat-tmpfile.conf	2018-11-22 13:30:42 UTC (rev 409336)
+++ heartbeat-tmpfile.conf	2018-11-22 13:42:50 UTC (rev 409337)
@@ -1,2 +0,0 @@
-d /var/log/heartbeat 0755 root root -
-d /var/lib/heartbeat 0755 root root -

Added: journalbeat.service
===================================================================
--- journalbeat.service	                        (rev 0)
+++ journalbeat.service	2018-11-22 13:42:50 UTC (rev 409337)
@@ -0,0 +1,12 @@
+[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

Deleted: metricbeat-tmpfile.conf
===================================================================
--- metricbeat-tmpfile.conf	2018-11-22 13:30:42 UTC (rev 409336)
+++ metricbeat-tmpfile.conf	2018-11-22 13:42:50 UTC (rev 409337)
@@ -1,2 +0,0 @@
-d /var/log/metricbeat 0755 root root -
-d /var/lib/metricbeat 0755 root root -

Deleted: packetbeat-tmpfile.conf
===================================================================
--- packetbeat-tmpfile.conf	2018-11-22 13:30:42 UTC (rev 409336)
+++ packetbeat-tmpfile.conf	2018-11-22 13:42:50 UTC (rev 409337)
@@ -1,2 +0,0 @@
-d /var/log/packetbeat 0755 root root -
-d /var/lib/packetbeat 0755 root root -

Added: tmpfile.conf
===================================================================
--- tmpfile.conf	                        (rev 0)
+++ tmpfile.conf	2018-11-22 13:42:50 UTC (rev 409337)
@@ -0,0 +1,2 @@
+d /var/log/BEATNAME 0755 root root -
+d /var/lib/BEATNAME 0755 root root -