Add report for collecting Katello content facts#986
Merged
ehelms merged 3 commits intotheforeman:masterfrom May 1, 2025
Merged
Add report for collecting Katello content facts#986ehelms merged 3 commits intotheforeman:masterfrom
ehelms merged 3 commits intotheforeman:masterfrom
Conversation
ianballou
force-pushed
the
initial-katello-analytics-fields
branch
2 times, most recently
from
ccb9963 to
59cba93
Compare
Contributor
Author
|
Edit: updated to have "count" at the ends of the data fields. |
ianballou
force-pushed
the
initial-katello-analytics-fields
branch
from
59cba93 to
1064787
Compare
adamruzicka
reviewed
Mar 5, 2025
ianballou
force-pushed
the
initial-katello-analytics-fields
branch
from
1064787 to
3ab3188
Compare
Contributor
Author
|
Updated and still working: |
ianballou
force-pushed
the
initial-katello-analytics-fields
branch
from
3ab3188 to
53400a8
Compare
adamruzicka
reviewed
Mar 24, 2025
Contributor
adamruzicka
left a comment
adamruzicka
left a comment
There was a problem hiding this comment.
Seems to work well, although it could be made a bit DRYer, but that might be just personal preference.
definitions/reports/content.rb
Outdated
Comment on lines
+40
to
+50
| query = | ||
| query( | ||
| <<-SQL | ||
| SELECT count(*) as yum_rh_count FROM "katello_root_repositories" | ||
| INNER JOIN "katello_products" ON "katello_products"."id" = "katello_root_repositories"."product_id" | ||
| INNER JOIN "katello_providers" ON "katello_providers"."id" = "katello_products"."provider_id" | ||
| WHERE "katello_providers"."provider_type" = 'Red Hat' | ||
| AND "katello_root_repositories"."content_type" = 'yum' | ||
| SQL | ||
| ) | ||
| query.first['yum_rh_count'].to_i |
Contributor
There was a problem hiding this comment.
nitpick: This could still be using the sql_count helper
definitions/reports/content.rb
Outdated
Comment on lines
+53
to
+75
| def library_container_repositories | ||
| sql_count("katello_root_repositories WHERE content_type = 'docker'") | ||
| end | ||
|
|
||
| def library_ostree_repositories | ||
| sql_count("katello_root_repositories WHERE content_type = 'ostree'") | ||
| end | ||
|
|
||
| def library_ansible_collection_repositories | ||
| sql_count("katello_root_repositories WHERE content_type = 'ansible_collection'") | ||
| end | ||
|
|
||
| def library_file_repositories | ||
| sql_count("katello_root_repositories WHERE content_type = 'file'") | ||
| end | ||
|
|
||
| def library_python_repositories | ||
| sql_count("katello_root_repositories WHERE content_type = 'python'") | ||
| end | ||
|
|
||
| def library_debian_repositories | ||
| sql_count("katello_root_repositories WHERE content_type = 'deb'") | ||
| end |
Contributor
There was a problem hiding this comment.
nitpick: While this works, it feels a bit repetitive
Contributor
Author
|
I can clean these ^ up a bit. |
Contributor
Author
|
I've updated the content.rb file. It isn't tested yet. |
adamruzicka
reviewed
Apr 16, 2025
Contributor
adamruzicka
left a comment
adamruzicka
left a comment
There was a problem hiding this comment.
Seems to work well, rubocop is unhappy though
definitions/reports/content.rb
Outdated
Comment on lines
+27
to
+32
| "katello_root_repositories" | ||
| WHERE "katello_root_repositories"."id" NOT IN | ||
| (SELECT "katello_root_repositories"."id" FROM "katello_root_repositories" INNER JOIN "katello_products" | ||
| ON "katello_products"."id" = "katello_root_repositories"."product_id" INNER JOIN "katello_providers" | ||
| ON "katello_providers"."id" = "katello_products"."provider_id" WHERE "katello_providers"."provider_type" = 'Red Hat') | ||
| AND "katello_root_repositories"."content_type" = 'yum' |
Contributor
There was a problem hiding this comment.
Out of curiosity, is there a reason for going with a subquery directly joining all the necessary tables and then filtering out the rows we don't want to count?
Contributor
Author
There was a problem hiding this comment.
I grabbed these queries directly from Katello & to_sql. Could be simplified perhaps.
ianballou
force-pushed
the
initial-katello-analytics-fields
branch
from
a270a47 to
283d25c
Compare
adamruzicka
approved these changes
Apr 30, 2025
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Begins Katello content fact collection for the analytics report. Starts with repository type information.
Example output:
Also adds some alternate content source fact collection: