diff options
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -rw-r--r-- | PKGBUILD | 80 | ||||
| -rw-r--r-- | kibana.service | 12 | ||||
| -rw-r--r-- | tmpfile.conf | 5 | ||||
| -rw-r--r-- | user.conf | 1 |
5 files changed, 72 insertions, 56 deletions
@@ -1,24 +1,22 @@ -# Generated by mksrcinfo v8 -# Sat Jul 8 10:50:16 UTC 2017 pkgbase = kibana - pkgdesc = browser based analytics and search dashboard for Elasticsearch - pkgver = 5.5.0 + pkgdesc = Browser based analytics and search dashboard for Elasticsearch + pkgver = 7.10.2 pkgrel = 1 url = https://www.elastic.co/products/kibana arch = any - license = apache - optdepends = elasticsearch>=2.4 + license = Apache + depends = nodejs + optdepends = elasticsearch options = !strip - backup = etc/elasticsearch/kibana/kibana.yml - source = https://artifacts.elastic.co/downloads/kibana/kibana-5.5.0-linux-x86_64.tar.gz + options = emptydirs + backup = etc/kibana/kibana.yml + source = https://artifacts.elastic.co/downloads/kibana/kibana-oss-7.10.2-linux-x86_64.tar.gz source = kibana.service - sha256sums = 8aa30bf3a4a453bdbcfad4e96fabf518b4bff7532a67b8001d3e293fcd625cd2 - sha256sums = 610c50d38ff0d4cff308b2ff2f38ce3012bf70e396aa25a9b85b821ad3675e3b + source = tmpfile.conf + source = user.conf + sha512sums = 77ebb247d5326f3f9ab97d57ecc00c7f70deae0e1857d8b5d8f9a5d05d6713e27514cca342df666be79ab85a580e9dc5c7fa9676d67e95db64a0d69546d8d699 + sha512sums = 3002f529c0960f1a0c233f7589819ed9c06c8ec6539ef416529d212bd1657d61bf0662b954b2b2dbff8a33cea2d545ea34e06df9088590156564e08bfc20216b + sha512sums = afed49c164561f3c658a6d2423519adcf4d5293c416cd93fa5c9d12421416c1e9cb4287e832009049cfd014b365dc1cd93d9cf879117c701cce4caad3b772a8e + sha512sums = 9085884430c656cc68b855c3d6740e5fd0854a8785930341b29e15e201deacc1870d8223255d9ebe096cb111319bea9bf4faa03d0760d5819976ebf912221c7d pkgname = kibana - pkgdesc = browser based analytics and search dashboard for Elasticsearch. Please note; this package replaces the distributed precompiled binary 'node' - depends = nodejs<7 - -pkgname = kibana-bin - pkgdesc = browser based analytics and search dashboard for Elasticsearch. This package uses the precompiled binary 'node' - @@ -1,46 +1,54 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Justin Kromlinger <hashworks@archlinux.org> +# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Spider.007 <archlinux AT spider007 DOT net> -pkgbase=kibana -pkgname=(kibana kibana-bin) -pkgver=5.5.0 + +pkgname=kibana +pkgver=7.10.2 pkgrel=1 -pkgdesc="browser based analytics and search dashboard for Elasticsearch" +pkgdesc='Browser based analytics and search dashboard for Elasticsearch' +url='https://www.elastic.co/products/kibana' arch=('any') -url="https://www.elastic.co/products/kibana" -license=('apache') -optdepends=('elasticsearch>=2.4') -backup=('etc/elasticsearch/kibana/kibana.yml') -options=('!strip') -source=( - "https://artifacts.elastic.co/downloads/$pkgname/$pkgname-$pkgver-linux-x86_64.tar.gz" - kibana.service) -sha256sums=('8aa30bf3a4a453bdbcfad4e96fabf518b4bff7532a67b8001d3e293fcd625cd2' - '610c50d38ff0d4cff308b2ff2f38ce3012bf70e396aa25a9b85b821ad3675e3b') - -_package() { - cd "$pkgdir" - - install -dm755 usr/share/kibana - install -Dm644 "$srcdir/kibana.service" usr/lib/systemd/system/kibana.service - install -Dm644 "$srcdir"/$pkgbase-$pkgver-linux-x86_64/config/kibana.yml etc/elasticsearch/kibana/kibana.yml - - cp -Rp "$srcdir"/$pkgbase-$pkgver-linux-x86_64/* usr/share/kibana - - chmod -R g+w,o+w usr/share/kibana/{optimize,data}/ +license=('Apache') +depends=('nodejs') +optdepends=('elasticsearch') +backup=('etc/kibana/kibana.yml') +options=('!strip' 'emptydirs') +source=(https://artifacts.elastic.co/downloads/${pkgname}/${pkgname}-oss-${pkgver}-linux-x86_64.tar.gz + kibana.service + tmpfile.conf + user.conf) +sha512sums=('77ebb247d5326f3f9ab97d57ecc00c7f70deae0e1857d8b5d8f9a5d05d6713e27514cca342df666be79ab85a580e9dc5c7fa9676d67e95db64a0d69546d8d699' + '3002f529c0960f1a0c233f7589819ed9c06c8ec6539ef416529d212bd1657d61bf0662b954b2b2dbff8a33cea2d545ea34e06df9088590156564e08bfc20216b' + 'afed49c164561f3c658a6d2423519adcf4d5293c416cd93fa5c9d12421416c1e9cb4287e832009049cfd014b365dc1cd93d9cf879117c701cce4caad3b772a8e' + '9085884430c656cc68b855c3d6740e5fd0854a8785930341b29e15e201deacc1870d8223255d9ebe096cb111319bea9bf4faa03d0760d5819976ebf912221c7d') + +prepare() { + cd ${pkgbase}-${pkgver}-linux-x86_64 + + # remove nodejs strict version requirements + sed "s@^var isVersionValid = .*@var isVersionValid = true;@" -i src/setup_node_env/node_version_validator.js + + # set default quiet mode for systemd, cli option forces specified values + sed -r 's|#(logging.quiet:) false|\1 true|' -i config/kibana.yml } -package_kibana() { - _package - - pkgdesc="$pkgdesc. Please note; this package replaces the distributed precompiled binary 'node'" - depends=('nodejs<7') +package() { + cd ${pkgbase}-${pkgver}-linux-x86_64 - rm -R "$pkgdir"/usr/share/kibana/node/ -} + install -dm 755 "${pkgdir}/usr/share/kibana" + cp -a * "${pkgdir}/usr/share/kibana" -package_kibana-bin() { - _package + install -dm 750 "${pkgdir}/etc/kibana" + install -Dm 640 config/kibana.yml -t "${pkgdir}/etc/kibana" + install -Dm 644 "${srcdir}/kibana.service" -t "${pkgdir}/usr/lib/systemd/system" + install -Dm 644 "${srcdir}/user.conf" "${pkgdir}/usr/lib/sysusers.d/kibana.conf" + install -Dm 644 "${srcdir}/tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/kibana.conf" - pkgdesc="$pkgdesc. This package uses the precompiled binary 'node'" + rm -r "${pkgdir}/usr/share/kibana/node" + find "${pkgdir}/usr/share/kibana/node_modules" -type d -empty -delete - sed -i 's~ExecStart=.*~ExecStart=/usr/share/kibana/bin/kibana --config=/etc/elasticsearch/kibana/kibana.yml~' "$pkgdir"/usr/lib/systemd/system/kibana.service + install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" } + +# vim: ts=2 sw=2 et: diff --git a/kibana.service b/kibana.service index d8dd78ac15d3..6a3821ae4fa8 100644 --- a/kibana.service +++ b/kibana.service @@ -1,12 +1,16 @@ [Unit] Description=Kibana - dashboard for Elasticsearch -After=elasticsearch.service +After=network.target elasticsearch.service [Service] -User=nobody -Group=elasticsearch +User=kibana +Group=kibana Environment="NODE_ENV=production" -ExecStart=/usr/bin/node --max-old-space-size=512 /usr/share/kibana/src/cli --quiet --config=/etc/elasticsearch/kibana/kibana.yml +Environment="NODE_OPTIONS=--max-old-space-size=512 --no-warnings --max-http-header-size=65536" +ExecStart=/usr/bin/node /usr/share/kibana/src/cli/dist --config=/etc/kibana/kibana.yml +PrivateTmp=true +NoNewPrivileges=true +Restart=always [Install] WantedBy=multi-user.target diff --git a/tmpfile.conf b/tmpfile.conf new file mode 100644 index 000000000000..4f05d14ddd2f --- /dev/null +++ b/tmpfile.conf @@ -0,0 +1,5 @@ +d /etc/kibana 0750 kibana kibana - +Z /etc/kibana/kibana.yml 0640 kibana kibana - +d /usr/share/kibana 0755 kibana kibana - +Z /usr/share/kibana/optimize - kibana kibana - +Z /usr/share/kibana/data - kibana kibana - diff --git a/user.conf b/user.conf new file mode 100644 index 000000000000..4abe821ffe2d --- /dev/null +++ b/user.conf @@ -0,0 +1 @@ +u kibana 206 "Kibana user" /usr/share/kibana |