[arch-commits] Commit in (10 files)
Sébastien Luttringer
seblu at archlinux.org
Wed Apr 27 00:51:48 UTC 2016
Date: Wednesday, April 27, 2016 @ 02:51:47
Author: seblu
Revision: 171942
Move grafana from AUR
Added:
grafana/
grafana/repos/
grafana/trunk/
grafana/trunk/01-config.patch
grafana/trunk/02-fix-influxdb0.11.1-multiple-queries.patch
grafana/trunk/PKGBUILD
grafana/trunk/grafana.install
grafana/trunk/grafana.service
grafana/trunk/grafana.sysusers
grafana/trunk/grafana.tmpfiles
----------------------------------------------+
01-config.patch | 49 ++++++++++++++
02-fix-influxdb0.11.1-multiple-queries.patch | 32 +++++++++
PKGBUILD | 82 +++++++++++++++++++++++++
grafana.install | 19 +++++
grafana.service | 15 ++++
grafana.sysusers | 1
grafana.tmpfiles | 2
7 files changed, 200 insertions(+)
Added: grafana/trunk/01-config.patch
===================================================================
--- grafana/trunk/01-config.patch (rev 0)
+++ grafana/trunk/01-config.patch 2016-04-27 00:51:47 UTC (rev 171942)
@@ -0,0 +1,49 @@
+diff --git a/conf/defaults.ini b/conf/defaults.ini
+index 258a019..6a7bd6b 100644
+--- a/conf/defaults.ini
++++ b/conf/defaults.ini
+@@ -9,11 +9,11 @@ app_mode = production
+ [paths]
+ # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+ #
+-data = data
++data = /var/lib/grafana
+ #
+ # Directory where grafana can store logs
+ #
+-logs = data/log
++logs = /var/log/grafana
+
+ #################################### Server ####################################
+ [server]
+@@ -40,7 +40,7 @@ root_url = %(protocol)s://%(domain)s:%(http_port)s/
+ router_logging = false
+
+ # the path relative working path
+-static_root_path = public
++static_root_path = /usr/share/grafana/public
+
+ # enable gzip
+ enable_gzip = false
+@@ -62,7 +62,7 @@ password =
+ ssl_mode = disable
+
+ # For "sqlite3" only, path relative to data_path setting
+-path = grafana.db
++path = /var/lib/grafana/grafana.db
+
+ #################################### Session ####################################
+ [session]
+diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go
+index 9d5ddd0..aa0aa9e 100644
+--- a/pkg/components/renderer/renderer.go
++++ b/pkg/components/renderer/renderer.go
+@@ -21,7 +21,7 @@ type RenderOpts struct {
+
+ func RenderToPng(params *RenderOpts) (string, error) {
+ log.Info("PhantomRenderer::renderToPng url %v", params.Url)
+- binPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, "phantomjs"))
++ binPath := "/usr/bin/phantomjs"
+ scriptPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, "render.js"))
+ pngPath, _ := filepath.Abs(filepath.Join(setting.ImagesDir, util.GetRandomString(20)))
+ pngPath = pngPath + ".png"
Added: grafana/trunk/02-fix-influxdb0.11.1-multiple-queries.patch
===================================================================
--- grafana/trunk/02-fix-influxdb0.11.1-multiple-queries.patch (rev 0)
+++ grafana/trunk/02-fix-influxdb0.11.1-multiple-queries.patch 2016-04-27 00:51:47 UTC (rev 171942)
@@ -0,0 +1,32 @@
+diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js
+index a23937c..b401f44 100644
+--- a/public/app/plugins/datasource/influxdb/datasource.js
++++ b/public/app/plugins/datasource/influxdb/datasource.js
+@@ -46,7 +46,7 @@ function (angular, _, dateMath, InfluxSeries, InfluxQuery) {
+ query = query.replace(/\$interval/g, (target.interval || options.interval));
+ return query;
+
+- }).join("\n");
++ }).join(";\n");
+
+ // replace grafana variables
+ allQueries = allQueries.replace(/\$timeFilter/g, timeFilter);
+diff --git a/public/vendor/angular/angular.js b/public/vendor/angular/angular.js
+index f7442c0..2d283c4 100644
+--- a/public/vendor/angular/angular.js
++++ b/public/vendor/angular/angular.js
+@@ -1373,7 +1373,6 @@ function encodeUriQuery(val, pctEncodeSpaces) {
+ replace(/%3A/gi, ':').
+ replace(/%24/g, '$').
+ replace(/%2C/gi, ',').
+- replace(/%3B/gi, ';').
+ replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+ }
+
+@@ -28361,4 +28360,4 @@ var minlengthDirective = function() {
+
+ })(window, document);
+
+-!window.angular.$$csp() && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
+\ No newline at end of file
++!window.angular.$$csp() && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
Added: grafana/trunk/PKGBUILD
===================================================================
--- grafana/trunk/PKGBUILD (rev 0)
+++ grafana/trunk/PKGBUILD 2016-04-27 00:51:47 UTC (rev 171942)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Carsten Feuls <archlinux at carstenfeuls.de>
+# Contributor: Gilles Hamel <hamelg at laposte dot net>
+
+pkgname=grafana
+pkgver=2.6.0
+pkgrel=3
+pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
+url='http://grafana.org'
+arch=('x86_64' 'i686')
+license=('Apache')
+depends=('glibc')
+makedepends=('git' 'go' 'godep' 'nodejs-grunt-cli' 'npm' 'phantomjs')
+backup=("etc/grafana.ini")
+source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver"
+ "grafana.service"
+ "grafana.sysusers"
+ "grafana.tmpfiles"
+ "01-config.patch"
+ "02-fix-influxdb0.11.1-multiple-queries.patch"
+ )
+install=$pkgname.install
+md5sums=('SKIP'
+ '2f1d73689923ecee92a102a65b91003a'
+ '49688ed04bb3fac45fd48d0ac99e52d5'
+ '19b2559970998bbc320d112df0673c03'
+ 'f676cfe7bdd2463e2600ff8fce75a2d6'
+ '49cba56cf9d13615f8fd382c98bd1961')
+
+prepare() {
+ cd $pkgname
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -N -i "$srcdir/$filename"
+ fi
+ done
+ :
+}
+
+build() {
+ export GOPATH="$srcdir/$pkgname"
+ export PATH="$PATH:$GOPATH/bin"
+ cd "$GOPATH"
+ go run build.go setup
+ godep restore
+ mkdir -p "$GOPATH/src/github.com/grafana/grafana/"
+ ln -s "$GOPATH/pkg" "$GOPATH/src/github.com/grafana/grafana/"
+
+ # Build frontend assets
+ npm install
+ # Install phantomjs in this directory as well for some reason. Can be removed after next patch: https://github.com/grafana/grafana/issues/2999
+ cd node_modules/karma-phantomjs-launcher
+ npm install
+ cd "$GOPATH"
+ grunt
+ grunt build
+ grunt build-post-process
+
+ # build the backend
+ # no longer doing package build since this just kicks off rpm/deb builds at the end.
+ #go run build.go build package
+ go run build.go build
+}
+
+package() {
+ install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf"
+ install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf"
+ install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service"
+ cd $pkgname
+ install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server"
+ install -Dm644 conf/sample.ini "$pkgdir/etc/$pkgname.ini"
+ install -Dm644 conf/defaults.ini "$pkgdir/usr/share/$pkgname/conf/defaults.ini"
+ install -dm755 "$pkgdir/usr/share/grafana/"
+ cp -r vendor "$pkgdir/usr/share/grafana/"
+ cp -r public_gen "$pkgdir/usr/share/grafana/public"
+}
+
+# vim:set ts=2 sw=2 et:
Property changes on: grafana/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: grafana/trunk/grafana.install
===================================================================
--- grafana/trunk/grafana.install (rev 0)
+++ grafana/trunk/grafana.install 2016-04-27 00:51:47 UTC (rev 171942)
@@ -0,0 +1,19 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ systemd-sysusers grafana.conf
+ systemd-tmpfiles --create grafana.conf
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if (( "$(vercmp $2 2.6.0-3)" < 0 )); then
+ echo '==> Configuration moved to /etc/grafana.ini'
+ fi
+ return 0
+}
+
+
+# vim:set ts=2 sw=2 et:
Added: grafana/trunk/grafana.service
===================================================================
--- grafana/trunk/grafana.service (rev 0)
+++ grafana/trunk/grafana.service 2016-04-27 00:51:47 UTC (rev 171942)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Grafana service
+After=network.target
+
+[Service]
+User=grafana
+Group=grafana
+WorkingDirectory=/usr/share/grafana
+ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini
+LimitNOFILE=10000
+TimeoutStopSec=20
+SuccessExitStatus=0 2
+
+[Install]
+WantedBy=multi-user.target
Added: grafana/trunk/grafana.sysusers
===================================================================
--- grafana/trunk/grafana.sysusers (rev 0)
+++ grafana/trunk/grafana.sysusers 2016-04-27 00:51:47 UTC (rev 171942)
@@ -0,0 +1 @@
+u grafana - - /var/lib/grafana
Added: grafana/trunk/grafana.tmpfiles
===================================================================
--- grafana/trunk/grafana.tmpfiles (rev 0)
+++ grafana/trunk/grafana.tmpfiles 2016-04-27 00:51:47 UTC (rev 171942)
@@ -0,0 +1,2 @@
+d /var/lib/grafana 0755 grafana grafana -
+d /var/log/grafana 0755 grafana grafana -
More information about the arch-commits
mailing list