Accepting request 1067107 from server:monitoring

OBS-URL: https://build.opensuse.org/request/show/1067107
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=41

0001-Add-source-code-reference.patch

@@ -1,38 +1,39 @@
-From 6fb703952cbbdf7c0c2b629061db1e0aaae6f984 Mon Sep 17 00:00:00 2001
-From: Witek Bedyk <witold.bedyk@suse.com>
-Date: Thu, 20 Jan 2022 15:16:54 +0100
+From 3dd318d8ddc8db3f84020c448e283620cc5d09ac Mon Sep 17 00:00:00 2001
+From: Marius Kittler <mkittler@suse.de>
+Date: Mon, 6 Feb 2023 13:51:31 +0100
 Subject: [PATCH] Add source code reference
 
 ---
- public/app/core/components/Footer/Footer.tsx | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
+ public/app/core/components/Footer/Footer.tsx | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
 
 diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx
-index 9096de3910..8bed2ef5a2 100644
+index c73c2ea53..829700096 100644
 --- a/public/app/core/components/Footer/Footer.tsx
 +++ b/public/app/core/components/Footer/Footer.tsx
-@@ -46,15 +46,12 @@ export let getVersionLinks = (): FooterLink[] => {
- 
-   links.push({ text: `v${buildInfo.version} (${buildInfo.commit})` });
+@@ -73,15 +73,13 @@ export let getVersionLinks = (): FooterLink[] => {
+     url: hasReleaseNotes ? `https://github.com/grafana/grafana/blob/main/CHANGELOG.md` : undefined,
+   });
  
 -  if (buildInfo.hasUpdate) {
 -    links.push({
+-      target: '_blank',
 -      id: 'updateVersion',
 -      text: `New version available!`,
 -      icon: 'download-alt',
 -      url: 'https://grafana.com/grafana/download?utm_source=grafana_footer',
--      target: '_blank',
 -    });
 -  }
 +  links.push({
++    target: '_blank',
++    id: 'updateVersion',
 +    text: `Source code`,
 +    icon: 'download-alt',
 +    url: 'https://build.opensuse.org/package/show/openSUSE:Factory/grafana',
-+    target: '_blank',
 +  });
  
    return links;
  };
 -- 
-2.31.1
+2.39.1
 

0002-Update-exporter-toolkit-to-version-0.7.3.patch

@@ -1,23 +1,39 @@
-From: Witek Bedyk <witold.bedyk@suse.com>
+From fe7cb5dac2c678145910f429c1ab26da58cf4d53 Mon Sep 17 00:00:00 2001
+From: Marius Kittler <mkittler@suse.de>
+Date: Fri, 17 Feb 2023 16:00:07 +0100
 Subject: [PATCH] Update exporter-toolkit to version 0.7.3
 
 ---
  go.mod | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ go.sum | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/go.mod b/go.mod
-index 2572cebe7e..91829bc695 100644
+index 680633de9..f38a4a16b 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -218,7 +218,7 @@ require (
+@@ -209,7 +209,7 @@ require (
  	github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
  	github.com/pmezard/go-difflib v1.0.0 // indirect
  	github.com/prometheus/common/sigv4 v0.1.0 // indirect
--	github.com/prometheus/exporter-toolkit v0.7.0 // indirect
+-	github.com/prometheus/exporter-toolkit v0.7.1 // indirect
 +	github.com/prometheus/exporter-toolkit v0.7.3 // indirect
  	github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 // indirect
- 	github.com/prometheus/procfs v0.7.3 // indirect
- 	github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc // indirect
+ 	github.com/prometheus/procfs v0.8.0 // indirect
+ 	github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect
+diff --git a/go.sum b/go.sum
+index 58bf25e11..6d43b91ef 100644
+--- a/go.sum
++++ b/go.sum
+@@ -2150,6 +2150,8 @@ github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QY
+ github.com/prometheus/exporter-toolkit v0.6.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
+ github.com/prometheus/exporter-toolkit v0.7.1 h1:c6RXaK8xBVercEeUQ4tRNL8UGWzDHfvj9dseo1FcK1Y=
+ github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
++github.com/prometheus/exporter-toolkit v0.7.3 h1:IYBn0CTGi/nYxstdTUKysuSofUNJ3DQW3FmZ/Ub6rgU=
++github.com/prometheus/exporter-toolkit v0.7.3/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
+ github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 h1:dTUS1vaLWq+Y6XKOTnrFpoVsQKLCbCp1OLj24TDi7oM=
+ github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289/go.mod h1:FGbBv5OPKjch+jNUJmEQpMZytIdyW0NdBtWFcfSKusc=
+ github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 -- 
-2.35.3
+2.39.1
 

_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">v8.5.20</param>
+    <param name="revision">v9.3.6</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">e927a6459fd6c493628fa2cf5ba494c01427bca2</param>
+    <param name="changesrevision">978237e7cbe35c06d4be0e9c40670c64af2029eb</param>
   </service>
 </servicedata>

grafana-8.5.20.tar.gz

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

grafana-9.3.6.tar.gz

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

grafana.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           grafana
-Version:        8.5.20
+Version:        9.3.6
 Release:        0
 Summary:        The open-source platform for monitoring and observability
 License:        AGPL-3.0-only

vendor.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a418f8ec6a2ac62838fe0a2707b4e547136ba2adac93fd06d2f35acdc012cc8f
-size 20406957
+oid sha256:13eb66fbc40d42ef0e8a5218657598d227d1d05ab3566c9b4e55198a7c450d47
+size 21550631