Skip to content

Drop Log Collection Backend #23647

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
merged 2 commits into from
Nov 4, 2025
Merged

Drop Log Collection Backend #23647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb73a4a
Drop Log Collection Backend
Fryguy Oct 31, 2025
4f2df52
Drop LogFile model
Fryguy Nov 1, 2025
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: 0 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ gem "dalli", "~>3.2.3", :require => false
gem "default_value_for", "~>4.0"
gem "docker-api", "~>1.33.6", :require => false
gem "drb", "~>2.2", :require => false
gem "elif", "=0.1.0", :require => false
gem "fast_gettext", "~>3.1"
gem "ffi", "< 1.17.0", :require => false # Locked down due to build issue assertion failure on 1.17.3
gem "gettext_i18n_rails", "~>1.11"
Expand Down Expand Up @@ -75,7 +74,6 @@ gem "rake", ">=12.3.3", :require => false
gem "rest-client", "~>2.1.0", :require => false
gem "ruby_parser", :require => false # Required for i18n string extraction, and DescentdantLoader (via prism)
gem "ruby-progressbar", "~>1.7.0", :require => false
gem "rubyzip", "~>2.0.0", :require => false
Copy link
Member

@jrafanie jrafanie Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yay 2 dependencies 👋

gem "rugged", "~>1.9", :require => false
gem "ruport", "~>1.8.0"
gem "snmp", "~>1.2.0", :require => false
Expand Down
15 changes: 2 additions & 13 deletions app/models/file_depot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ class FileDepot < ApplicationRecord
include ImportExport
include YamlImportExportMixin

has_many :miq_schedules, :dependent => :nullify
has_many :miq_servers, :dependent => :nullify, :foreign_key => :log_file_depot_id
has_many :log_files
validates_presence_of :uri
has_many :miq_schedules, :dependent => :nullify

attr_accessor :file
validates_presence_of :uri

def self.supported_depots
descendants.each_with_object({}) { |klass, hash| hash[klass.name] = klass.display_name }
Expand All @@ -23,14 +20,6 @@ def self.requires_credentials?
true
end

def requires_support_case?
false
end

def upload_file(file)
@file = file
end

def merged_uri(uri, _api_port)
uri
end
Expand Down
75 changes: 2 additions & 73 deletions app/models/file_depot_ftp.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'net/ftp'

class FileDepotFtp < FileDepot
attr_accessor :ftp

Expand All @@ -11,38 +9,6 @@ def self.validate_settings(settings)
new(:uri => settings[:uri]).verify_credentials(nil, settings.slice(:username, :password))
end

def upload_file(file)
super
with_connection do
begin
return if file_exists?(destination_file)

upload(file.local_file, destination_file)
rescue => err
msg = "Error '#{err.message.chomp}', writing to FTP: [#{uri}], Username: [#{authentication_userid}]"
_log.error(msg)
raise _("Error '%{message}', writing to FTP: [%{uri}], Username: [%{id}]") % {:message => err.message.chomp,
:uri => uri,
:id => authentication_userid}
else
file.update(
:state => "available",
:log_uri => destination_file
)
file.post_upload_tasks
end
end
end

def remove_file(file)
@file = file
_log.info("Removing log file [#{destination_file}]...")
with_connection do |ftp|
ftp.delete(destination_file.to_s)
end
_log.info("Removing log file [#{destination_file}]...complete")
end

def verify_credentials(_auth_type = nil, cred_hash = nil)
res = with_connection(cred_hash, &:last_response)
raise _("Depot Settings validation failed") unless res
Expand All @@ -65,6 +31,8 @@ def with_connection(cred_hash = nil)
end

def connect(cred_hash = nil)
require 'net/ftp'

host = URI(uri).hostname

begin
Expand All @@ -86,51 +54,12 @@ def connect(cred_hash = nil)
end
end

def file_exists?(file_or_directory)
!ftp.nlst(file_or_directory.to_s).empty?
rescue Net::FTPPermError
false
end

def self.display_name(number = 1)
n_('FTP', 'FTPs', number)
end

private

def create_directory_structure(directory_path)
pwd = ftp.pwd
directory_path.to_s.split('/').each do |directory|
unless ftp.nlst.include?(directory)
_log.info("creating #{directory}")
ftp.mkdir(directory)
end
ftp.chdir(directory)
end
ftp.chdir(pwd)
end

def upload(source, destination)
create_directory_structure(destination_path)
_log.info("Uploading file: #{destination} to File Depot: #{name}...")
ftp.putbinaryfile(source, destination.to_s)
_log.info("Uploading file: #{destination_file}... Complete")
end

def destination_file
destination_path.join(file.destination_file_name).to_s
end

def destination_path
base_path.join(file.destination_directory)
end

def base_path
# uri: "ftp://ftp.example.com/incoming" => #<Pathname:incoming>
path = URI(URI::DEFAULT_PARSER.escape(uri)).path
Pathname.new(path)
end

def login_credentials
[authentication_userid, authentication_password]
end
Expand Down
Loading