Skip to content

Commit d4858f8

Browse files
committed
[foreman] Improve collecting CV filters
Collect crucial but missing columns from several tables (to know include/exclude filter type, inclusion of original pkgs etc.). Stop collecting some timestamps from katello_content_view_module_stream_filter_rules . Closes: #4261 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
1 parent 92c57b3 commit d4858f8

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

sos/report/plugins/foreman.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,27 +325,29 @@ def collect_proxies(self):
325325
def collect_cv_filters(self):
326326
""" Collect content view filters definition if requested """
327327
cv_filters_cmd = (
328-
"select f.id, f.name, f.type, f.content_view_id, "
329-
"cv.name as content_view_name, f.description "
328+
"select f.id, f.name, f.type, f.inclusion, "
329+
"f.original_packages, f.original_module_streams, "
330+
"f.content_view_id, cv.name as content_view_name, f.description "
330331
"from katello_content_view_filters as f "
331332
"inner join katello_content_views as cv "
332333
"on f.content_view_id = cv.id"
333334
)
334335
cv_pkg_rules_cmd = (
335-
"select id, content_view_filter_id, name, min_version, "
336-
"max_version from katello_content_view_package_filter_rules"
336+
"select id, content_view_filter_id, name, version, min_version, "
337+
"max_version, architecture "
338+
"from katello_content_view_package_filter_rules"
337339
)
338340
cv_group_rules_cmd = (
339341
"select id, content_view_filter_id, name, uuid "
340342
"from katello_content_view_package_group_filter_rules"
341343
)
342344
cv_errata_rules_cmd = (
343345
"select id, content_view_filter_id, errata_id, start_date, "
344-
"end_date, types from "
346+
"end_date, types, date_type, allow_other_types from "
345347
"katello_content_view_erratum_filter_rules"
346348
)
347349
cv_module_rules_cmd = (
348-
"select * from "
350+
"select id, content_view_filter_id, module_stream_id from "
349351
"katello_content_view_module_stream_filter_rules"
350352
)
351353
cv_docker_rules_cmd = (
@@ -354,7 +356,7 @@ def collect_cv_filters(self):
354356
)
355357
cv_deb_rules_cmd = (
356358
"select id, content_view_filter_id, name, version, "
357-
"min_version, max_version "
359+
"min_version, max_version, architecture "
358360
"from katello_content_view_deb_filter_rules"
359361
)
360362

0 commit comments

Comments
 (0)