Compare commits
No commits in common. "c8s" and "c8-beta" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1 @@
|
|||||||
SOURCES/rig-1.1.tar.gz
|
SOURCES/rig-1.1.tar.gz
|
||||||
/rig-1.1.tar.gz
|
|
||||||
|
|||||||
1
.rig.metadata
Normal file
1
.rig.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
5d4696794a5f5ff18d05a8595bbc53562b5f372a SOURCES/rig-1.1.tar.gz
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Name: rig
|
Name: rig
|
||||||
Summary: Monitor a system for events and trigger specific actions
|
Summary: Monitor a system for events and trigger specific actions
|
||||||
Version: 1.1
|
Version: 1.1
|
||||||
Release: 4%{?dist}
|
Release: 3%{?dist}
|
||||||
Url: https://github.com/TurboTurtle/rig
|
Url: https://github.com/TurboTurtle/rig
|
||||||
Source0: %{url}/archive/%{name}-%{version}.tar.gz
|
Source0: %{url}/archive/%{name}-%{version}.tar.gz
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
@ -17,7 +17,6 @@ BuildRequires: python3dist(psutil)
|
|||||||
|
|
||||||
Patch1: rig-fix-rig-list.patch
|
Patch1: rig-fix-rig-list.patch
|
||||||
Patch2: rig-full-random-temp.patch
|
Patch2: rig-full-random-temp.patch
|
||||||
Patch3: sos-modify-sosreport-binary.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Rig is a utility designed to watch or monitor specific system resources (e.g.
|
Rig is a utility designed to watch or monitor specific system resources (e.g.
|
||||||
@ -29,7 +28,6 @@ troubleshooting and data collection for randomly occurring events.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build
|
%py3_build
|
||||||
@ -50,9 +48,6 @@ install -p -m644 man/en/rig.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
|
|||||||
%doc README.md
|
%doc README.md
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Aug 06 2025 Jose Castillo <jcastill@redhat.com> - 1.1-4
|
|
||||||
- Add fix to avoid using deprecated sosreport command.
|
|
||||||
|
|
||||||
* Mon Jun 13 2022 Jake Hunsaker <jhunsake@redhat.com> - 1.1-3
|
* Mon Jun 13 2022 Jake Hunsaker <jhunsake@redhat.com> - 1.1-3
|
||||||
- Backport change to temp dir creation to ignore rig ID
|
- Backport change to temp dir creation to ignore rig ID
|
||||||
|
|
||||||
@ -68,4 +63,4 @@ install -p -m644 man/en/rig.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
|
|||||||
- RHBZ#1888705
|
- RHBZ#1888705
|
||||||
|
|
||||||
* Tue Jul 28 2020 Jake Hunsaker <jhunsake@redhat.com> - 1.0-1
|
* Tue Jul 28 2020 Jake Hunsaker <jhunsake@redhat.com> - 1.0-1
|
||||||
- Version 1.0 release
|
- Version 1.0 release
|
||||||
@ -1,7 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-8
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
|
||||||
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
From 57c2d62fd86522714e3eacc3fcd76ff8ad780e0b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jose Castillo <jcastillo@redhat.com>
|
|
||||||
Date: Thu, 7 Aug 2025 09:04:25 +0100
|
|
||||||
Subject: [PATCH] [sos] Modify sosreport binary
|
|
||||||
|
|
||||||
The 'sosreport' command has been deprecated in
|
|
||||||
sos upstream, and users should use now 'sos report' instead.
|
|
||||||
This commit prevents an error that occurs
|
|
||||||
when calling the old sos binary.
|
|
||||||
|
|
||||||
Signed-off-by: Jose Castillo <jcastillo@redhat.com>
|
|
||||||
---
|
|
||||||
rig-c9s/rig-rig-1.1/rigging/actions/sosreport.py | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/rigging/actions/sosreport.py b/rigging/actions/sosreport.py
|
|
||||||
index 5f7435a..abf6471 100644
|
|
||||||
--- a/rigging/actions/sosreport.py
|
|
||||||
+++ b/rigging/actions/sosreport.py
|
|
||||||
@@ -14,7 +14,7 @@ from pipes import quote
|
|
||||||
from rigging.actions import BaseAction
|
|
||||||
from rigging.exceptions import CannotConfigureRigError
|
|
||||||
|
|
||||||
-SOS_BIN = '/usr/sbin/sosreport --batch'
|
|
||||||
+SOS_BIN = '/usr/sbin/sos report --batch'
|
|
||||||
|
|
||||||
|
|
||||||
class SoSReport(BaseAction):
|
|
||||||
@@ -23,7 +23,7 @@ class SoSReport(BaseAction):
|
|
||||||
enabling_opt = 'sosreport'
|
|
||||||
enabling_opt_desc = 'Generate an sos report when triggered'
|
|
||||||
priority = 100
|
|
||||||
- required_binaries = ('sosreport',)
|
|
||||||
+ required_binaries = ('sos',)
|
|
||||||
sos_opts = ('only_plugins', 'skip_plugins', 'enable_plugins',
|
|
||||||
'plugin_option')
|
|
||||||
|
|
||||||
--
|
|
||||||
2.50.1
|
|
||||||
Loading…
Reference in New Issue
Block a user