From 037e6d9769c9ed7070a399bfbe4f6b3580efa31cda9185e5a1d1aa5e43b53060 Mon Sep 17 00:00:00 2001
From: Marius Kittler <marius.kittler@suse.com>
Date: Mon, 26 Feb 2024 14:41:56 +0000
Subject: [PATCH] Accepting request 1149888 from
 home:witekbedyk:branches:server:monitoring

- Update to version 10.1.7:
  * [SECURITY] CVE-2023-6152: Add email verification when updating
    user email (bsc#1219912)

OBS-URL: https://build.opensuse.org/request/show/1149888
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=126
---
 _service              |  2 +-
 _servicedata          |  2 +-
 grafana-10.1.5.tar.gz |  3 ---
 grafana-10.1.7.tar.gz |  3 +++
 grafana.changes       | 27 +++++++++++++++++++++++++++
 grafana.spec          |  4 ++--
 vendor.tar.gz         |  4 ++--
 7 files changed, 36 insertions(+), 9 deletions(-)
 delete mode 100644 grafana-10.1.5.tar.gz
 create mode 100644 grafana-10.1.7.tar.gz

diff --git a/_service b/_service
index 7d6021d..b3984ca 100644
--- a/_service
+++ b/_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">v10.1.5</param>
+    <param name="revision">v10.1.7</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/_servicedata b/_servicedata
index 6586ddb..79dbfa3 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/grafana/grafana</param>
-    <param name="changesrevision">849c612fcb7337cd2583d080070c519c8e54ebab</param>
+    <param name="changesrevision">50f6940ae646ce96dc580d3b76e50d69e4b63017</param>
   </service>
 </servicedata>
\ No newline at end of file
diff --git a/grafana-10.1.5.tar.gz b/grafana-10.1.5.tar.gz
deleted file mode 100644
index 1bde066..0000000
--- a/grafana-10.1.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49cd06695a98cca4a6e10e89f8ac4cdd5467abd923e8fa29c6302ce61da82c57
-size 74271137
diff --git a/grafana-10.1.7.tar.gz b/grafana-10.1.7.tar.gz
new file mode 100644
index 0000000..6480565
--- /dev/null
+++ b/grafana-10.1.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f873d2e3d628344e2f0581a3de062068d65290b7397d2ea90235f3f8bc80acce
+size 74212545
diff --git a/grafana.changes b/grafana.changes
index 0ab26ae..066cf3e 100644
--- a/grafana.changes
+++ b/grafana.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Tue Feb 20 17:13:47 UTC 2024 - witold.bedyk@suse.com
+
+- Update to version 10.1.7:
+  * [SECURITY] CVE-2023-6152: Add email verification when updating
+    user email (bsc#1219912)
+  * [FEATURE] DashboardSchema: Add options to VariableModel
+  * [BUGFIX] Annotations: Split cleanup into separate queries and
+    deletes to avoid deadlocks on MySQL
+
+- Update to version 10.1.6:
+  * [FEATURE] Alerting: Attempt to retry retryable errors
+  * [FEATURE] Azure: Add support for Workload Identity
+    authentication
+  * [BUGFIX] Alerting: Fix deleting rules in a folder with matching
+    UID in another organization
+  * [BUGFIX] Alerting: Make shareable alert rule link work if rule
+    name contains forward slashes
+  * [BUGFIX] Loki: Cache extracted labels to avoid too many sample
+    requests in code editor
+  * [BUGFIX] DataSourcePicker: Disable autocomplete for the search
+    input
+  * [BUGFIX] Plugins: Refresh plugin info after installation
+  * [BUGFIX] LDAP: FIX Enable users on successfull login
+  * [BUGFIX] Loki: Fix filters not being added with multiple
+    expressions and parsers
+
 -------------------------------------------------------------------
 Mon Oct 16 13:04:16 UTC 2023 - daniel@molkentin.de
 
diff --git a/grafana.spec b/grafana.spec
index 6e594fc..b785b41 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           grafana
-Version:        10.1.5
+Version:        10.1.7
 Release:        0
 Summary:        The open-source platform for monitoring and observability
 License:        AGPL-3.0-only
@@ -40,7 +40,7 @@ BuildRequires:  fdupes
 BuildRequires:  git-core
 BuildRequires:  golang-packaging
 BuildRequires:  wire
-BuildRequires:  golang(API) >= 1.19
+BuildRequires:  golang(API) >= 1.21
 Requires(post): %fillup_prereq
 Requires:       group(grafana)
 Requires:       user(grafana)
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 83579cb..bfaa76a 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11ab82d2f4fb9450b2044d4807123518873693b99b21966785523016f4c3ea0e
-size 28920149
+oid sha256:45ca7bce54702bf71ba449111b4aa2ee07d2aa9e95f475fe7e8441c2293290d3
+size 28936203