FEAT: new custom filter 'fstab_mounted.dirs' to ls_lan spec #4255
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4255 +/- ##
=======================================
Coverage 77.14% 77.14%
=======================================
Files 762 762
Lines 41476 41483 +7
Branches 8763 8765 +2
=======================================
+ Hits 31997 32004 +7
+ Misses 8422 8421 -1
- Partials 1057 1058 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
added 3 commits
November 4, 2024 14:33
Signed-off-by: Xinting Li <[email protected]>
Signed-off-by: Xinting Li <[email protected]>
Signed-off-by: xintli <[email protected]>
xiangce
requested changes
Nov 4, 2024
Signed-off-by: xintli <[email protected]>
added 6 commits
November 5, 2024 15:18
Signed-off-by: xintli <[email protected]>
Signed-off-by: xintli <[email protected]>
Signed-off-by: xintli <[email protected]>
Signed-off-by: xintli <[email protected]>
Signed-off-by: xintli <[email protected]>
Signed-off-by: xintli <[email protected]>
JoySnow
reviewed
Nov 7, 2024
xiangce
reviewed
Nov 7, 2024
insights/collect.py
Outdated
| @@ -241,6 +241,10 @@ | |||
| enabled: true | |||
| - name: insights.components.selinux.SELinuxEnabled | |||
| enabled: true | |||
|
|
|||
| # needed for the 'ls lan' spec | |||
There was a problem hiding this comment.
Better explain it a bit clearer, e.g. needed for the 'spec.fstab_mounted' to the 'ls_lan' spec
insights/specs/datasources/ls.py
Outdated
| return _list_items(Specs.ls_lan_dirs) | ||
| filters = _list_items(Specs.ls_lan_dirs) | ||
| if 'specs.fstab_mounted' in filters and FSTab in broker: | ||
| filter_list = filters.split() |
There was a problem hiding this comment.
This seems a redundant operation, better update the _list_items and let it return a sorted list instead. (you may want to update all other datasources to join the new value returned by _list_items
insights/specs/datasources/ls.py
Outdated
| filter_list = filters.split() | ||
| for mntp in broker[FSTab].mounted_on.keys(): | ||
| mnt_point = os.path.dirname(mntp) | ||
| filter_list.extend([mnt_point] if mnt_point and mnt_point not in filter_list else []) |
There was a problem hiding this comment.
declear the filter_list as a set first to avoid duplicate element in nature.
filter_list = set(_list_items(Specs.ls_lan_dirs)) # assume the _list_items returns `list` here already
for mntp in broker[FSTab].mounted_on.keys():
filter_list.add(os.path.dirname(mntp))
...
return ' '.join(filter_list)
xiangce
reviewed
Nov 7, 2024
Signed-off-by: xintli <[email protected]>
JoySnow
reviewed
Nov 7, 2024
Signed-off-by: xintli <[email protected]>
Signed-off-by: xintli <[email protected]>
xiangce
changed the title
xiangce
changed the title
4 tasks
xiangce
approved these changes
Nov 7, 2024
xiangce
pushed a commit
that referenced
this pull request
Nov 7, 2024
Signed-off-by: Xinting Li <[email protected]> (cherry picked from commit 2c292ce)
xiangce
pushed a commit
that referenced
this pull request
Nov 14, 2024
Signed-off-by: Xinting Li <[email protected]> (cherry picked from commit 2c292ce) (cherry picked from commit ba3819d)
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.
All Pull Requests:
Check all that apply:
Complete Description of Additions/Changes:
fstab_mounted.dirsto thels_lanspecit's not a real directory existing in any system, but a
switchlike keyword,to enable the
ls_lan_dirsto involve the mounted points in the default/etc/fstabconfiguration file as the
ls -lancandidates.