From 872b376f01f83633ed0b59c21e454c3dba360038 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:34:03 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- grafana.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grafana.spec b/grafana.spec index e3cc772..e28d5f6 100644 --- a/grafana.spec +++ b/grafana.spec @@ -25,7 +25,7 @@ end} Name: grafana Version: 10.2.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Metrics dashboard and graph editor License: AGPL-3.0-only URL: https://grafana.org @@ -1025,6 +1025,9 @@ done %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/*/active/modules/200/grafana %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 10.2.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 16 2025 Sam Feifer - 10.2.6-17 - Backport selinux policy changes - Backport selinux packaging changes in the spec file From 23e030d974cce9c7b87272012abef7bc86e52dd6 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 17:54:06 -0500 Subject: [PATCH 2/8] Rebuild for golang-1.25.0 --- grafana.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grafana.spec b/grafana.spec index e28d5f6..1ba8ff3 100644 --- a/grafana.spec +++ b/grafana.spec @@ -25,7 +25,7 @@ end} Name: grafana Version: 10.2.6 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Metrics dashboard and graph editor License: AGPL-3.0-only URL: https://grafana.org @@ -1025,6 +1025,9 @@ done %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/*/active/modules/200/grafana %changelog +* Fri Aug 15 2025 Maxwell G - 10.2.6-19 +- Rebuild for golang-1.25.0 + * Thu Jul 24 2025 Fedora Release Engineering - 10.2.6-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 28c9808c05b568ac9262a7dbf00f2cc194923448 Mon Sep 17 00:00:00 2001 From: Jan Kurik Date: Thu, 25 Sep 2025 07:29:59 +0200 Subject: [PATCH 3/8] Reworked gating to use CentOS test repository --- ci.fmf | 7 ++++++- gating.yaml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ci.fmf b/ci.fmf index 24f8837..b2f9ff9 100644 --- a/ci.fmf +++ b/ci.fmf @@ -1,2 +1,7 @@ ---- resultsdb-testcase: separate + +/gating: + plan: + import: + name: /plans/gating + url: https://gitlab.com/redhat/centos-stream/tests/grafana.git diff --git a/gating.yaml b/gating.yaml index 116ac6c..8a24c10 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,4 +4,4 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/gating.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./ci/gating.functional} From a1291fb28eb4b74dd165242cb4d98de3c0bf4daa Mon Sep 17 00:00:00 2001 From: Jan Kurik Date: Thu, 25 Sep 2025 08:40:57 +0200 Subject: [PATCH 4/8] Reworked gating to use CentOS test repository --- plans/gating.fmf | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 plans/gating.fmf diff --git a/plans/gating.fmf b/plans/gating.fmf deleted file mode 100644 index 5b0d2a0..0000000 --- a/plans/gating.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: CI Gating Plan -discover: - how: fmf - filter: tag:gating - url: https://src.fedoraproject.org/tests/grafana -execute: - how: tmt From a806424a305577f75f68e73f8a8ee10687bacb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 14:37:22 +0200 Subject: [PATCH 5/8] rebuild --- grafana.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grafana.spec b/grafana.spec index 1ba8ff3..1da9773 100644 --- a/grafana.spec +++ b/grafana.spec @@ -25,7 +25,7 @@ end} Name: grafana Version: 10.2.6 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Metrics dashboard and graph editor License: AGPL-3.0-only URL: https://grafana.org @@ -1025,6 +1025,9 @@ done %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/*/active/modules/200/grafana %changelog +* Fri Oct 10 2025 Alejandro Sáez - 10.2.6-20 +- rebuild + * Fri Aug 15 2025 Maxwell G - 10.2.6-19 - Rebuild for golang-1.25.0 From 46b52069d0e987bc73a8d1e2e259d61b859144c7 Mon Sep 17 00:00:00 2001 From: Jan Kurik Date: Wed, 15 Oct 2025 10:17:59 +0200 Subject: [PATCH 6/8] Use default gating config --- ci.fmf | 2 -- gating.yaml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci.fmf b/ci.fmf index b2f9ff9..1418a0c 100644 --- a/ci.fmf +++ b/ci.fmf @@ -1,5 +1,3 @@ -resultsdb-testcase: separate - /gating: plan: import: diff --git a/gating.yaml b/gating.yaml index 8a24c10..282e16b 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,4 +4,4 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./ci/gating.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} From 7b0c1da45432d52100a34ac9a18d6cd1edb0ad40 Mon Sep 17 00:00:00 2001 From: Sam Feifer Date: Tue, 2 Dec 2025 15:16:24 -0500 Subject: [PATCH 7/8] Fix grafana-selinux cgroups denials --- grafana.spec | 5 ++++- grafana.te | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/grafana.spec b/grafana.spec index 1da9773..0e60c23 100644 --- a/grafana.spec +++ b/grafana.spec @@ -25,7 +25,7 @@ end} Name: grafana Version: 10.2.6 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Metrics dashboard and graph editor License: AGPL-3.0-only URL: https://grafana.org @@ -1025,6 +1025,9 @@ done %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/*/active/modules/200/grafana %changelog +* Tue Dec 2 2025 Sam Feifer - 10.2.6-21 +- Fix grafana-selinux cgroups denials + * Fri Oct 10 2025 Alejandro Sáez - 10.2.6-20 - rebuild diff --git a/grafana.te b/grafana.te index 41f0cb3..a536e21 100644 --- a/grafana.te +++ b/grafana.te @@ -108,6 +108,16 @@ allow grafana_t self:unix_stream_socket connectto; allow grafana_t self:netlink_route_socket { create bind getattr nlmsg_read }; +optional_policy(` + require { + type cgroup_t; + class dir { search }; + class file { open read }; + } + allow grafana_t cgroup_t:dir search; + allow grafana_t cgroup_t:file { open read }; +') + optional_policy(` require { type smtp_port_t; From 3a728b088c254ca9b9b0093466fe1ab53fd88fa0 Mon Sep 17 00:00:00 2001 From: Sam Feifer Date: Wed, 3 Dec 2025 10:13:04 -0500 Subject: [PATCH 8/8] Fix recursive macro definition error in rpminspect --- grafana.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/grafana.spec b/grafana.spec index 0e60c23..c2867b0 100644 --- a/grafana.spec +++ b/grafana.spec @@ -19,13 +19,14 @@ end} %global gomodulesmode GO111MODULE=auto -%global gotestflags %{gotestflags} -tags=integration +%global _gotestflags_save %{?gotestflags} +%global gotestflags %{?_gotestflags_save} -tags=integration %global selinux_variants mls targeted Name: grafana Version: 10.2.6 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Metrics dashboard and graph editor License: AGPL-3.0-only URL: https://grafana.org @@ -1025,6 +1026,9 @@ done %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/*/active/modules/200/grafana %changelog +* Wed Dec 3 2025 Sam Feifer - 10.2.6-22 +- Fix recursive macro definition causing rpminspect failure + * Tue Dec 2 2025 Sam Feifer - 10.2.6-21 - Fix grafana-selinux cgroups denials