From 311cad74f820cd0e34be6304bf70996b1e79ae1b264c8b7fa543d001db1e036a Mon Sep 17 00:00:00 2001
From: Witek Bedyk <witold.bedyk@suse.com>
Date: Mon, 8 Jun 2020 08:01:19 +0000
Subject: [PATCH] Accepting request 811894 from home:jcavalheiro:monitoring

Update to 7.0.3 - Fix CVE-2020-13379

OBS-URL: https://build.opensuse.org/request/show/811894
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=43
---
 _service             |  6 +++---
 _servicedata         |  2 +-
 grafana-7.0.1.tar.gz |  3 ---
 grafana-7.0.3.tar.gz |  3 +++
 grafana.changes      | 19 +++++++++++++++++++
 grafana.spec         |  2 +-
 vendor.tar.gz        |  4 ++--
 7 files changed, 29 insertions(+), 10 deletions(-)
 delete mode 100644 grafana-7.0.1.tar.gz
 create mode 100644 grafana-7.0.3.tar.gz

diff --git a/_service b/_service
index 7069375..ba751fb 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/grafana/grafana</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">7.0.1</param>
-    <param name="revision">v7.0.1</param>
+    <param name="versionformat">7.0.3</param>
+    <param name="revision">v7.0.3</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="disabled">
@@ -15,6 +15,6 @@
     <param name="basename">grafana</param>
   </service>
   <service name="go_modules" mode="disabled">
-    <param name="archive">grafana-7.0.1.tar.gz</param>
+    <param name="archive">grafana-7.0.3.tar.gz</param>
   </service>
 </services>
diff --git a/_servicedata b/_servicedata
index 355437d..ba1ae7a 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">ef5b586d7d9e561b78c8aaa098c4e9f1e3a78d62</param>
+    <param name="changesrevision">00ee734baf8ddc86839cb20e8f6e9cb8aeb6c754</param>
   </service>
 </servicedata>
\ No newline at end of file
diff --git a/grafana-7.0.1.tar.gz b/grafana-7.0.1.tar.gz
deleted file mode 100644
index 6a04777..0000000
--- a/grafana-7.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02eb48ac7dfccd91c93c9eceb6149855836b918e8eb1075fcff12daa0265eb68
-size 30097564
diff --git a/grafana-7.0.3.tar.gz b/grafana-7.0.3.tar.gz
new file mode 100644
index 0000000..ca60ddf
--- /dev/null
+++ b/grafana-7.0.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:359848a98c4c96a6bafb24fad53d62a5bcc837d378e100bbb88bcd129d4e6b76
+size 30105298
diff --git a/grafana.changes b/grafana.changes
index 2fb5740..5345867 100644
--- a/grafana.changes
+++ b/grafana.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Jun 05 10:31:13 UTC 2020 - jcavalheiro@suse.com
+
+- Update to version 7.0.3
+  * Features / Enhancements
+    - Stats: include all fields. #24829, @ryantxu
+    - Variables: change VariableEditorList row action Icon to IconButton. #25217, @hshoff
+  * Bug fixes
+    - Cloudwatch: Fix dimensions of DDoSProtection. #25317, @papagian
+    - Configuration: Fix env var override of sections containing hyphen. #25178, @marefr
+    - Dashboard: Get panels in collapsed rows. #25079, @peterholmberg
+    - Do not show alerts tab when alerting is disabled. #25285, @dprokop
+    - Jaeger: fixes cascader option label duration value. #25129, @Estrax
+    - Transformations: Fixed Transform tab crash & no update after adding first transform. #25152, @torkelo
+
+- Update to version 7.0.2
+  * Bug fixes
+    - Security: Urgent security patch release to fix CVE-2020-13379
+
 -------------------------------------------------------------------
 Mon Jun 01 13:12:54 UTC 2020 - jcavalheiro@suse.com
 
diff --git a/grafana.spec b/grafana.spec
index 2465f82..6860cfc 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -26,7 +26,7 @@
 %endif
 
 Name:           grafana
-Version:        7.0.1
+Version:        7.0.3
 Release:        0
 Summary:        Dashboards and editors for Graphite, InfluxDB, OpenTSDB
 License:        Apache-2.0
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 2f5fe79..00faa18 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b918ed51e1e0e250db950c4c575adb7d0dc4cea24d66e2d410e9d723fb7743a
-size 8867890
+oid sha256:ed2b96225606754d6283b140043f4c380220e693eb9317f8b7c4de87ee9d1fa6
+size 8867680