Accepting request 1298088 from server:monitoring

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

0002-Use-bash-instead-of-env.patch

@@ -0,0 +1,30 @@
+Index: grafana-11.3.0/packaging/wrappers/grafana
+===================================================================
+--- grafana-11.3.0.orig/packaging/wrappers/grafana
++++ grafana-11.3.0/packaging/wrappers/grafana
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env bash
++#!/bin/bash
+ 
+ # Wrapper for the grafana binary
+ # This file serves as a wrapper for the grafana binary. It ensures we set
+Index: grafana-11.3.0/packaging/wrappers/grafana-cli
+===================================================================
+--- grafana-11.3.0.orig/packaging/wrappers/grafana-cli
++++ grafana-11.3.0/packaging/wrappers/grafana-cli
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env bash
++#!/bin/bash
+ 
+ # Wrapper for the grafana binary
+ # This file serves as a wrapper for the grafana binary. It ensures we set
+Index: grafana-11.3.0/packaging/wrappers/grafana-server
+===================================================================
+--- grafana-11.3.0.orig/packaging/wrappers/grafana-server
++++ grafana-11.3.0/packaging/wrappers/grafana-server
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env bash
++#!/bin/bash
+ 
+ # Wrapper for the grafana binary
+ # This file serves as a wrapper for the grafana binary. It ensures we set

Makefile

@@ -25,9 +25,11 @@ tar:
 	# Patches for the JS frontend go after here \
 	patch --no-backup-if-mismatch -p1 -i ../../0001-Add-source-code-reference.patch && \
 	# End patches section \
+	# Patches for Go modules go after here \
+	# End of Go modules patches section \
 	go mod download && \
 	go mod verify && \
-	go mod vendor && \
+	go work vendor && \
 	tar --format=posix -cf ../../vendor.tar vendor && \
 	# avoid ".git can't be found" \
 	git init && \

_constraints

@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 <constraints>
   <hardware>
+    <physicalmemory>
+      <size unit="G">8</size>
+    </physicalmemory>
     <disk>
-      <size unit="G">5</size>
+      <size unit="G">12</size>
     </disk>
   </hardware>
 </constraints>

_service

@@ -4,9 +4,9 @@
     <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-pattern">v(.*)-(.*)</param>
-    <param name="revision">v10.3.5</param>
+    <param name="versionrewrite-replacement">\1\2</param>
-    <param name="changesgenerate">enable</param>
+    <param name="revision">v11.6.3+security-01</param>
   </service>
   <service name="recompress" mode="manual">
     <param name="compression">gz</param>
@@ -14,5 +14,6 @@
   </service>
   <service name="set_version" mode="manual">
     <param name="basename">grafana</param>
+    <param name="version">11.6.3+security01</param>
   </service>
 </services>

_servicedata

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

grafana-10.3.5.tar.gz

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

grafana-11.6.3+security01.tar.gz

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

grafana.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grafana
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # 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:        10.3.5
+Version:        11.6.3+security01
 Release:        0
 Summary:        The open-source platform for monitoring and observability
 License:        AGPL-3.0-only
@@ -36,10 +36,11 @@ Source3:        README
 # Makefile to automate build process
 Source4:        Makefile
 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.21
+BuildRequires:  golang(API) >= 1.24
 Requires(post): %fillup_prereq
 Requires:       group(grafana)
 Requires:       user(grafana)
@@ -50,6 +51,8 @@ Requires:       user(grafana)
 %if 0%{?suse_version} == 1315
 ExcludeArch:    s390
 %endif
+# Exclue ix86 architectures as they are not supported and do not build
+ExcludeArch:    %{ix86}
 
 %description
 A graph and dashboard builder for visualizing time series metrics.
@@ -59,11 +62,16 @@ dashboards and data with teams.
 
 %prep
 %setup -q -n grafana-%{version}
-%setup -q -T -D -a 1 -n grafana-%{version}
+%autosetup -T -D -a 1 -p1 -n grafana-%{version}
+# Check if frontend assets have been built
+test -d public/build
 
 %build
 %ifnarch ppc64
 export GOFLAGS="-buildmode=pie"
