[arch-commits] Commit in grafana/trunk (5 files)
Sébastien Luttringer
seblu at archlinux.org
Wed Jun 1 21:29:44 UTC 2016
Date: Wednesday, June 1, 2016 @ 23:29:43
Author: seblu
Revision: 177663
upgpkg: grafana 3.0.4-1
Modified:
grafana/trunk/PKGBUILD
grafana/trunk/grafana.install
grafana/trunk/grafana.tmpfiles
Deleted:
grafana/trunk/01-config.patch
grafana/trunk/02-fix-influxdb0.11.1-multiple-queries.patch
----------------------------------------------+
01-config.patch | 49 -------------------------
02-fix-influxdb0.11.1-multiple-queries.patch | 32 ----------------
PKGBUILD | 14 ++-----
grafana.install | 1
grafana.tmpfiles | 1
5 files changed, 6 insertions(+), 91 deletions(-)
Deleted: 01-config.patch
===================================================================
--- 01-config.patch 2016-06-01 21:26:34 UTC (rev 177662)
+++ 01-config.patch 2016-06-01 21:29:43 UTC (rev 177663)
@@ -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: 02-fix-influxdb0.11.1-multiple-queries.patch
===================================================================
--- 02-fix-influxdb0.11.1-multiple-queries.patch 2016-06-01 21:26:34 UTC (rev 177662)
+++ 02-fix-influxdb0.11.1-multiple-queries.patch 2016-06-01 21:29:43 UTC (rev 177663)
@@ -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>');
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-06-01 21:26:34 UTC (rev 177662)
+++ PKGBUILD 2016-06-01 21:29:43 UTC (rev 177663)
@@ -4,8 +4,8 @@
# Contributor: Gilles Hamel <hamelg at laposte dot net>
pkgname=grafana
-pkgver=2.6.0
-pkgrel=3
+pkgver=3.0.4
+pkgrel=1
pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
url='http://grafana.org'
arch=('x86_64' 'i686')
@@ -17,16 +17,12 @@
"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')
+ 'a23177c9e555a7d8ede65c86cf21add2')
prepare() {
cd $pkgname
@@ -52,9 +48,6 @@
# 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
@@ -77,6 +70,7 @@
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:
Modified: grafana.install
===================================================================
--- grafana.install 2016-06-01 21:26:34 UTC (rev 177662)
+++ grafana.install 2016-06-01 21:29:43 UTC (rev 177663)
@@ -9,6 +9,7 @@
# 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
Modified: grafana.tmpfiles
===================================================================
--- grafana.tmpfiles 2016-06-01 21:26:34 UTC (rev 177662)
+++ grafana.tmpfiles 2016-06-01 21:29:43 UTC (rev 177663)
@@ -1,2 +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