Skip to content

Use shared tmpdir for inventory report storage #1262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nofaralfasi merged 3 commits into from
Sep 28, 2026
Merged

Use shared tmpdir for inventory report storage #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5370f0
Use shared tmpdir for inventory report storage
nofaralfasi Sep 24, 2026
dd1ea37
Check writability of shared tmpdir before selecting it
nofaralfasi Sep 24, 2026
16ba476
Simplify base_folder to use Rails.root/tmp directly
nofaralfasi Sep 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ bundle exec rake rh_cloud_inventory:report:generate_upload
organization_id=1 bundle exec rake rh_cloud_inventory:report:generate_upload

# Generate report without uploading
organization_id=1 target=/var/lib/foreman/red_hat_inventory/generated_reports/ \
organization_id=1 target=tmp/red_hat_inventory/generated_reports/ \
bundle exec rake rh_cloud_inventory:report:generate

# Sync recommendations from Insights
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ From command-line:

# generate report for specific organization (don't upload)
export organization_id=1
export target=/var/lib/foreman/red_hat_inventory/generated_reports/
export target=/var/run/foreman/red_hat_inventory/generated_reports/
/usr/sbin/foreman-rake rh_cloud_inventory:report:generate

# upload previously generated report (needs to be named 'report_for_#{organization_id}.tar.gz')
export organization_id=1
export target=/var/lib/foreman/red_hat_inventory/generated_reports/
export target=/var/run/foreman/red_hat_inventory/generated_reports/
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
/usr/sbin/foreman-rake rh_cloud_inventory:report:upload

#### Fetch hosts remediation data
Expand Down
8 changes: 1 addition & 7 deletions lib/foreman_inventory_upload.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
module ForemanInventoryUpload
def self.base_folder
# in production setup, where selinux is enabled, we only have rights to
# create folders under /var/lib/foreman. If the folder does not exist, it's
# a dev setup, where we can use the parent of the current working directory
@base_folder ||= File.join(
Dir.glob('/var/lib/foreman').first || File.dirname(Dir.getwd),
'red_hat_inventory/'
)
@base_folder ||= Rails.root.join('tmp/red_hat_inventory').to_s
end

def self.uploads_folder
Expand Down
Loading