Accepting request 1313507 from server:monitoring

OBS-URL: https://build.opensuse.org/request/show/1313507
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grafana?expand=0&rev=80

_service

@@ -4,9 +4,8 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="versionrewrite-pattern">v(.*)-(.*)</param>
-    <param name="versionrewrite-replacement">\1\2</param>
-    <param name="revision">v11.6.3+security-01</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="revision">v11.6.7</param>
   </service>
   <service name="recompress" mode="manual">
     <param name="compression">gz</param>
@@ -14,6 +13,6 @@
   </service>
   <service name="set_version" mode="manual">
     <param name="basename">grafana</param>
-    <param name="version">11.6.3+security01</param>
+    <param name="version">11.6.7</param>
   </service>
 </services>

grafana-11.6.3+security01.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:693b6a5eab498df59c36e848044fb42c4c6fb4a238d3ab74c2eede6545afa8d9
-size 101231168

grafana-11.6.7.tar.gz

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

grafana.changes

@@ -1,3 +1,58 @@
+-------------------------------------------------------------------
+Fri Oct 24 12:01:51 UTC 2025 - Witek Bedyk <witold.bedyk@suse.com>
+
+- Use forked wire from Grafana repository instead of external
+  package.
+
+- Update to version 11.6.7:
+  Security:
+  * CVE-2025-47911: Fix parsing HTML documents (bsc#1251454)
+  * CVE-2025-58190: Fix excessive memory consumption (bsc#1251657)
+  Features and enhancements:
+  * Update to Go 1.25
+  * Update to golang.org/x/net v0.45.0
+  Bug fixes:
+  * Auth: Fix render user OAuth passthrough.
+  * LDAP Authentication: Fix URL to propagate username context as
+                         parameter.
+  * Plugins: Dependencies do not inherit parent URL for preinstall.
+  * URLParams: Stringify true values as key=true always (fixes
+               issues with variables with true value).
+
+-------------------------------------------------------------------
+Wed Oct  8 07:25:00 UTC 2025 - Witek Bedyk <witold.bedyk@suse.com>
+
+- Update to version 11.6.6:
+  Features and enhancements:
+  * Alerting: Update alerting module.
+  * Auditing: Document new options for recording datasource query
+              request/response body.
+  Bug fixes:
+  * Alerting: Fix copying of recording rule fields.
+  * Login: Fix redirection after login when Grafana is served from
+           subpath.
+
+- Update to version 11.6.5:
+  Features and enhancements:
+  * Alerting: Bump alerting package to include change to
+              NewTLSClient.
+
+- Update to version 11.6.4:
+  Security:
+  CVE-2025-11065: Fix sensitive information leak in logs
+                  (bsc#1250616)
+  Features and enhancements:
+  * StateTimeline: Add endTime to tooltip.
+  * Unified storage: Respect GF_DATABASE_URL override
+  Bug fixes:
+  * Alerting: Fix group interval override when adding new rules.
+  * Azure: Fix legend formatting.
+  * Azure: Fix resource name determination in template variable
+           queries.
+  * Graphite: Fix annotation queries.
+  * Graphite: Fix date mutation.
+  * Graphite: Fix nested variable interpolation for repeated rows.
+
 -------------------------------------------------------------------
 Tue Jul 22 13:10:21 UTC 2025 - Witek Bedyk <witold.bedyk@suse.com>
 

grafana.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grafana
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 %endif
 
 Name:           grafana
-Version:        11.6.3+security01
+Version:        11.6.7
 Release:        0
 Summary:        The open-source platform for monitoring and observability
 License:        AGPL-3.0-only
@@ -39,8 +39,7 @@ Source5:        0001-Add-source-code-reference.patch
 Patch2:         0002-Use-bash-instead-of-env.patch
 BuildRequires:  fdupes
 BuildRequires:  git-core
-BuildRequires:  wire
-BuildRequires:  golang(API) >= 1.24
+BuildRequires:  golang(API) >= 1.25
 Requires(post): %fillup_prereq
 Requires:       group(grafana)
 Requires:       user(grafana)
@@ -73,7 +72,7 @@ export GOFLAGS="-buildmode=pie"
 export CGO_ENABLED=1
 %endif
 %endif
-wire gen -tags 'oss' ./pkg/server
+go run ./pkg/build/wire/cmd/wire/main.go gen -tags "oss" -gen_tags "(!enterprise && !pro)" ./pkg/server
 go build -o . -ldflags '-X main.version=%{version}' ./pkg/cmd/...
 
 %install

vendor.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cb06ba5352c87c28aa6c0c09665f74bc6d7df6545bd6a4218560160be4ea539
-size 102766004
+oid sha256:843e3b32f942d3c03ea6d1243072a5b49fb58aae47023cb7a06a7c10d5d95488
+size 103448868