fix issue #30083 handle parsing OpenBSD ps output properly to display sidekiq

What does this MR do?

Handle the slightly different output of ps on OpenBSD so that the admin->monitoring->background jobs sidekiq info is properly filled. See issue #30083 (closed)

Are there points in the code the reviewer needs to double check?

One of the fields in the regex macro was made non-greedy, but tests are still green, additionally a test was added for OpenBSD ps output.

Why was this MR needed?

output of OpenBSD ps utility is slightly different.

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Documentation created/updated
• API support added
• Tests
  • Added for this feature/bug
  • All builds are passing
• Conform by the merge request performance guides
• Conform by the style guides
• Branch has no merge conflicts with master (if it does - rebase it please)
• Squashed related commits together

What are the relevant issue numbers?

fixes issue #30083 (closed)

added 1 commit

• 1b081b38 - handle parsing OpenBSD ps output properly to display sidekiq

Compare with previous version

mentioned in issue #30083 (closed)

assigned to @buzzdeee

added ~164274 ~12980 labels

/cc @smcgivern

Thanks @buzzdeee, can you look at the comments above please? Can you also mark the MR description as fixing https://gitlab.com/gitlab-org/gitlab-ce/issues/30083, so that this being merged will close that issue?

@smcgivern, I'll look into the other requested changes later in the evening.

added 1 commit

• 8bf2a29f - Handle parsing OpenBSD ps output properly to display sidekiq

Compare with previous version

added 52 commits

• 8bf2a29f...76a15db4 - 51 commits from branch gitlab-org:master
• 4da3ce18 - Handle parsing OpenBSD ps output properly to display sidekiq

Compare with previous version

changed title from handle parsing OpenBSD ps output properly to display sidekiq to fix issue #30083 handle parsing OpenBSD ps output properly to display sidekiq

@smcgivern in app/helpers/sidekiq_helper.rb I used the proposed \d, seems to work the same way it does as with the numbers listed. The grep pattern in app/controllers/admin/background_jobs_controller.rb I kept as I found it in the rake file. Pipeline seems to be green as well.

Title etc. updated as well as the Changelog now starts with capital letter.

let me know if I can do anything else. Sebastian

resolved all discussions

@buzzdeee thanks! Can you fix the merge conflicts please?

added 57 commits

• 4da3ce18...68aa43fd - 56 commits from branch gitlab-org:master
• 1d77a674 - Handle parsing OpenBSD ps output properly to display sidekiq

Compare with previous version

@smcgivern thanks, rebased to master again, conflict was from my other issue/MR that got merged. Pipeline is running.

approved this merge request

enabled an automatic merge when the pipeline for 1d77a674 succeeds

changed milestone to %9.1

assigned to @smcgivern

added 49 commits

• 1d77a674...bcb0a554 - 48 commits from branch gitlab-org:master
• fd097fa9 - Handle parsing OpenBSD ps output properly to display sidekiq

Compare with previous version

The failure is unrelated (https://gitlab.com/gitlab-org/gitlab-ce/issues/30236), so I'll merge this. Thanks @buzzdeee!

approved this merge request

mentioned in commit a71e777b

merged