+%ifarch s390x armv7hl armv7l armv7l:armv6l:armv5tel armv6hl
+export CGO_ENABLED=1
+%endif
 %endif
 wire gen -tags 'oss' ./pkg/server
 go build -o . -ldflags '-X main.version=%{version}' ./pkg/cmd/...
@@ -93,6 +101,11 @@ install -d -m0750 %{buildroot}%{_localstatedir}/log/%{name}
 install -d -m0755 %{buildroot}/%{_localstatedir}/lib/%{name}/plugins
 install -d -m0755 %{buildroot}/%{_localstatedir}/lib/%{name}/dashboards
 install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/provisioning/dashboards
+install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/provisioning/datasources
+install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/provisioning/plugins
+install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/provisioning/notifiers
+install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/provisioning/access-control
+install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/provisioning/alerting
 
 install -Dm640 conf/sample.ini %{buildroot}%{_sysconfdir}/%{name}/%{name}.ini
 install -Dm640 {conf/,%{buildroot}%{_sysconfdir}/%{name}/}ldap.toml
@@ -100,6 +113,9 @@ install -Dm644 {conf/,%{buildroot}%{_datadir}/%{name}/conf/}defaults.ini
 install -m644 {conf/,%{buildroot}%{_datadir}/%{name}/conf/}sample.ini
 install -Dm644 {conf/provisioning/dashboards/,%{buildroot}%{_datadir}/%{name}/conf/provisioning/dashboards/}sample.yaml
 install -Dm644 {conf/provisioning/datasources/,%{buildroot}%{_datadir}/%{name}/conf/provisioning/datasources/}sample.yaml
+install -Dm644 {conf/provisioning/plugins/,%{buildroot}%{_datadir}/%{name}/conf/provisioning/plugins/}sample.yaml
+install -Dm644 {conf/provisioning/access-control/,%{buildroot}%{_datadir}/%{name}/conf/provisioning/access-control/}sample.yaml
+install -Dm644 {conf/provisioning/alerting/,%{buildroot}%{_datadir}/%{name}/conf/provisioning/alerting/}sample.yaml
 cp -pr public %{buildroot}%{_datadir}/%{name}/
 install -d -m755 %{buildroot}%{_datadir}/%{name}/vendor
 install -d -m755 %{buildroot}%{_datadir}/%{name}/tools
@@ -110,7 +126,8 @@ install -d -m755 %{buildroot}%{_datadir}/%{name}/tools
 %fdupes %{buildroot}/%{_datadir}
 
 %check
-#gotest github.com/grafana/grafana/pkg...
+./grafana server -v
+./grafana cli -v
 
 %pre
 %service_add_pre %{name}-server.service
@@ -138,6 +155,11 @@ install -d -m755 %{buildroot}%{_datadir}/%{name}/tools
 %attr(0755,root,root) %dir %{_sysconfdir}/%{name}
 %attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning
 %attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/dashboards
+%attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/datasources
+%attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/plugins
+%attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/access-control
+%attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/alerting
+%attr(0755,root,root) %dir %{_sysconfdir}/%{name}/provisioning/notifiers
 %attr(0755,root,grafana) %dir %{_datadir}/%{name}/conf
 %attr(0640,root,grafana) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
 %attr(0640,root,grafana) %config(noreplace) %{_sysconfdir}/%{name}/ldap.toml
@@ -148,6 +170,9 @@ install -d -m755 %{buildroot}%{_datadir}/%{name}/tools
 %doc %{_datadir}/%{name}/conf/sample.ini
 %doc %{_datadir}/%{name}/conf/provisioning/dashboards/sample.yaml
 %doc %{_datadir}/%{name}/conf/provisioning/datasources/sample.yaml
+%doc %{_datadir}/%{name}/conf/provisioning/plugins/sample.yaml
+%doc %{_datadir}/%{name}/conf/provisioning/access-control/sample.yaml
+%doc %{_datadir}/%{name}/conf/provisioning/alerting/sample.yaml
 %config %{_datadir}/%{name}/conf/defaults.ini
 %{_datadir}/%{name}
 

vendor.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:686a03dc420c44160098f6cce26ec24304820684e6834d4e3b31f47954c7ba39
+oid sha256:2cb06ba5352c87c28aa6c0c09665f74bc6d7df6545bd6a4218560160be4ea539
-size 54076020
+size 102766004