Accepting request 1274371 from server:monitoring

OBS-URL: https://build.opensuse.org/request/show/1274371
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=71
This commit is contained in:
2025-05-05 20:28:22 +00:00
committed by Git OBS Bridge
8 changed files with 46 additions and 38 deletions

View File

@@ -1,28 +0,0 @@
diff --git a/go.mod b/go.mod
index c8b9d1ba5eb..48dbe231802 100644
--- a/go.mod
+++ b/go.mod
@@ -41,7 +41,7 @@ require (
github.com/fatih/color v1.17.0 // @grafana/grafana-backend-group
github.com/fullstorydev/grpchan v1.1.1 // @grafana/grafana-backend-group
github.com/gchaincl/sqlhooks v1.3.0 // @grafana/grafana-search-and-storage
- github.com/go-jose/go-jose/v3 v3.0.3 // @grafana/identity-access-team
+ github.com/go-jose/go-jose/v3 v3.0.4 // @grafana/identity-access-team
github.com/go-kit/log v0.2.1 // @grafana/grafana-backend-group
github.com/go-ldap/ldap/v3 v3.4.4 // @grafana/identity-access-team
github.com/go-openapi/loads v0.22.0 // @grafana/alerting-backend
diff --git a/go.sum b/go.sum
index 41643ba4ce9..d1bf6924732 100644
--- a/go.sum
+++ b/go.sum
@@ -1146,8 +1146,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
-github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
+github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY=
+github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=

View File

@@ -26,7 +26,6 @@ tar:
patch --no-backup-if-mismatch -p1 -i ../../0001-Add-source-code-reference.patch && \
# End patches section \
# Patches for Go modules go after here \
patch --no-backup-if-mismatch -p1 -i ../../0003-Bump-go-jose.patch && \
# End of Go modules patches section \
go mod download && \
go mod verify && \

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">v11.5.2</param>
<param name="revision">v11.5.4</param>
</service>
<service name="recompress" mode="manual">
<param name="compression">gz</param>

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:84a224b4a23137d47e71ce9e0cbfcf4cf9d21aeb09978a21f4400b19707e7904
size 97165183

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

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b07540d60620aafeb33bcc062c84176c8d8cd2ffca83e9c8fa7ee67cd935c15
size 97362489

View File

@@ -1,3 +1,40 @@
-------------------------------------------------------------------
Tue Apr 29 09:43:38 UTC 2025 - Witek Bedyk <witold.bedyk@suse.com>
- Drop 0003-Bump-go-jose.patch
- Update to version 11.5.4:
Features and enhancements:
* Azure Monitor: Filter namespaces by resource group
* Azure: Add support for custom namespace and custom metrics
variable queries
* Azure: Resource picker improvements
* Azure: Support more complex variable interpolation
* Azure: Variable editor and resource picker improvements
* DashboardScenePage: Correct slug in self referencing data links
* Dependencies: Bump github.com/redis/go-redis/v9
(CVE-2025-29923)
* Prometheus: Add support for cloud partners Prometheus data
sources
Bug fixes:
* InfluxDB: Fix nested variable interpolation
Security:
* CVE-2025-3454
* CVE-2025-2703
* CVE-2025-30204: Bump github.com/golang-jwt/jwt/v5 (bsc#1240503)
- Update to version 11.5.3:
Bug fixes:
* Alerting: Fix token-based Slack image upload to work with
channel names
* Auth: Fix AzureAD config UI's ClientAuthentication dropdown
* Dashboard: Fix the unintentional time range and variables
updates on saving
* Dashboards: Fix missing v/e/i keybindings to return back to
dashboard
* InfluxDB: Improve handling of template variables contained in
regular expressions (InfluxQL)
* Org redirection: Fix linking between orgs
-------------------------------------------------------------------
Mon Mar 10 11:27:53 UTC 2025 - Witek Bedyk <witold.bedyk@suse.com>
@@ -57,6 +94,8 @@ Tue Feb 11 13:16:26 UTC 2025 - Witek Bedyk <witold.bedyk@suse.com>
* Dashboards: Customizable shareable dashboard panel images
* Datasources: Time series macro support in visual query builder
for SQL data sources
Security:
* CVE-2024-6104: Bump OpenFGA to version 1.6.2 (bsc#1227039)
- Update to version 11.4.0:
Features and enhancements:

View File

@@ -22,7 +22,7 @@
%endif
Name: grafana
Version: 11.5.2
Version: 11.5.4
Release: 0
Summary: The open-source platform for monitoring and observability
License: AGPL-3.0-only
@@ -37,8 +37,6 @@ Source3: README
Source4: Makefile
Source5: 0001-Add-source-code-reference.patch
Patch2: 0002-Use-bash-instead-of-env.patch
# CVE-2025-27144
Patch3: 0003-Bump-go-jose.patch
BuildRequires: fdupes
BuildRequires: git-core
BuildRequires: wire

View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da562a6c4e845a8cfa28c6ab934d4a7d4c9d43dfe43f94a01e57a049dd1d441a
size 78302714
oid sha256:39bafc0ceb7b75ac1e0514fa272a4759f54f5cc82057af0d7ac7011929d5e614
size 78121937