Date: Wednesday, March 29, 2017 @ 13:20:48 Author: mtorromeo Revision: 219830
archrelease: copy trunk to community-i686, community-x86_64 Added: beats/repos/community-i686/PKGBUILD (from rev 219829, beats/trunk/PKGBUILD) beats/repos/community-i686/filebeat-tmpfile.conf (from rev 219829, beats/trunk/filebeat-tmpfile.conf) beats/repos/community-i686/filebeat.service (from rev 219829, beats/trunk/filebeat.service) beats/repos/community-i686/filebeat.sysusers (from rev 219829, beats/trunk/filebeat.sysusers) beats/repos/community-i686/metricbeat-tmpfile.conf (from rev 219829, beats/trunk/metricbeat-tmpfile.conf) beats/repos/community-i686/metricbeat.service (from rev 219829, beats/trunk/metricbeat.service) beats/repos/community-i686/packetbeat-tmpfile.conf (from rev 219829, beats/trunk/packetbeat-tmpfile.conf) beats/repos/community-i686/packetbeat.service (from rev 219829, beats/trunk/packetbeat.service) beats/repos/community-x86_64/PKGBUILD (from rev 219829, beats/trunk/PKGBUILD) beats/repos/community-x86_64/filebeat-tmpfile.conf (from rev 219829, beats/trunk/filebeat-tmpfile.conf) beats/repos/community-x86_64/filebeat.service (from rev 219829, beats/trunk/filebeat.service) beats/repos/community-x86_64/filebeat.sysusers (from rev 219829, beats/trunk/filebeat.sysusers) beats/repos/community-x86_64/metricbeat-tmpfile.conf (from rev 219829, beats/trunk/metricbeat-tmpfile.conf) beats/repos/community-x86_64/metricbeat.service (from rev 219829, beats/trunk/metricbeat.service) beats/repos/community-x86_64/packetbeat-tmpfile.conf (from rev 219829, beats/trunk/packetbeat-tmpfile.conf) beats/repos/community-x86_64/packetbeat.service (from rev 219829, beats/trunk/packetbeat.service) Deleted: beats/repos/community-i686/PKGBUILD beats/repos/community-i686/filebeat-tmpfile.conf beats/repos/community-i686/filebeat.service beats/repos/community-i686/filebeat.sysusers beats/repos/community-i686/metricbeat-tmpfile.conf beats/repos/community-i686/metricbeat.service beats/repos/community-i686/packetbeat-tmpfile.conf beats/repos/community-i686/packetbeat.service beats/repos/community-x86_64/PKGBUILD beats/repos/community-x86_64/filebeat-tmpfile.conf beats/repos/community-x86_64/filebeat.service beats/repos/community-x86_64/filebeat.sysusers beats/repos/community-x86_64/metricbeat-tmpfile.conf beats/repos/community-x86_64/metricbeat.service beats/repos/community-x86_64/packetbeat-tmpfile.conf beats/repos/community-x86_64/packetbeat.service ------------------------------------------+ /PKGBUILD | 222 +++++++++++++++++++++++++++++ /filebeat-tmpfile.conf | 4 /filebeat.service | 24 +++ /filebeat.sysusers | 2 /metricbeat-tmpfile.conf | 4 /metricbeat.service | 22 ++ /packetbeat-tmpfile.conf | 4 /packetbeat.service | 22 ++ community-i686/PKGBUILD | 111 -------------- community-i686/filebeat-tmpfile.conf | 2 community-i686/filebeat.service | 12 - community-i686/filebeat.sysusers | 1 community-i686/metricbeat-tmpfile.conf | 2 community-i686/metricbeat.service | 11 - community-i686/packetbeat-tmpfile.conf | 2 community-i686/packetbeat.service | 11 - community-x86_64/PKGBUILD | 111 -------------- community-x86_64/filebeat-tmpfile.conf | 2 community-x86_64/filebeat.service | 12 - community-x86_64/filebeat.sysusers | 1 community-x86_64/metricbeat-tmpfile.conf | 2 community-x86_64/metricbeat.service | 11 - community-x86_64/packetbeat-tmpfile.conf | 2 community-x86_64/packetbeat.service | 11 - 24 files changed, 304 insertions(+), 304 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-03-29 13:19:51 UTC (rev 219829) +++ community-i686/PKGBUILD 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,111 +0,0 @@ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Tyler Langlois <ty |at| tjll |dot| net> - -pkgbase=beats -pkgname=(filebeat packetbeat metricbeat) -pkgver=5.2.2 -pkgrel=1 -pkgdesc='Data shippers for Elasticsearch' -arch=('i686' 'x86_64') -url='https://www.elastic.co/products/beats' -license=('APACHE') -depends=('glibc') -makedepends=('go' 'git' 'libpcap') -optdepends=('elasticsearch: for standalone installation' - 'python: for migration script') -options=('!strip') -source=("https://github.com/elastic/beats/archive/v$pkgver/beats-$pkgver.tar.gz" - "filebeat.sysusers" - "filebeat.service" - "packetbeat.service" - "metricbeat.service" - "filebeat-tmpfile.conf" - "packetbeat-tmpfile.conf" - "metricbeat-tmpfile.conf") -sha256sums=('45c89fab339de3d3e7f9a83c7a48312ede147d5989b67b8619d9128353c891c3' - '33feb3690f8b31563cc1e2da557c2aa326501ce9ccd7e0a142036902bfdb05ff' - '4d5394cfe3299c9a6af5ac34c1ad4bcdc2e79162379cccbf00fb414eb28253c0' - '9f4e33fc768d3500fa3428dcbfda241c6473a2cae8cc4dbadf8f61ca9f2bbec5' - '26b123acd96808162a7f827ce6f0e9669140c2665fc28d76583a15996fbf853d' - 'ec999a29bc19d1b36b84e03cbd7b00b29d3e08c97ca03043b9fd6bfbe04c5e2d' - '3f3ead4168d5b4953cca883d8a3c4552c26a75f52cedfcf6c7785bfd7bbae3c4' - 'cb927141d3bed94cb5570789dd9fc97713e967580ee354ff393020811f087dca') - -prepare() { - cd 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 - - # Workaround to place extracted release into GOPATH - mkdir -p "$srcdir"/gopath/src/github.com/elastic - ln -sf "$srcdir"/beats-$pkgver \ - "$srcdir"/gopath/src/github.com/elastic/beats -} - -build() { - export GOPATH="$srcdir"/gopath - for beat in ${pkgname[@]}; do - msg2 "Building $beat..." - cd "$srcdir"/beats-$pkgver/$beat - make - cd "$srcdir"/beats-$pkgver/libbeat/dashboards - make BEAT=$beat - mv import_dashboards import_dashboards-$beat - done -} - -_do_package_beat() { - backup=(etc/$pkgname/$pkgname.yml etc/$pkgname/$pkgname.template{,-es2x}.json) - - cd beats-$pkgver/$pkgname - - install -dm755 "$pkgdir"/var/lib/$pkgname - - install -dm755 "$pkgdir"/etc/$pkgname - cp $pkgname.{yml,full.yml,template{,-es2x}.json} "$pkgdir"/etc/$pkgname - - install -Dm755 $pkgname \ - "$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 - - cd ../libbeat - install -Dm755 dashboards/import_dashboards-$pkgname \ - "$pkgdir"/usr/share/$pkgname/scripts/import_dashboards - install -Dm755 scripts/migrate_beat_config_1_x_to_5_0.py \ - "$pkgdir"/usr/share/$pkgname/scripts/migrate_beat_config_1_x_to_5_0.py -} - -package_filebeat() { - pkgdesc='Collects, pre-processes, and forwards log files to remote sources' - - _do_package_beat - - cd "$srcdir"/beats-$pkgver/$pkgname - install -Dm644 "$srcdir"/$pkgname.sysusers \ - "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf -} - -package_packetbeat() { - pkgdesc='Network packet analyzer that ships data to Elasticsearch' - depends=('libpcap') - - _do_package_beat -} - -package_metricbeat() { - pkgdesc='Server monitoring agent that stores metrics in Elasticsearch' - conflicts=('topbeat') - replaces=('topbeat') - - _do_package_beat -} Copied: beats/repos/community-i686/PKGBUILD (from rev 219829, beats/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,111 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Tyler Langlois <ty |at| tjll |dot| net> + +pkgbase=beats +pkgname=(filebeat packetbeat metricbeat) +pkgver=5.3.0 +pkgrel=1 +pkgdesc='Data shippers for Elasticsearch' +arch=('i686' 'x86_64') +url='https://www.elastic.co/products/beats' +license=('APACHE') +depends=('glibc') +makedepends=('go' 'git' 'libpcap') +optdepends=('elasticsearch: for standalone installation' + 'python: for migration script') +options=('!strip') +source=("https://github.com/elastic/beats/archive/v$pkgver/beats-$pkgver.tar.gz" + "filebeat.sysusers" + "filebeat.service" + "packetbeat.service" + "metricbeat.service" + "filebeat-tmpfile.conf" + "packetbeat-tmpfile.conf" + "metricbeat-tmpfile.conf") +sha256sums=('311030e33ec6f5f335ddf9e0b8eb3a1cd9e378dbc7c0937658a02099457c5895' + '33feb3690f8b31563cc1e2da557c2aa326501ce9ccd7e0a142036902bfdb05ff' + '4d5394cfe3299c9a6af5ac34c1ad4bcdc2e79162379cccbf00fb414eb28253c0' + '9f4e33fc768d3500fa3428dcbfda241c6473a2cae8cc4dbadf8f61ca9f2bbec5' + '26b123acd96808162a7f827ce6f0e9669140c2665fc28d76583a15996fbf853d' + 'ec999a29bc19d1b36b84e03cbd7b00b29d3e08c97ca03043b9fd6bfbe04c5e2d' + '3f3ead4168d5b4953cca883d8a3c4552c26a75f52cedfcf6c7785bfd7bbae3c4' + 'cb927141d3bed94cb5570789dd9fc97713e967580ee354ff393020811f087dca') + +prepare() { + cd 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 + + # Workaround to place extracted release into GOPATH + mkdir -p "$srcdir"/gopath/src/github.com/elastic + ln -sf "$srcdir"/beats-$pkgver \ + "$srcdir"/gopath/src/github.com/elastic/beats +} + +build() { + export GOPATH="$srcdir"/gopath + for beat in ${pkgname[@]}; do + msg2 "Building $beat..." + cd "$srcdir"/beats-$pkgver/$beat + make + cd "$srcdir"/beats-$pkgver/libbeat/dashboards + make BEAT=$beat + mv import_dashboards import_dashboards-$beat + done +} + +_do_package_beat() { + backup=(etc/$pkgname/$pkgname.yml etc/$pkgname/$pkgname.template{,-es2x}.json) + + cd beats-$pkgver/$pkgname + + install -dm755 "$pkgdir"/var/lib/$pkgname + + install -dm755 "$pkgdir"/etc/$pkgname + cp $pkgname.{yml,full.yml,template{,-es2x}.json} "$pkgdir"/etc/$pkgname + + install -Dm755 $pkgname \ + "$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 + + cd ../libbeat + install -Dm755 dashboards/import_dashboards-$pkgname \ + "$pkgdir"/usr/share/$pkgname/scripts/import_dashboards + install -Dm755 scripts/migrate_beat_config_1_x_to_5_0.py \ + "$pkgdir"/usr/share/$pkgname/scripts/migrate_beat_config_1_x_to_5_0.py +} + +package_filebeat() { + pkgdesc='Collects, pre-processes, and forwards log files to remote sources' + + _do_package_beat + + cd "$srcdir"/beats-$pkgver/$pkgname + install -Dm644 "$srcdir"/$pkgname.sysusers \ + "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf +} + +package_packetbeat() { + pkgdesc='Network packet analyzer that ships data to Elasticsearch' + depends=('libpcap') + + _do_package_beat +} + +package_metricbeat() { + pkgdesc='Server monitoring agent that stores metrics in Elasticsearch' + conflicts=('topbeat') + replaces=('topbeat') + + _do_package_beat +} Deleted: community-i686/filebeat-tmpfile.conf =================================================================== --- community-i686/filebeat-tmpfile.conf 2017-03-29 13:19:51 UTC (rev 219829) +++ community-i686/filebeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,2 +0,0 @@ -d /var/log/filebeat 0755 filebeat filebeat - -d /var/lib/filebeat 0755 filebeat filebeat - Copied: beats/repos/community-i686/filebeat-tmpfile.conf (from rev 219829, beats/trunk/filebeat-tmpfile.conf) =================================================================== --- community-i686/filebeat-tmpfile.conf (rev 0) +++ community-i686/filebeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,2 @@ +d /var/log/filebeat 0755 filebeat filebeat - +d /var/lib/filebeat 0755 filebeat filebeat - Deleted: community-i686/filebeat.service =================================================================== --- community-i686/filebeat.service 2017-03-29 13:19:51 UTC (rev 219829) +++ community-i686/filebeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,12 +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] -User=filebeat -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-i686/filebeat.service (from rev 219829, beats/trunk/filebeat.service) =================================================================== --- community-i686/filebeat.service (rev 0) +++ community-i686/filebeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,12 @@ +[Unit] +Description=Log file forwarder to remote sources +Documentation=https://www.elastic.co/guide/en/beats/filebeat/current/index.html +After=network.target + +[Service] +User=filebeat +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 Deleted: community-i686/filebeat.sysusers =================================================================== --- community-i686/filebeat.sysusers 2017-03-29 13:19:51 UTC (rev 219829) +++ community-i686/filebeat.sysusers 2017-03-29 13:20:48 UTC (rev 219830) @@ -1 +0,0 @@ -u filebeat - "Lightweight Shipper for Log Data" /var/lib/filebeat Copied: beats/repos/community-i686/filebeat.sysusers (from rev 219829, beats/trunk/filebeat.sysusers) =================================================================== --- community-i686/filebeat.sysusers (rev 0) +++ community-i686/filebeat.sysusers 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1 @@ +u filebeat - "Lightweight Shipper for Log Data" /var/lib/filebeat Deleted: community-i686/metricbeat-tmpfile.conf =================================================================== --- community-i686/metricbeat-tmpfile.conf 2017-03-29 13:19:51 UTC (rev 219829) +++ community-i686/metricbeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,2 +0,0 @@ -d /var/log/metricbeat 0755 root root - -d /var/lib/metricbeat 0755 root root - Copied: beats/repos/community-i686/metricbeat-tmpfile.conf (from rev 219829, beats/trunk/metricbeat-tmpfile.conf) =================================================================== --- community-i686/metricbeat-tmpfile.conf (rev 0) +++ community-i686/metricbeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,2 @@ +d /var/log/metricbeat 0755 root root - +d /var/lib/metricbeat 0755 root root - Deleted: community-i686/metricbeat.service =================================================================== --- community-i686/metricbeat.service 2017-03-29 13:19:51 UTC (rev 219829) +++ community-i686/metricbeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -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-i686/metricbeat.service (from rev 219829, beats/trunk/metricbeat.service) =================================================================== --- community-i686/metricbeat.service (rev 0) +++ community-i686/metricbeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,11 @@ +[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 Deleted: community-i686/packetbeat-tmpfile.conf =================================================================== --- community-i686/packetbeat-tmpfile.conf 2017-03-29 13:19:51 UTC (rev 219829) +++ community-i686/packetbeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,2 +0,0 @@ -d /var/log/packetbeat 0755 root root - -d /var/lib/packetbeat 0755 root root - Copied: beats/repos/community-i686/packetbeat-tmpfile.conf (from rev 219829, beats/trunk/packetbeat-tmpfile.conf) =================================================================== --- community-i686/packetbeat-tmpfile.conf (rev 0) +++ community-i686/packetbeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,2 @@ +d /var/log/packetbeat 0755 root root - +d /var/lib/packetbeat 0755 root root - Deleted: community-i686/packetbeat.service =================================================================== --- community-i686/packetbeat.service 2017-03-29 13:19:51 UTC (rev 219829) +++ community-i686/packetbeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -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-i686/packetbeat.service (from rev 219829, beats/trunk/packetbeat.service) =================================================================== --- community-i686/packetbeat.service (rev 0) +++ community-i686/packetbeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -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: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-03-29 13:19:51 UTC (rev 219829) +++ community-x86_64/PKGBUILD 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,111 +0,0 @@ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Tyler Langlois <ty |at| tjll |dot| net> - -pkgbase=beats -pkgname=(filebeat packetbeat metricbeat) -pkgver=5.2.2 -pkgrel=1 -pkgdesc='Data shippers for Elasticsearch' -arch=('i686' 'x86_64') -url='https://www.elastic.co/products/beats' -license=('APACHE') -depends=('glibc') -makedepends=('go' 'git' 'libpcap') -optdepends=('elasticsearch: for standalone installation' - 'python: for migration script') -options=('!strip') -source=("https://github.com/elastic/beats/archive/v$pkgver/beats-$pkgver.tar.gz" - "filebeat.sysusers" - "filebeat.service" - "packetbeat.service" - "metricbeat.service" - "filebeat-tmpfile.conf" - "packetbeat-tmpfile.conf" - "metricbeat-tmpfile.conf") -sha256sums=('45c89fab339de3d3e7f9a83c7a48312ede147d5989b67b8619d9128353c891c3' - '33feb3690f8b31563cc1e2da557c2aa326501ce9ccd7e0a142036902bfdb05ff' - '4d5394cfe3299c9a6af5ac34c1ad4bcdc2e79162379cccbf00fb414eb28253c0' - '9f4e33fc768d3500fa3428dcbfda241c6473a2cae8cc4dbadf8f61ca9f2bbec5' - '26b123acd96808162a7f827ce6f0e9669140c2665fc28d76583a15996fbf853d' - 'ec999a29bc19d1b36b84e03cbd7b00b29d3e08c97ca03043b9fd6bfbe04c5e2d' - '3f3ead4168d5b4953cca883d8a3c4552c26a75f52cedfcf6c7785bfd7bbae3c4' - 'cb927141d3bed94cb5570789dd9fc97713e967580ee354ff393020811f087dca') - -prepare() { - cd 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 - - # Workaround to place extracted release into GOPATH - mkdir -p "$srcdir"/gopath/src/github.com/elastic - ln -sf "$srcdir"/beats-$pkgver \ - "$srcdir"/gopath/src/github.com/elastic/beats -} - -build() { - export GOPATH="$srcdir"/gopath - for beat in ${pkgname[@]}; do - msg2 "Building $beat..." - cd "$srcdir"/beats-$pkgver/$beat - make - cd "$srcdir"/beats-$pkgver/libbeat/dashboards - make BEAT=$beat - mv import_dashboards import_dashboards-$beat - done -} - -_do_package_beat() { - backup=(etc/$pkgname/$pkgname.yml etc/$pkgname/$pkgname.template{,-es2x}.json) - - cd beats-$pkgver/$pkgname - - install -dm755 "$pkgdir"/var/lib/$pkgname - - install -dm755 "$pkgdir"/etc/$pkgname - cp $pkgname.{yml,full.yml,template{,-es2x}.json} "$pkgdir"/etc/$pkgname - - install -Dm755 $pkgname \ - "$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 - - cd ../libbeat - install -Dm755 dashboards/import_dashboards-$pkgname \ - "$pkgdir"/usr/share/$pkgname/scripts/import_dashboards - install -Dm755 scripts/migrate_beat_config_1_x_to_5_0.py \ - "$pkgdir"/usr/share/$pkgname/scripts/migrate_beat_config_1_x_to_5_0.py -} - -package_filebeat() { - pkgdesc='Collects, pre-processes, and forwards log files to remote sources' - - _do_package_beat - - cd "$srcdir"/beats-$pkgver/$pkgname - install -Dm644 "$srcdir"/$pkgname.sysusers \ - "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf -} - -package_packetbeat() { - pkgdesc='Network packet analyzer that ships data to Elasticsearch' - depends=('libpcap') - - _do_package_beat -} - -package_metricbeat() { - pkgdesc='Server monitoring agent that stores metrics in Elasticsearch' - conflicts=('topbeat') - replaces=('topbeat') - - _do_package_beat -} Copied: beats/repos/community-x86_64/PKGBUILD (from rev 219829, beats/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,111 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Tyler Langlois <ty |at| tjll |dot| net> + +pkgbase=beats +pkgname=(filebeat packetbeat metricbeat) +pkgver=5.3.0 +pkgrel=1 +pkgdesc='Data shippers for Elasticsearch' +arch=('i686' 'x86_64') +url='https://www.elastic.co/products/beats' +license=('APACHE') +depends=('glibc') +makedepends=('go' 'git' 'libpcap') +optdepends=('elasticsearch: for standalone installation' + 'python: for migration script') +options=('!strip') +source=("https://github.com/elastic/beats/archive/v$pkgver/beats-$pkgver.tar.gz" + "filebeat.sysusers" + "filebeat.service" + "packetbeat.service" + "metricbeat.service" + "filebeat-tmpfile.conf" + "packetbeat-tmpfile.conf" + "metricbeat-tmpfile.conf") +sha256sums=('311030e33ec6f5f335ddf9e0b8eb3a1cd9e378dbc7c0937658a02099457c5895' + '33feb3690f8b31563cc1e2da557c2aa326501ce9ccd7e0a142036902bfdb05ff' + '4d5394cfe3299c9a6af5ac34c1ad4bcdc2e79162379cccbf00fb414eb28253c0' + '9f4e33fc768d3500fa3428dcbfda241c6473a2cae8cc4dbadf8f61ca9f2bbec5' + '26b123acd96808162a7f827ce6f0e9669140c2665fc28d76583a15996fbf853d' + 'ec999a29bc19d1b36b84e03cbd7b00b29d3e08c97ca03043b9fd6bfbe04c5e2d' + '3f3ead4168d5b4953cca883d8a3c4552c26a75f52cedfcf6c7785bfd7bbae3c4' + 'cb927141d3bed94cb5570789dd9fc97713e967580ee354ff393020811f087dca') + +prepare() { + cd 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 + + # Workaround to place extracted release into GOPATH + mkdir -p "$srcdir"/gopath/src/github.com/elastic + ln -sf "$srcdir"/beats-$pkgver \ + "$srcdir"/gopath/src/github.com/elastic/beats +} + +build() { + export GOPATH="$srcdir"/gopath + for beat in ${pkgname[@]}; do + msg2 "Building $beat..." + cd "$srcdir"/beats-$pkgver/$beat + make + cd "$srcdir"/beats-$pkgver/libbeat/dashboards + make BEAT=$beat + mv import_dashboards import_dashboards-$beat + done +} + +_do_package_beat() { + backup=(etc/$pkgname/$pkgname.yml etc/$pkgname/$pkgname.template{,-es2x}.json) + + cd beats-$pkgver/$pkgname + + install -dm755 "$pkgdir"/var/lib/$pkgname + + install -dm755 "$pkgdir"/etc/$pkgname + cp $pkgname.{yml,full.yml,template{,-es2x}.json} "$pkgdir"/etc/$pkgname + + install -Dm755 $pkgname \ + "$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 + + cd ../libbeat + install -Dm755 dashboards/import_dashboards-$pkgname \ + "$pkgdir"/usr/share/$pkgname/scripts/import_dashboards + install -Dm755 scripts/migrate_beat_config_1_x_to_5_0.py \ + "$pkgdir"/usr/share/$pkgname/scripts/migrate_beat_config_1_x_to_5_0.py +} + +package_filebeat() { + pkgdesc='Collects, pre-processes, and forwards log files to remote sources' + + _do_package_beat + + cd "$srcdir"/beats-$pkgver/$pkgname + install -Dm644 "$srcdir"/$pkgname.sysusers \ + "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf +} + +package_packetbeat() { + pkgdesc='Network packet analyzer that ships data to Elasticsearch' + depends=('libpcap') + + _do_package_beat +} + +package_metricbeat() { + pkgdesc='Server monitoring agent that stores metrics in Elasticsearch' + conflicts=('topbeat') + replaces=('topbeat') + + _do_package_beat +} Deleted: community-x86_64/filebeat-tmpfile.conf =================================================================== --- community-x86_64/filebeat-tmpfile.conf 2017-03-29 13:19:51 UTC (rev 219829) +++ community-x86_64/filebeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,2 +0,0 @@ -d /var/log/filebeat 0755 filebeat filebeat - -d /var/lib/filebeat 0755 filebeat filebeat - Copied: beats/repos/community-x86_64/filebeat-tmpfile.conf (from rev 219829, beats/trunk/filebeat-tmpfile.conf) =================================================================== --- community-x86_64/filebeat-tmpfile.conf (rev 0) +++ community-x86_64/filebeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,2 @@ +d /var/log/filebeat 0755 filebeat filebeat - +d /var/lib/filebeat 0755 filebeat filebeat - Deleted: community-x86_64/filebeat.service =================================================================== --- community-x86_64/filebeat.service 2017-03-29 13:19:51 UTC (rev 219829) +++ community-x86_64/filebeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,12 +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] -User=filebeat -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 219829, beats/trunk/filebeat.service) =================================================================== --- community-x86_64/filebeat.service (rev 0) +++ community-x86_64/filebeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,12 @@ +[Unit] +Description=Log file forwarder to remote sources +Documentation=https://www.elastic.co/guide/en/beats/filebeat/current/index.html +After=network.target + +[Service] +User=filebeat +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 Deleted: community-x86_64/filebeat.sysusers =================================================================== --- community-x86_64/filebeat.sysusers 2017-03-29 13:19:51 UTC (rev 219829) +++ community-x86_64/filebeat.sysusers 2017-03-29 13:20:48 UTC (rev 219830) @@ -1 +0,0 @@ -u filebeat - "Lightweight Shipper for Log Data" /var/lib/filebeat Copied: beats/repos/community-x86_64/filebeat.sysusers (from rev 219829, beats/trunk/filebeat.sysusers) =================================================================== --- community-x86_64/filebeat.sysusers (rev 0) +++ community-x86_64/filebeat.sysusers 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1 @@ +u filebeat - "Lightweight Shipper for Log Data" /var/lib/filebeat Deleted: community-x86_64/metricbeat-tmpfile.conf =================================================================== --- community-x86_64/metricbeat-tmpfile.conf 2017-03-29 13:19:51 UTC (rev 219829) +++ community-x86_64/metricbeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,2 +0,0 @@ -d /var/log/metricbeat 0755 root root - -d /var/lib/metricbeat 0755 root root - Copied: beats/repos/community-x86_64/metricbeat-tmpfile.conf (from rev 219829, beats/trunk/metricbeat-tmpfile.conf) =================================================================== --- community-x86_64/metricbeat-tmpfile.conf (rev 0) +++ community-x86_64/metricbeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,2 @@ +d /var/log/metricbeat 0755 root root - +d /var/lib/metricbeat 0755 root root - Deleted: community-x86_64/metricbeat.service =================================================================== --- community-x86_64/metricbeat.service 2017-03-29 13:19:51 UTC (rev 219829) +++ community-x86_64/metricbeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -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 219829, beats/trunk/metricbeat.service) =================================================================== --- community-x86_64/metricbeat.service (rev 0) +++ community-x86_64/metricbeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,11 @@ +[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 Deleted: community-x86_64/packetbeat-tmpfile.conf =================================================================== --- community-x86_64/packetbeat-tmpfile.conf 2017-03-29 13:19:51 UTC (rev 219829) +++ community-x86_64/packetbeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -1,2 +0,0 @@ -d /var/log/packetbeat 0755 root root - -d /var/lib/packetbeat 0755 root root - Copied: beats/repos/community-x86_64/packetbeat-tmpfile.conf (from rev 219829, beats/trunk/packetbeat-tmpfile.conf) =================================================================== --- community-x86_64/packetbeat-tmpfile.conf (rev 0) +++ community-x86_64/packetbeat-tmpfile.conf 2017-03-29 13:20:48 UTC (rev 219830) @@ -0,0 +1,2 @@ +d /var/log/packetbeat 0755 root root - +d /var/lib/packetbeat 0755 root root - Deleted: community-x86_64/packetbeat.service =================================================================== --- community-x86_64/packetbeat.service 2017-03-29 13:19:51 UTC (rev 219829) +++ community-x86_64/packetbeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -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 219829, beats/trunk/packetbeat.service) =================================================================== --- community-x86_64/packetbeat.service (rev 0) +++ community-x86_64/packetbeat.service 2017-03-29 13:20:48 UTC (rev 219830) @@ -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