Add RHEL/Centos support to the system/users metricset #16902
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fearful-symmetry
changed the title
andresrc
added
the
Team:Services
|
Pinging @elastic/integrations-services (Team:Services) |
andresrc
added
[zube]: Inbox
[zube]: In Review
and removed
:integrations
[zube]: Inbox
labels
jsoriano
reviewed
Mar 10, 2020
There was a problem hiding this comment.
Nice, thanks! It will need some changelog entries, for the fix and for the new option.
Do you think it would be possible to add some integration tests? I would be ok with leaving this for a future change as it can be tricky for systemd, I will add the test-plan label by now.
|
|
||
| //call "introspect" on the systemd1 path to see what ListUnit* methods are available | ||
| obj := conn.Object("org.freedesktop.systemd1", dbusRaw.ObjectPath("/org/freedesktop/systemd1")) | ||
| err = obj.Call("org.freedesktop.DBus.Introspectable.Introspect", 0).Store(&props) |
|
@jsoriano Testing this isn't particularly easy--we don't have any OS level integration tests, so I'm relying on testing parsers. |
Co-Authored-By: Jaime Soriano Pastor <jaime.soriano@elastic.co>
jsoriano
reviewed
Mar 11, 2020
| @@ -112,6 +112,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d | |||
| - Fix detection and logging of some error cases with light modules. {pull}14706[14706] | |||
| - Fix imports after PR was merged before rebase. {pull}16756[16756] | |||
| - Add dashboard for `redisenterprise` module. {pull}16752[16752] | |||
| - Dynamically choose a method for the system/service metricset to support older linux distros. {pull}16902[16902] | |||
There was a problem hiding this comment.
For a moment I thought that it should say system/users metricset, but is the title of the issue what is wrong. Remember this when forging the commit message! 🙂
jsoriano
approved these changes
Mar 11, 2020
26 tasks
…eats into services-rhel-support
6 tasks
fearful-symmetry
added a commit
to fearful-symmetry/beats
that referenced
this pull request
Mar 12, 2020
* major refactor to support different systemd version * format and updates * update ref docs * update ref, again * add newline * Fix error string Co-Authored-By: Jaime Soriano Pastor <jaime.soriano@elastic.co> * add changelog entry * make update * add build target Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> (cherry picked from commit 1d36da7)
fearful-symmetry
added a commit
that referenced
this pull request
Mar 16, 2020
* major refactor to support different systemd version * format and updates * update ref docs * update ref, again * add newline * Fix error string Co-Authored-By: Jaime Soriano Pastor <jaime.soriano@elastic.co> * add changelog entry * make update * add build target Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> (cherry picked from commit 1d36da7)
andresrc
added
test-plan-added
vooon
added a commit
to sardinasystems/sensu-go-systemd-check
that referenced
this pull request
Apr 3, 2020
Fix extracted from: elastic/beats#16902
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR is a simultaneous bugfix/enhancement that addresses both #16757 and #16753. Rather than use the dbus
ListUnitsByPatternsmethod, we make an introspection call to dbus, look at the methods available to us, and then return a function pointer to make a call dependent on what is available. The goal is to make systemd do as much of the work is possible, only falling back to filtering methods within metricbeat as needed. The filtering behavior implemented here is designed to emulate what happens on the dbus end viaListUnitsByPatterns. This also exposespattern_filtersince it was a 2-line change, and should be useful.Why is it important?
Currently, this metricset doesn't work on Centos7/RHEL7, due to the
ListUnitsByPatternsmethod being too new.Checklist
Author's Checklist
How to test this PR locally
pattern_filterorstate_filtervalues.Related issues
Closes #16757 and #16753