Skip to content

Commit b7c4a9f

Browse files
committed
feat: Rename files
Change-Id: I1b6dc21408812586480b6c12aaff70fb6c6d6ec2
1 parent 9d7fd37 commit b7c4a9f

File tree

343 files changed

+9917
-9794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+9917
-9794
lines changed

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ name: Feature request
33
about: Suggest an idea for this project
44
---
55

6-
**What are you missing in citellus?**
6+
**What are you missing in Risu?**
77

88
**Additional info**

.github/labels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ repo:
55
documentation:
66
- doc/**/*
77

8-
citellus:
9-
- citellusclient/**/*
8+
risu:
9+
- risuclient/**/*
1010

1111
magui:
1212
- maguiclient/**/*

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
- name: Test with pytest
4848
run: |
49-
pytest --cov-report=xml --cov=citellusclient --cov=maguiclient
49+
pytest --cov-report=xml --cov=risuclient --cov=maguiclient
5050
5151
- name: Upload coverage to Codecov
5252
uses: codecov/[email protected]

.releaserc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"branch": "master",
3-
"repositoryUrl": "[email protected]:citellusorg/citellus.git",
3+
"repositoryUrl": "[email protected]:risuorg/risu.git",
44
"tagFormat": "${version}",
55
"plugins": [
66
"@semantic-release/commit-analyzer",

CHANGELOG.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
# [1.5.0](https://github.com/citellusorg/citellus/compare/1.4.0...1.5.0) (2021-05-03)
1+
# [1.5.0](https://github.com/risuorg/risu/compare/1.4.0...1.5.0) (2021-05-03)
22

33
### Features
44

5-
- **citellus.html:** match window title with report name ([f18aad9](https://github.com/citellusorg/citellus/commit/f18aad9f0e6582f6deb1190dda1bc98152a6028b))
5+
- **risu.html:** match window title with report name ([f18aad9](https://github.com/risuorg/risu/commit/f18aad9f0e6582f6deb1190dda1bc98152a6028b))
66

7-
# [1.4.0](https://github.com/citellusorg/citellus/compare/1.3.3...1.4.0) (2021-05-03)
7+
# [1.4.0](https://github.com/risuorg/risu/compare/1.3.3...1.4.0) (2021-05-03)
88

99
### Features
1010

11-
- **shell.py:** search for configuration file in current directory automatically ([2379374](https://github.com/citellusorg/citellus/commit/2379374ea86869ae5b458add35604a4cf33a992a))
11+
- **shell.py:** search for configuration file in current directory automatically ([2379374](https://github.com/risuorg/risu/commit/2379374ea86869ae5b458add35604a4cf33a992a))
1212

13-
## [1.3.3](https://github.com/citellusorg/citellus/compare/1.3.2...1.3.3) (2021-04-21)
13+
## [1.3.3](https://github.com/risuorg/risu/compare/1.3.2...1.3.3) (2021-04-21)
1414

1515
### Bug Fixes
1616

17-
- **nagios.py:** unknown is defined as RC 3 ([0ae7617](https://github.com/citellusorg/citellus/commit/0ae7617357d9e4cab3bf45f9523ea207169c8863))
17+
- **nagios.py:** unknown is defined as RC 3 ([0ae7617](https://github.com/risuorg/risu/commit/0ae7617357d9e4cab3bf45f9523ea207169c8863))
1818

19-
## [1.3.2](https://github.com/citellusorg/citellus/compare/1.3.1...1.3.2) (2021-04-21)
19+
## [1.3.2](https://github.com/risuorg/risu/compare/1.3.1...1.3.2) (2021-04-21)
2020

2121
### Bug Fixes
2222

23-
- **nagios.py:** Also consider UKNOWN as SKIPPED ([6ca49dd](https://github.com/citellusorg/citellus/commit/6ca49dd2df7a75e1f4fff0318fa8a6c29a8739d6))
23+
- **nagios.py:** Also consider UKNOWN as SKIPPED ([6ca49dd](https://github.com/risuorg/risu/commit/6ca49dd2df7a75e1f4fff0318fa8a6c29a8739d6))
2424

25-
## [1.3.1](https://github.com/citellusorg/citellus/compare/1.3.0...1.3.1) (2021-04-21)
25+
## [1.3.1](https://github.com/risuorg/risu/compare/1.3.0...1.3.1) (2021-04-21)
2626

2727
### Bug Fixes
2828

29-
- **nagios.py:** Also process WARNING as RC_INFO for Nagios plugins ([f38efce](https://github.com/citellusorg/citellus/commit/f38efce9a13961d3b9c967390df2846e4cffc6cb))
29+
- **nagios.py:** Also process WARNING as RC_INFO for Nagios plugins ([f38efce](https://github.com/risuorg/risu/commit/f38efce9a13961d3b9c967390df2846e4cffc6cb))
3030

31-
# [1.3.0](https://github.com/citellusorg/citellus/compare/1.2.0...1.3.0) (2021-04-20)
31+
# [1.3.0](https://github.com/risuorg/risu/compare/1.2.0...1.3.0) (2021-04-20)
3232

3333
### Features
3434

35-
- **citellus.html:** Use html file name for finding the json data ([69246dd](https://github.com/citellusorg/citellus/commit/69246dde55f6204bb9ea9a79d0a83f36200fc3f4))
35+
- **risu.html:** Use html file name for finding the json data ([69246dd](https://github.com/risuorg/risu/commit/69246dde55f6204bb9ea9a79d0a83f36200fc3f4))
3636

37-
# [1.2.0](https://github.com/citellusorg/citellus/compare/1.1.1...1.2.0) (2021-04-20)
37+
# [1.2.0](https://github.com/risuorg/risu/compare/1.1.1...1.2.0) (2021-04-20)
3838

3939
### Features
4040

41-
- **nagios.py:** Add Nagios extension to process shell scripts with standard return codes 0/1/2 ([1d2776a](https://github.com/citellusorg/citellus/commit/1d2776ae4fab4c825ee8a2f35e53bbdc0e9ec4c4))
41+
- **nagios.py:** Add Nagios extension to process shell scripts with standard return codes 0/1/2 ([1d2776a](https://github.com/risuorg/risu/commit/1d2776ae4fab4c825ee8a2f35e53bbdc0e9ec4c4))
4242

43-
## [1.1.1](https://github.com/citellusorg/citellus/compare/1.1.0...1.1.1) (2020-10-18)
43+
## [1.1.1](https://github.com/risuorg/risu/compare/1.1.0...1.1.1) (2020-10-18)
4444

4545
### Bug Fixes
4646

47-
- **release.yml:** use automation via GHA for release process ([9011813](https://github.com/citellusorg/citellus/commit/901181398adfed12e78d0e550f71ab79f4aaafd1))
47+
- **release.yml:** use automation via GHA for release process ([9011813](https://github.com/risuorg/risu/commit/901181398adfed12e78d0e550f71ab79f4aaafd1))

CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

CONTRIBUTING.md

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
**Table of contents**
2+
3+
<!-- TOC depthFrom:1 insertAnchor:false orderedList:false -->
4+
5+
- [How to file a bug report](#how-to-file-a-bug-report)
6+
- [How to contribute code](#how-to-contribute-code)
7+
- [How to write tests](#how-to-write-tests)
8+
- [How to debug your test](#how-to-debug-your-test)
9+
10+
<!-- /TOC -->
11+
12+
## How to file a bug report
13+
14+
If you have any suggestions for improvements please do not hesitate to
15+
open an [issue](https://github.com/risuorg/risu/issues/new).
16+
17+
## How to contribute code
18+
19+
We encourage you to contribute new plugins. Use Pull Requests to provide your contributions to the repo.
20+
21+
[gerrithub]: https://gerrithub.io/
22+
23+
1. Clone the risu repository:
24+
`git clone https://github.com/risuorg/risu`
25+
2. Install pre-commit (from pipsi for example) and prepare the hook:
26+
`pre-commit install`
27+
3. Check out a branch in which to make your changes:
28+
`git checkout -b "your-new-branch"`
29+
4. Edit your files and validate with tox:
30+
`tox # this will check the changes for some errors`
31+
NOTE: tox will run python 2.7, pep8 and python 3.5 tests, if your environment lacks for example python 3.5, do execute tox -l to see the available tests and skip that one, for example:
32+
33+
```sh
34+
tox -e pep8
35+
tox -e py27 # We're skipping tox -e py35 which is also invoked by default when tox is executed without arguments.
36+
```
37+
38+
In this way, errors that might be relevant to the test environment can be skipped. For example this one reported at issue tracker as [104](https://github.com/risuorg/risu/issues/104))
39+
40+
5. Update your local repository:
41+
`git add $modified_files git commit`
42+
43+
For the message, please use a short line with the fix and the subject like `[plugins][openstack][nova] Check nova configuration XXX`
44+
45+
If the commit fixes a github open issue, also use `Closes #$ISSUEID` so github automatically closes it once merged referencing the commit.
46+
47+
6. Submit your changes for review:
48+
49+
`git push`
50+
51+
7. Then, use repository Pull-Request method to request the change to be incorporated/reviewed
52+
53+
git-review
54+
55+
Then wait for your changes to be reviewed. It is common for reviewers
56+
to request changes; when this happens:
57+
58+
1. Edit your files and revalidate with tox:
59+
60+
tox # this will check the new changes for some errors
61+
62+
2. Update your existing commit. Do not create a new commit! We want to get each new PR into one commit.
63+
64+
git add $modified_files
65+
git commit --amend
66+
67+
3. Resubmit the change:
68+
69+
git push --force
70+
71+
4) Once the new plugin has been submitted you'll see some GitHub actions feedback (similars to the ones that you run with `tox`)
72+
73+
## How to write tests
74+
75+
Please refer to the
76+
[templates](https://github.com/risuorg/risu/tree/master/doc/templates)
77+
folder for examples.
78+
79+
Specially remember about the headers:
80+
81+
```
82+
# long_name: plug long name for webui
83+
# description: plug description
84+
# bugzilla: bz url
85+
# priority: 0<>1000 for likelihood to break your environment if this test reports fail
86+
# kb: url-to-kbase
87+
```
88+
89+
That are used by Risu to fill json metadata.
90+
91+
If you want to contribute also Unittests for your plugins, check [TESTING.md](TESTING.md)
92+
93+
For contributing translations check [i18n.md](i18n.md)
94+
95+
## How to debug your test
96+
97+
We've included a file named `env-for.debug.sh` in the root folder of Risu repo that allows to be sourced and later execute your script.
98+
99+
This environment file will define the standard variables Risu does use like:
100+
101+
- RC_OKAY
102+
- RC_FAILED
103+
- RC_SKIPPED
104+
- RC_INFO
105+
- TEXTDOMAIN
106+
- TEXTOMAINDIR
107+
- RISU_BASE
108+
- RISU_LIVE
109+
- RISU_ROOT
110+
111+
And will preload the common-functions
112+
113+
The way to use it is:
114+
115+
```sh
116+
. ~/risu/env-for-debug.sh
117+
```
118+
119+
Then you can debug your script with:
120+
121+
```
122+
sh -x /path/to/your/plugin.sh
123+
```
124+
125+
Or test individual functions output like:
126+
127+
```
128+
is_rpm qemu-kvm-rhev
129+
```
130+
131+
Please, do note that as some functions do 'exit' or 'return' for example executing `is_rpm_over` will exit the active shell, so beware!!

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Based on https://github.com/RHsyseng/container-rhel-examples/blob/master/starter-rhel-atomic/Dockerfile
22
FROM registry.centos.org/centos/centos7-atomic:latest
3-
MAINTAINER Citellus developers <citellus _AT_ googlegroups.com>
3+
MAINTAINER Risu developers <risuorg _AT_ googlegroups.com>
44

5-
LABEL name="citellus/citellus" \
6-
maintainer="citellus _AT_ googlegroups.com.com" \
7-
vendor="Citellus" \
5+
LABEL name="risu/risu" \
6+
maintainer="risuorg _AT_ googlegroups.com.com" \
7+
vendor="Risu" \
88
version="1.0.0" \
99
release="1" \
1010
summary="System configuration validation program" \
11-
description="Citellus is a program that should help with system configuration validation on either live system or any sort of snapshot of the filesystem."
11+
description="Risu is a program that should help with system configuration validation on either live system or any sort of snapshot of the filesystem."
1212

13-
ENV USER_NAME=citellus \
13+
ENV USER_NAME=risu \
1414
USER_UID=10001
1515

1616
# Required for useradd command and pip
@@ -31,13 +31,13 @@ RUN PRERREQ_PKGS="shadow-utils \
3131

3232
RUN pip install --upgrade pip --no-cache-dir && \
3333
pip install --upgrade pbr --no-cache-dir && \
34-
pip install --upgrade citellus --no-cache-dir && \
34+
pip install --upgrade risu --no-cache-dir && \
3535
mkdir -p /data && \
3636
chmod -R u+x /data && \
3737
chown -R ${USER_UID}:0 /data && \
3838
chmod -R g=u /data
3939

4040
USER 10001
4141
VOLUME /data
42-
ENTRYPOINT ["/usr/bin/citellus.py"]
42+
ENTRYPOINT ["/usr/bin/risu.py"]
4343
CMD ["-h"]

GDPR.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@
1010

1111
GDPR <https://www.eugdpr.org/> is a Regulation created to safeguard private data access, rectification, removal, etc.
1212

13-
Citellus or Magui processes the information already in your sosreports (which you can clean using tools like [SosCleaner](https://github.com/RedHatGov/soscleaner)) and stores in the same folder where the sosreport has been uncompressed.
13+
Risu or Magui processes the information already in your sosreports (which you can clean using tools like [SosCleaner](https://github.com/RedHatGov/soscleaner)) and stores in the same folder where the sosreport has been uncompressed.
1414

15-
If the sosreport contains data under the scope of GDPR, the generated files by Citellus or Magui (`citellus.json` or `magui-*.json`) might contain excerpts of that data (but unlikely as we do output information on the error found, not the actual line that triggered it).
15+
If the sosreport contains data under the scope of GDPR, the generated files by Risu or Magui (`risu.json` or `magui-*.json`) might contain excerpts of that data (but unlikely as we do output information on the error found, not the actual line that triggered it).
1616

17-
Also remember, that, when running Citellus or Magui:
17+
Also remember, that, when running Risu or Magui:
1818

19-
- You're downloading Citellus/Magui to your system and execute locally
19+
- You're downloading Risu/Magui to your system and execute locally
2020
- You're using a sealed container against the folder you define
2121

2222
Such as, the system where it's executed will contain forementioned files that should be removed.
2323

24-
In case of remote execution in Magui, a temporary folder with the contents of those files is available at `/tmp/citellus.json` for each host that was added and a local (for the executing host) folder named `/tmp/citellus/hostrun/` will contain the files transferred from remote systems to local one.
24+
In case of remote execution in Magui, a temporary folder with the contents of those files is available at `/tmp/risu.json` for each host that was added and a local (for the executing host) folder named `/tmp/risu/hostrun/` will contain the files transferred from remote systems to local one.
2525

2626
So, briefing:
2727

2828
- For LIVE executions
2929
- No data is stored
3030
- For non-LIVE executions
3131

32-
- `citellus.json` in sosreport folder or the path you've defined with -o
32+
- `risu.json` in sosreport folder or the path you've defined with -o
3333
- `magui*.json` in the folder where you executed `magui`
3434

3535
- When using Magui's ansible host file for remote execution, additionally:
36-
- `/tmp/citellus.json` on remote hosts
37-
- `/tmp/citellus` folder on calling host
36+
- `/tmp/risu.json` on remote hosts
37+
- `/tmp/risu` folder on calling host

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively
631631
state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634-
Citellus is a program that performs SOSreport Health Validation
634+
Risu is a program that performs SOSreport Health Validation
635635
Copyright (C) 2017 Robin Cernin ([email protected])
636636

637637
This program is free software: you can redistribute it and/or modify

0 commit comments

Comments
 (0)