Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rabbitmq docker bundle #2045

Closed
wants to merge 2 commits into from
Closed

Rabbitmq docker bundle #2045

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fedecee
Merge pull request #1 from RedHatInsights/master
zerodayz Jul 8, 2019
05eb827
Add rabbitmq report spec file
Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion insights/specs/sos_archive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,11 @@ class SosSpecs(Specs):
simple_file("sos_commands/foreman/foreman-debug/qpid_stat_subscriptions"),
simple_file("sos_commands/foreman/foreman-debug/qpid-stat-u")
])
rabbitmq_report = simple_file("sos_commands/rabbitmq/rabbitmqctl_report")
rabbitmq_report = first_of([
Copy link
Contributor

@xiangce xiangce Jul 8, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the glob_file means a couple of files which matches the wildcard string will get this parser being fired, this update will change the structure of the parser result, from a single Parser object to a list of Parser objects, which will break all the existing rules depend on this Parser.

If there any difference (e.g. the usage in rules) between this Parser against containers or against normal-hosts?

To avoid breaking the existing rules, seems we'd better add a new spec&parser for the new one against containers.

Or, is it possible to add a new command to the sos package to collect a single rabbitmqctl_report for one container?

Just like: #1976

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @xiangce The * is there because the file changes per server, it can be any number. Do you have anything to catch that in insights?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zerodayz - per the discussion, I have opened an issue #2049 for this PR. And I will submit another PR for the parser and close this one. Thanks.

glob_file(
"sos_commands/rabbitmq/docker_exec_-t_rabbitmq-bundle-docker-*_rabbitmqctl_report"),
simple_file("sos_commands/rabbitmq/rabbitmqctl_report")
])
rhn_charsets = first_file(["sos_commands/satellite/rhn-charsets", "sos_commands/rhn/rhn-charsets"])
root_crontab = first_file(["sos_commands/crontab/root_crontab", "sos_commands/cron/root_crontab"])
route = simple_file("sos_commands/networking/route_-n")
Expand Down