Date: Wednesday, October 26, 2016 @ 16:31:36
Author: mtorromeo
Revision: 193716
upgpkg: beats 5.0.0-1
Added:
beats/trunk/metricbeat.service
Modified:
beats/trunk/PKGBUILD
beats/trunk/filebeat.install
beats/trunk/filebeat.service
beats/trunk/packetbeat.service
Deleted:
beats/trunk/topbeat.service
--------------------+
PKGBUILD | 40 +++++++++++++++++++++-------------------
filebeat.install | 6 ------
filebeat.service | 4 ++--
metricbeat.service | 10 ++++++++++
packetbeat.service | 4 ++--
topbeat.service | 10 ----------
6 files changed, 35 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-26 16:23:31 UTC (rev 193715)
+++ PKGBUILD 2016-10-26 16:31:36 UTC (rev 193716)
@@ -2,10 +2,10 @@
# Contributor: Tyler Langlois <ty |at| tjll |dot| net>
pkgbase=beats
-pkgname=(filebeat packetbeat topbeat)
-pkgver=1.3.1
+pkgname=(filebeat packetbeat metricbeat)
+pkgver=5.0.0
pkgrel=1
-pkgdesc='Open source data shippers for Elasticsearch'
+pkgdesc='Data shippers for Elasticsearch'
arch=('i686' 'x86_64')
url='https://www.elastic.co/products/beats'
license=('APACHE')
@@ -17,13 +17,13 @@
"filebeat.sysusers"
"filebeat.service"
"packetbeat.service"
- "topbeat.service")
-sha256sums=('1d8e41b42a0b2dd59403795ff07cbfd8a9a76477731c38122aa9242b47b054e0'
- '337d78d9cb21745098c4cc75578f026e5a5819cd4d0575e3f4241f13370c0863'
+ "metricbeat.service")
+sha256sums=('3e6b7cf2ee5f52e78ae87ef04ab9dd49977c89f86a09416586896aeaea844e34'
+ 'fd765921479d391d613c75fe592a4193e538dd9feffc1ca36bc687bec0f0e1aa'
'33feb3690f8b31563cc1e2da557c2aa326501ce9ccd7e0a142036902bfdb05ff'
- '1b668b67134dcbca41193f7987371c6e9ead9853f3ebcb54d5c80a9d0b9decf0'
- 'e45629a37d5c305efa26e2b6a68561528762081681e547e312bb058cbff76125'
- 'ac768b039c699c63a3cda17518f3a2ec0481dff23e6366f6fb452c819bd5825b')
+ '1ab98d3e387c3970e3005f72f4ce266c4fa19ec3938a576da0a407c7db2fa7ce'
+ 'cabf11f35ced8bb61fc26ace4d409dfdb4ed812ff4bc70e168410cb1dc324318'
+ '8a1bcfdb057e4f57d5f16570079055d1822fdfe8d453409891682f6e580f4ff0')
prepare() {
cd beats-$pkgver
@@ -53,9 +53,9 @@
}
package_filebeat() {
- pkgdesc='Collects, pre-processes, and forwards log files from remote
sources'
+ pkgdesc='Collects, pre-processes, and forwards log files to remote sources'
optdepends=('elasticsearch: for standalone installation')
- backup=("etc/$pkgname/$pkgname.yml")
+ backup=("etc/$pkgname/$pkgname.yml" "etc/$pkgname/$pkgname.template.json")
install="$pkgname.install"
cd beats-$pkgver/$pkgname
@@ -63,7 +63,7 @@
install -dm755 "$pkgdir"/var/lib/$pkgname
install -dm755 "$pkgdir"/etc/$pkgname
- make PREFIX="$pkgdir"/etc/$pkgname install-cfg
+ cp $pkgname.{yml,template.json} "$pkgdir"/etc/$pkgname
install -Dm755 $pkgname \
"$pkgdir"/usr/bin/$pkgname
@@ -75,15 +75,15 @@
}
package_packetbeat() {
- pkgdesc='Open source network packet analyzer that ships data to
Elasticsearch'
+ pkgdesc='Network packet analyzer that ships data to Elasticsearch'
depends=('libpcap')
optdepends=('elasticsearch: for standalone installation')
- backup=("etc/$pkgname/$pkgname.yml")
+ backup=("etc/$pkgname/$pkgname.yml" "etc/$pkgname/$pkgname.template.json")
cd beats-$pkgver/$pkgname
install -dm755 "$pkgdir"/etc/$pkgname
- make PREFIX="$pkgdir"/etc/$pkgname install-cfg
+ cp $pkgname.{yml,template.json} "$pkgdir"/etc/$pkgname
install -Dm755 $pkgname \
"$pkgdir"/usr/bin/$pkgname
@@ -91,15 +91,17 @@
"$pkgdir"/usr/lib/systemd/system/$pkgname.service
}
-package_topbeat() {
- pkgdesc='Open source server monitoring agent that stores metrics in
Elasticsearch'
+package_metricbeat() {
+ pkgdesc='Server monitoring agent that stores metrics in Elasticsearch'
optdepends=('elasticsearch: for standalone installation')
- backup=("etc/$pkgname/$pkgname.yml")
+ backup=("etc/$pkgname/$pkgname.yml" "etc/$pkgname/$pkgname.template.json")
+ conflicts=('topbeat')
+ replaces=('topbeat')
cd beats-$pkgver/$pkgname
install -dm755 "$pkgdir"/etc/$pkgname
- make PREFIX="$pkgdir"/etc/$pkgname install-cfg
+ cp $pkgname.{yml,template.json} "$pkgdir"/etc/$pkgname
install -Dm755 $pkgname \
"$pkgdir"/usr/bin/$pkgname
Modified: filebeat.install
===================================================================
--- filebeat.install 2016-10-26 16:23:31 UTC (rev 193715)
+++ filebeat.install 2016-10-26 16:31:36 UTC (rev 193716)
@@ -16,10 +16,4 @@
fi
}
-# Arg 1: the old package version
-post_remove() {
- echo "This package does not automatically remove the filebeat user."
- echo "Please do so manually if it is no longer required."
-}
-
# vim:set ts=2 sw=2 et:
Modified: filebeat.service
===================================================================
--- filebeat.service 2016-10-26 16:23:31 UTC (rev 193715)
+++ filebeat.service 2016-10-26 16:31:36 UTC (rev 193716)
@@ -1,6 +1,6 @@
[Unit]
-Description=log file forwarder to remote sources
-Documentation=https://www.elastic.co/guide/en/beats/filebeat/current
+Description=Log file forwarder to remote sources
+Documentation=https://www.elastic.co/guide/en/beats/filebeat/current/index.html
After=network.target
[Service]
Added: metricbeat.service
===================================================================
--- metricbeat.service (rev 0)
+++ metricbeat.service 2016-10-26 16:31:36 UTC (rev 193716)
@@ -0,0 +1,10 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Modified: packetbeat.service
===================================================================
--- packetbeat.service 2016-10-26 16:23:31 UTC (rev 193715)
+++ packetbeat.service 2016-10-26 16:31:36 UTC (rev 193716)
@@ -1,6 +1,6 @@
[Unit]
-Description=Open Source Real-Time Packet Analyzer
-Documentation=https://www.elastic.co/guide/en/beats/packetbeat/current
+Description=Real-Time Packet Analyzer
+Documentation=https://www.elastic.co/guide/en/beats/packetbeat/current/index.html
After=network.target
[Service]
Deleted: topbeat.service
===================================================================
--- topbeat.service 2016-10-26 16:23:31 UTC (rev 193715)
+++ topbeat.service 2016-10-26 16:31:36 UTC (rev 193716)
@@ -1,10 +0,0 @@
-[Unit]
-Description=open source server monitoring agent that stores metrics in
Elasticsearch
-Documentation=https://www.elastic.co/guide/en/beats/topbeat/current
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/topbeat -c /etc/topbeat/topbeat.yml
-
-[Install]
-WantedBy=multi-user.target
