From ec46624fbe5284ce1de9f708641a5136f3cc5d79 Mon Sep 17 00:00:00 2001
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Thu, 1 Dec 2022 05:58:39 +0000
Subject: [PATCH] community/grafana: upgrade to 9.3.0
---
community/grafana/APKBUILD | 12 ++++-----
.../grafana/fix-dev-dashboards-tests.patch | 26 -------------------
2 files changed, 5 insertions(+), 33 deletions(-)
delete mode 100644 community/grafana/fix-dev-dashboards-tests.patch
diff --git a/community/grafana/APKBUILD b/community/grafana/APKBUILD
index b661f35d0f43..c853e7a480ca 100644
--- a/community/grafana/APKBUILD
+++ b/community/grafana/APKBUILD
@@ -4,10 +4,10 @@
# Keep in sync with grafana-frontend.
pkgname=grafana
-pkgver=9.2.6
+pkgver=9.3.0
pkgrel=0
-_commit=8ba6f0f1a8 # git rev-parse --short HEAD
-_stamp=1669108238 # git --no-pager show -s --format=%ct
+_commit=e9cb2a313e # git rev-parse --short HEAD
+_stamp=1669737832 # git --no-pager show -s --format=%ct
pkgdesc="Open source, feature rich metrics dashboard and graph editor"
url="https://grafana.com"
# x86, armhf, armv7: many test failures, for example https://github.com/grafana/grafana/issues/26389
@@ -22,8 +22,7 @@ subpackages="$pkgname-openrc"
options="net"
source="$pkgname-$pkgver.tar.gz::https://github.com/grafana/grafana/archive/v$pkgver.tar.gz
$pkgname.initd
- $pkgname.confd
- fix-dev-dashboards-tests.patch"
+ $pkgname.confd"
export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
@@ -91,8 +90,7 @@ package() {
}
sha512sums="
-080ac37976302c76fe47cd97a32d892d7f49f9a43d30bc9016033c707156c0a6323b6ab5ca74fc7b738e3b1979e2f3e5f398b09225894044ed4e5d59473e7523 grafana-9.2.6.tar.gz
+13a9d895cf5cda23bc866286fe31ec3e6601a66b56744a7e75fdd30e618ec0496bb1c5dffc7e32be3c38419d524944528ab5015c45a900559fea78998a2b33d4 grafana-9.3.0.tar.gz
98494f722fac4f8a28c33e2efda6f49896d137ede402f29f621712af5d575d29e4efcb0f920be5e04c269b8552cf8b31512673b9743bc7c4ce430882616ca4af grafana.initd
c2d9896ae9a9425f759a47aeab42b7c43b63328e82670d50185de8c08cda7b8df264c8b105c5c3138b90dd46e86598b16826457eb3b2979a899b3a508cbe4e8c grafana.confd
-de9cbf41fcaffc73422298f6d32fc95358657dcacf9fa6e991e45f472aec894c3be406407ab289615a7cccc14a9014dd654a376470534adff009180389f64fa6 fix-dev-dashboards-tests.patch
"
diff --git a/community/grafana/fix-dev-dashboards-tests.patch b/community/grafana/fix-dev-dashboards-tests.patch
deleted file mode 100644
index 677523f3b07e..000000000000
--- a/community/grafana/fix-dev-dashboards-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Schema requires these fields to be either unset or >0.
-
-diff --git a/devenv/dev-dashboards/panel-graph/graph-ng-stacking2.json b/devenv/dev-dashboards/panel-graph/graph-ng-stacking2.json
-index 60d9a661b9..901aacf420 100644
---- a/devenv/dev-dashboards/panel-graph/graph-ng-stacking2.json
-+++ b/devenv/dev-dashboards/panel-graph/graph-ng-stacking2.json
-@@ -22,7 +22,6 @@
- ]
- },
- "editable": true,
-- "fiscalYearStartMonth": 0,
- "graphTooltip": 0,
- "links": [],
- "liveNow": false,
-diff --git a/devenv/dev-dashboards/panel-heatmap/heatmap-calculate-log.json b/devenv/dev-dashboards/panel-heatmap/heatmap-calculate-log.json
-index 5481b136d9..73e441e0c1 100644
---- a/devenv/dev-dashboards/panel-heatmap/heatmap-calculate-log.json
-+++ b/devenv/dev-dashboards/panel-heatmap/heatmap-calculate-log.json
-@@ -22,7 +22,6 @@
- ]
- },
- "editable": true,
-- "fiscalYearStartMonth": 0,
- "graphTooltip": 1,
- "links": [],
- "liveNow": false,
--
GitLab