diff --git a/_service b/_service index c3e6e73..9d79c63 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ .git @PARENT_TAG@ v(.*) - v7.5.7 + v7.5.11 enable diff --git a/_servicedata b/_servicedata index da8432a..e876dc2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/grafana/grafana - 91de51771c79f4f38ddd14a51baeae72140ec828 + 6f8c1d9fe4421e02563097e03a389f1221126f57 \ No newline at end of file diff --git a/drop-grafana-aws-sdk-0.3.0-module.patch b/drop-grafana-aws-sdk-0.3.0-module.patch deleted file mode 100644 index e7d5db2..0000000 --- a/drop-grafana-aws-sdk-0.3.0-module.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Pdpru grafana-7.5.3.orig/go.mod grafana-7.5.3/go.mod ---- grafana-7.5.3.orig/go.mod 2021-04-07 12:36:01.000000000 +0200 -+++ grafana-7.5.3/go.mod 2021-04-12 16:21:12.616379578 +0200 -@@ -43,7 +43,6 @@ require ( - github.com/google/go-cmp v0.5.4 - github.com/google/uuid v1.2.0 - github.com/gosimple/slug v1.9.0 -- github.com/grafana/grafana-aws-sdk v0.3.0 - github.com/grafana/grafana-aws-sdk v0.4.0 - github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4 - github.com/grafana/grafana-plugin-sdk-go v0.88.0 diff --git a/grafana-7.5.11.tar.gz b/grafana-7.5.11.tar.gz new file mode 100644 index 0000000..399a166 --- /dev/null +++ b/grafana-7.5.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07323bd5d09a2d8a2d2c24ba90f4c09dafdc6e141d492183f1714f949d725dd3 +size 11249848 diff --git a/grafana-7.5.7.tar.gz b/grafana-7.5.7.tar.gz deleted file mode 100644 index ff7f5d7..0000000 --- a/grafana-7.5.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73153332d00ac9a5b63395c81e6a1532ace94904cc4840ab75f42b4cdfaa2ad1 -size 32555914 diff --git a/grafana.changes b/grafana.changes index 2999ad3..7d8140e 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Wed Nov 17 23:32:21 UTC 2021 - ro@suse.de + +- Update to version 7.5.11: + * Fix certs issue (#40002) + * Release v7.5.11 (#124) + * Fix static path matching issue in macaron + * OAuth: add docs for disableAutoLogin param (#38752) (#38894) + * Fix #747; remove 'other variables'. (#37866) (#37878) + * Update alert docs (#33658) (#33659) + * [7.5.x] Docs: added documentation for the "prepare time series"-transformation. (#36836) + * cherry picked dc5778c303ca555b70e8ca8c28e95997e26ecfc1 (#36813) + * "Release: Updated versions in package to 7.5.10" (#36792) + * [v7.5.x] Transformations: add 'prepare time series' transformer (#36749) + * Remove verify-drone from windows (#36775) + * Update queries.md (#31941) (#36764) + * Updated content to specify method to use to get keyboard shortcuts wh… (#36084) (#36087) + * ReleaseNotes: Updated changelog and release notes for 7.5.9 (#36057) (#36077) + * "Release: Updated versions in package to 7.5.9" (#36056) + * Login: Fixes Unauthorized message showing when on login page or snapshot page (#35311) (#35880) + * ReleaseNotes: Updated changelog and release notes for 7.5.8 (#35703) (#35822) + * CI: Upgrade pipeline tool to use main (#35804) + * CI: try to force v7.5.x instead of master (#35799) + * CI: supports move from master to main in 7.5.x release branch (#35747) + * "Release: Updated versions in package to 7.5.8" (#35701) + * Chore: Bump acorn and lodash-es (#35650) + * Snapshots: Remove dashboard links from snapshots (#35567) (#35585) + * [v7.5.x] Datasource: Allow configuring `MaxConnsPerHost` (#35519) + * Remove docs sync from v7.5.x (#35443) + * "Release: Updated versions in package to 7.5.7" (#35412) + * Add max_idle_connections_per_host to config (#35365) + * Update go.sum to fix failing enterprise pipeline (#35353) + * [v7.5.x] HTTP Client: Introduce `go-conntrack` (#35321) + * Fix Markdown syntax in enterprise/license/_index.md (#34683) (#35210) + * Update annotations.md (#33218) (#35138) + * Docs: Add query caching to enterprise docs page (#34751) (#35025) + * [7.5.x] Admin: hide per role counts for licensed users (#34994) + * cleanup shortcodes, image paths (#34827) + * Security: Upgrade Thrift dependency (#34698) (#34702) + * Docs: Fix Quick Start link on Geting Started Influx page (#34549) (#34603) + * Add link to release notes v7.5.7 (#34460) (#34474) + * Update 7.5.x landing page (#34447) + * ReleaseNotes: Updated changelog and release notes for 7.5.7 (#34383) (#34428) +- update to 7.5.10 + * [v7.5.x] Transformations: add "prepare time series" transformer. [#36749] +- update to 7.5.9 + * Login: Fix Unauthorized message that is displayed on sign-in or snapshot page. [#35880] +- drop drop-grafana-aws-sdk-0.3.0-module.patch (upstream) + ------------------------------------------------------------------- Tue Sep 21 07:27:09 UTC 2021 - Witek Bedyk diff --git a/grafana.spec b/grafana.spec index 8a462ba..057be85 100644 --- a/grafana.spec +++ b/grafana.spec @@ -22,7 +22,7 @@ %endif Name: grafana -Version: 7.5.7 +Version: 7.5.11 Release: 0 Summary: The open-source platform for monitoring and observability License: Apache-2.0 @@ -36,7 +36,6 @@ Source3: README # Makefile to automate build process Source4: Makefile Source5: 0001-Add-source-code-reference.patch -Patch1: drop-grafana-aws-sdk-0.3.0-module.patch BuildRequires: fdupes BuildRequires: git-core BuildRequires: golang-packaging @@ -64,7 +63,6 @@ dashboards and data with teams. %prep %setup -q -n grafana-%{version} %setup -q -T -D -a 1 -n grafana-%{version} -%patch1 -p1 %build %goprep github.com/grafana/grafana diff --git a/vendor.tar.gz b/vendor.tar.gz index 072c201..25b58f0 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:407b835c1df3cdd675ee0422bd53fa09ca7ef17330f114ed6bc7fc1e849fbe9a -size 11947755 +oid sha256:7698449102fdbe16005c239e9e58017ec749937afb6d0098a871405b3cfbecb4 +size 11963918