Accepting request 932047 from server:monitoring

- 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) (forwarded request 932046 from oertel)

OBS-URL: https://build.opensuse.org/request/show/932047
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2021-11-18 09:34:48 +00:00 committed by Git OBS Bridge
commit 94df28375b
8 changed files with 57 additions and 21 deletions

View File

@ -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.7</param>
<param name="revision">v7.5.11</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">

View File

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

View File

@ -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

3
grafana-7.5.11.tar.gz Normal file
View File

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

View File

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

View File

@ -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 <witold.bedyk@suse.com>

View File

@ -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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:407b835c1df3cdd675ee0422bd53fa09ca7ef17330f114ed6bc7fc1e849fbe9a
size 11947755
oid sha256:7698449102fdbe16005c239e9e58017ec749937afb6d0098a871405b3cfbecb4
size 11963918