[arch-commits] Commit in grafana/repos (24 files)
Sébastien Luttringer
seblu at archlinux.org
Wed Jun 1 21:30:05 UTC 2016
Date: Wednesday, June 1, 2016 @ 23:30:05
Author: seblu
Revision: 177664
archrelease: copy trunk to community-x86_64, community-i686
Added:
grafana/repos/community-i686/PKGBUILD
(from rev 177663, grafana/trunk/PKGBUILD)
grafana/repos/community-i686/grafana.install
(from rev 177663, grafana/trunk/grafana.install)
grafana/repos/community-i686/grafana.service
(from rev 177663, grafana/trunk/grafana.service)
grafana/repos/community-i686/grafana.sysusers
(from rev 177663, grafana/trunk/grafana.sysusers)
grafana/repos/community-i686/grafana.tmpfiles
(from rev 177663, grafana/trunk/grafana.tmpfiles)
grafana/repos/community-x86_64/PKGBUILD
(from rev 177663, grafana/trunk/PKGBUILD)
grafana/repos/community-x86_64/grafana.install
(from rev 177663, grafana/trunk/grafana.install)
grafana/repos/community-x86_64/grafana.service
(from rev 177663, grafana/trunk/grafana.service)
grafana/repos/community-x86_64/grafana.sysusers
(from rev 177663, grafana/trunk/grafana.sysusers)
grafana/repos/community-x86_64/grafana.tmpfiles
(from rev 177663, grafana/trunk/grafana.tmpfiles)
Deleted:
grafana/repos/community-i686/01-config.patch
grafana/repos/community-i686/02-fix-influxdb0.11.1-multiple-queries.patch
grafana/repos/community-i686/PKGBUILD
grafana/repos/community-i686/grafana.install
grafana/repos/community-i686/grafana.service
grafana/repos/community-i686/grafana.sysusers
grafana/repos/community-i686/grafana.tmpfiles
grafana/repos/community-x86_64/01-config.patch
grafana/repos/community-x86_64/02-fix-influxdb0.11.1-multiple-queries.patch
grafana/repos/community-x86_64/PKGBUILD
grafana/repos/community-x86_64/grafana.install
grafana/repos/community-x86_64/grafana.service
grafana/repos/community-x86_64/grafana.sysusers
grafana/repos/community-x86_64/grafana.tmpfiles
---------------------------------------------------------------+
/PKGBUILD | 152 ++++++++++
/grafana.install | 40 ++
/grafana.service | 30 +
/grafana.sysusers | 2
/grafana.tmpfiles | 6
community-i686/01-config.patch | 49 ---
community-i686/02-fix-influxdb0.11.1-multiple-queries.patch | 32 --
community-i686/PKGBUILD | 82 -----
community-i686/grafana.install | 19 -
community-i686/grafana.service | 15
community-i686/grafana.sysusers | 1
community-i686/grafana.tmpfiles | 2
community-x86_64/01-config.patch | 49 ---
community-x86_64/02-fix-influxdb0.11.1-multiple-queries.patch | 32 --
community-x86_64/PKGBUILD | 82 -----
community-x86_64/grafana.install | 19 -
community-x86_64/grafana.service | 15
community-x86_64/grafana.sysusers | 1
community-x86_64/grafana.tmpfiles | 2
19 files changed, 230 insertions(+), 400 deletions(-)
Deleted: community-i686/01-config.patch
===================================================================
--- community-i686/01-config.patch 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-i686/01-config.patch 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,49 +0,0 @@
-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"
Deleted: community-i686/02-fix-influxdb0.11.1-multiple-queries.patch
===================================================================
--- community-i686/02-fix-influxdb0.11.1-multiple-queries.patch 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-i686/02-fix-influxdb0.11.1-multiple-queries.patch 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,32 +0,0 @@
-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>');
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-i686/PKGBUILD 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,82 +0,0 @@
-# $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:
Copied: grafana/repos/community-i686/PKGBUILD (from rev 177663, grafana/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-06-01 21:30:05 UTC (rev 177664)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Carsten Feuls <archlinux at carstenfeuls.de>
+# Contributor: Gilles Hamel <hamelg at laposte dot net>
+
+pkgname=grafana
+pkgver=3.0.4
+pkgrel=1
+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"
+ )
+install=$pkgname.install
+md5sums=('SKIP'
+ '2f1d73689923ecee92a102a65b91003a'
+ '49688ed04bb3fac45fd48d0ac99e52d5'
+ 'a23177c9e555a7d8ede65c86cf21add2')
+
+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
+ 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"
+ ln -s ../../../var/lib/grafana "$pkgdir/usr/share/grafana/data"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/grafana.install
===================================================================
--- community-i686/grafana.install 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-i686/grafana.install 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,19 +0,0 @@
-#/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:
Copied: grafana/repos/community-i686/grafana.install (from rev 177663, grafana/trunk/grafana.install)
===================================================================
--- community-i686/grafana.install (rev 0)
+++ community-i686/grafana.install 2016-06-01 21:30:05 UTC (rev 177664)
@@ -0,0 +1,20 @@
+#/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() {
+ post_install "$1"
+ 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:
Deleted: community-i686/grafana.service
===================================================================
--- community-i686/grafana.service 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-i686/grafana.service 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,15 +0,0 @@
-[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
Copied: grafana/repos/community-i686/grafana.service (from rev 177663, grafana/trunk/grafana.service)
===================================================================
--- community-i686/grafana.service (rev 0)
+++ community-i686/grafana.service 2016-06-01 21:30:05 UTC (rev 177664)
@@ -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
Deleted: community-i686/grafana.sysusers
===================================================================
--- community-i686/grafana.sysusers 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-i686/grafana.sysusers 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1 +0,0 @@
-u grafana - - /var/lib/grafana
Copied: grafana/repos/community-i686/grafana.sysusers (from rev 177663, grafana/trunk/grafana.sysusers)
===================================================================
--- community-i686/grafana.sysusers (rev 0)
+++ community-i686/grafana.sysusers 2016-06-01 21:30:05 UTC (rev 177664)
@@ -0,0 +1 @@
+u grafana - - /var/lib/grafana
Deleted: community-i686/grafana.tmpfiles
===================================================================
--- community-i686/grafana.tmpfiles 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-i686/grafana.tmpfiles 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,2 +0,0 @@
-d /var/lib/grafana 0755 grafana grafana -
-d /var/log/grafana 0755 grafana grafana -
Copied: grafana/repos/community-i686/grafana.tmpfiles (from rev 177663, grafana/trunk/grafana.tmpfiles)
===================================================================
--- community-i686/grafana.tmpfiles (rev 0)
+++ community-i686/grafana.tmpfiles 2016-06-01 21:30:05 UTC (rev 177664)
@@ -0,0 +1,3 @@
+d /var/lib/grafana 0755 grafana grafana -
+d /var/log/grafana 0755 grafana grafana -
+L /var/lib/grafana/log - - - - ../../log/grafana
Deleted: community-x86_64/01-config.patch
===================================================================
--- community-x86_64/01-config.patch 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-x86_64/01-config.patch 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,49 +0,0 @@
-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"
Deleted: community-x86_64/02-fix-influxdb0.11.1-multiple-queries.patch
===================================================================
--- community-x86_64/02-fix-influxdb0.11.1-multiple-queries.patch 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-x86_64/02-fix-influxdb0.11.1-multiple-queries.patch 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,32 +0,0 @@
-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>');
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-x86_64/PKGBUILD 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,82 +0,0 @@
-# $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:
Copied: grafana/repos/community-x86_64/PKGBUILD (from rev 177663, grafana/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-06-01 21:30:05 UTC (rev 177664)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Carsten Feuls <archlinux at carstenfeuls.de>
+# Contributor: Gilles Hamel <hamelg at laposte dot net>
+
+pkgname=grafana
+pkgver=3.0.4
+pkgrel=1
+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"
+ )
+install=$pkgname.install
+md5sums=('SKIP'
+ '2f1d73689923ecee92a102a65b91003a'
+ '49688ed04bb3fac45fd48d0ac99e52d5'
+ 'a23177c9e555a7d8ede65c86cf21add2')
+
+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
+ 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"
+ ln -s ../../../var/lib/grafana "$pkgdir/usr/share/grafana/data"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/grafana.install
===================================================================
--- community-x86_64/grafana.install 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-x86_64/grafana.install 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,19 +0,0 @@
-#/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:
Copied: grafana/repos/community-x86_64/grafana.install (from rev 177663, grafana/trunk/grafana.install)
===================================================================
--- community-x86_64/grafana.install (rev 0)
+++ community-x86_64/grafana.install 2016-06-01 21:30:05 UTC (rev 177664)
@@ -0,0 +1,20 @@
+#/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() {
+ post_install "$1"
+ 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:
Deleted: community-x86_64/grafana.service
===================================================================
--- community-x86_64/grafana.service 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-x86_64/grafana.service 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,15 +0,0 @@
-[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
Copied: grafana/repos/community-x86_64/grafana.service (from rev 177663, grafana/trunk/grafana.service)
===================================================================
--- community-x86_64/grafana.service (rev 0)
+++ community-x86_64/grafana.service 2016-06-01 21:30:05 UTC (rev 177664)
@@ -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
Deleted: community-x86_64/grafana.sysusers
===================================================================
--- community-x86_64/grafana.sysusers 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-x86_64/grafana.sysusers 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1 +0,0 @@
-u grafana - - /var/lib/grafana
Copied: grafana/repos/community-x86_64/grafana.sysusers (from rev 177663, grafana/trunk/grafana.sysusers)
===================================================================
--- community-x86_64/grafana.sysusers (rev 0)
+++ community-x86_64/grafana.sysusers 2016-06-01 21:30:05 UTC (rev 177664)
@@ -0,0 +1 @@
+u grafana - - /var/lib/grafana
Deleted: community-x86_64/grafana.tmpfiles
===================================================================
--- community-x86_64/grafana.tmpfiles 2016-06-01 21:29:43 UTC (rev 177663)
+++ community-x86_64/grafana.tmpfiles 2016-06-01 21:30:05 UTC (rev 177664)
@@ -1,2 +0,0 @@
-d /var/lib/grafana 0755 grafana grafana -
-d /var/log/grafana 0755 grafana grafana -
Copied: grafana/repos/community-x86_64/grafana.tmpfiles (from rev 177663, grafana/trunk/grafana.tmpfiles)
===================================================================
--- community-x86_64/grafana.tmpfiles (rev 0)
+++ community-x86_64/grafana.tmpfiles 2016-06-01 21:30:05 UTC (rev 177664)
@@ -0,0 +1,3 @@
+d /var/lib/grafana 0755 grafana grafana -
+d /var/log/grafana 0755 grafana grafana -
+L /var/lib/grafana/log - - - - ../../log/grafana
More information about the arch-commits
mailing list