Accepting request 949301 from home:witekbedyk:branches:server:monitoring

- Update to version 8.3.4 (jsc#PM-3191)
- Update changelog
- Update license to GNU Affero General Public License v3.0.

OBS-URL: https://build.opensuse.org/request/show/949301
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=67

0001-Add-source-code-reference.patch

@@ -1,22 +1,23 @@
-From 4a0ab78a061ac25039f33a3f9b620ef0f8032d3a Mon Sep 17 00:00:00 2001
+From 6fb703952cbbdf7c0c2b629061db1e0aaae6f984 Mon Sep 17 00:00:00 2001
 From: Witek Bedyk <witold.bedyk@suse.com>
-Date: Thu, 16 Sep 2021 15:43:01 +0200
-Subject: [PATCH] Patch SLE15 source code
+Date: Thu, 20 Jan 2022 15:16:54 +0100
+Subject: [PATCH] Add source code reference
 
 ---
- public/app/core/components/Footer/Footer.tsx | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
+ public/app/core/components/Footer/Footer.tsx | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
 
 diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx
-index 5b7be702bd..4b4948c30e 100644
+index 9096de3910..8bed2ef5a2 100644
 --- a/public/app/core/components/Footer/Footer.tsx
 +++ b/public/app/core/components/Footer/Footer.tsx
-@@ -45,14 +45,12 @@ export let getVersionLinks = (): FooterLink[] => {
+@@ -46,15 +46,12 @@ export let getVersionLinks = (): FooterLink[] => {
  
    links.push({ text: `v${buildInfo.version} (${buildInfo.commit})` });
  
 -  if (buildInfo.hasUpdate) {
 -    links.push({
+-      id: 'updateVersion',
 -      text: `New version available!`,
 -      icon: 'download-alt',
 -      url: 'https://grafana.com/grafana/download?utm_source=grafana_footer',
@@ -33,5 +34,5 @@ index 5b7be702bd..4b4948c30e 100644
    return links;
  };
 -- 
-2.26.2
+2.31.1
 

Makefile

@@ -25,7 +25,7 @@ tar:
 	# Patches for the JS frontend go after here \
 	patch -p1 -i ../../0001-Add-source-code-reference.patch && \
 	# End patches section \
-	yarn install --pure-lockfile && \
+	yarn install --immutable && \
 	yarn run build && \
 	cd .. && \
 	echo "Updating $$basename/public in tarball..." && \

_service

@@ -5,7 +5,7 @@
     <param name="exclude">.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v7.5.12</param>
+    <param name="revision">v8.3.4</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="disabled">

_servicedata

@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/grafana/grafana</param>
-    <param name="changesrevision">896df7435dfd03ce9f4665e7af8c07fc72743283</param>
+    <param name="changesrevision">a551d74b11dd89b512d642da5b620225a5d88cc9</param>
   </service>
 </servicedata>

grafana-7.5.12.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07b7cb61120cc79d688a06fa0b35877e262146286d47b11d90b241e39a40c9ef
-size 32706947

grafana-8.3.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7b7d1e9984d58e4d9814a79f741f95c854b6a4d5fdb1f965fe95aaa27ebcc2b
+size 46200318

grafana.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grafana
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,10 +22,10 @@
 %endif
 
 Name:           grafana
-Version:        7.5.12
+Version:        8.3.4
 Release:        0
 Summary:        The open-source platform for monitoring and observability
-License:        Apache-2.0
+License:        AGPL-3.0-only
 Group:          System/Monitoring
 URL:            http://grafana.org/
 Source:         %{name}-%{version}.tar.gz
@@ -39,15 +39,13 @@ Source5:        0001-Add-source-code-reference.patch
 BuildRequires:  fdupes
 BuildRequires:  git-core
 BuildRequires:  golang-packaging
-BuildRequires:  golang(API) >= 1.15
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  wire
+BuildRequires:  golang(API) >= 1.17
 Requires(post): %fillup_prereq
 Requires:       group(grafana)
 Requires:       user(grafana)
 %systemd_ordering
 
-%go_nostrip
-
 # Exclude s390 on SLE12, since golang 1.14 itself is not built for this arch on SLE12
 # See https://build.suse.de/package/view_file/SUSE:SLE-12:Update/go1.14/go1.14.spec?expand=1
 %if 0%{?suse_version} == 1315
@@ -76,13 +74,12 @@ export IMPORTPATH="github.com/grafana/grafana"
 export BUILDFLAGS="-v -p 4 -x -buildmode=pie -mod=vendor"
 export GOPATH=%{_builddir}/go:%{_builddir}/contrib
 export GOBIN=%{_builddir}/go/bin
+wire gen -tags 'oss' ./pkg/server ./pkg/cmd/grafana-cli/runner
 go install $BUILDFLAGS -ldflags '-X main.version=%{version}' $IMPORTPATH/pkg/cmd/...
 
 %install
 %goinstall
 
-# we're missing %%gosrc and %%gofilelist... (although that *might* be ok...)
-
 install -Dm644 {packaging/rpm/systemd/,%{buildroot}%{_unitdir}/}%{name}-server.service
 install -dm755 %{buildroot}%{_sbindir}
 ln -s %{_sbindir}/service  %{buildroot}%{_sbindir}/rc%{name}-server

vendor.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:328fe119f5c8fe6ccfc66209781077e28d6d1be84b4a8e17c3cb7779ebe1a6a9
-size 11965425
+oid sha256:3064ce1cbf8699eb93ca7b2d38cddb6cf8cde132f03a52ac441af8d126e8f6b0
+size 16948630