akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: force ec2 instance role for cloudwatch_client

Browse Source
This commit is contained in:
Vishnu Narayanan
2025-08-01 20:17:49 +05:30
parent c908e28ca3
commit a5e4595def
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/initializers/sidekiq.rb
+29
View File
@@ -15,6 +15,35 @@ Sidekiq.configure_server do |config|
config[:skip_default_job_logging] = true
config.logger.level = Logger.const_get(ENV.fetch('LOG_LEVEL', 'info').upcase.to_s)
end
# Configure Sidekiq CloudWatch metrics in the server process
if defined?(Sidekiq::CloudWatchMetrics) && defined?(ChatwootApp) && ChatwootApp.chatwoot_cloud? && ENV['ENABLE_SIDEKIQ_CLOUDWATCH'].present?
require 'sidekiq/cloudwatchmetrics'
if ENV['ENABLE_SIDEKIQ_CLOUDWATCH'].present?
Rails.logger.info '================================================'
Rails.logger.info 'Sidekiq::CloudWatchMetrics defined (Server Process)'
Rails.logger.info 'ChatwootApp defined'
Rails.logger.info "ChatwootApp.chatwoot_cloud? #{ChatwootApp.chatwoot_cloud?}"
Rails.logger.info "ENV['ENABLE_SIDEKIQ_CLOUDWATCH'] #{ENV.fetch('ENABLE_SIDEKIQ_CLOUDWATCH', nil)}"
Rails.logger.info "ENV['SIDEKIQ_CLOUDWATCH_NAMESPACE'] #{ENV.fetch('SIDEKIQ_CLOUDWATCH_NAMESPACE', nil)}"
Rails.logger.info "ENV['SIDEKIQ_CLOUDWATCH_INTERVAL'] #{ENV.fetch('SIDEKIQ_CLOUDWATCH_INTERVAL', nil)}"
Rails.logger.info '================================================'
end
# Configure AWS CloudWatch client with explicit instance role credentials
cloudwatch_client = Aws::CloudWatch::Client.new(
region: ENV.fetch('AWS_REGION', 'us-east-1'),
credentials: Aws::InstanceProfileCredentials.new
)
# Enable Sidekiq CloudWatch metrics with the configured client
Sidekiq::CloudWatchMetrics.enable!(
namespace: ENV.fetch('SIDEKIQ_CLOUDWATCH_NAMESPACE', 'Chatwoot/Sidekiq'),
interval: ENV.fetch('SIDEKIQ_CLOUDWATCH_INTERVAL', '60').to_i,
client: cloudwatch_client
)
end
end
# https://github.com/ondrejbartas/sidekiq-cron
config/initializers/sidekiq_cloudwatch.rb
-18
View File
@@ -1,18 +0,0 @@
if defined?(Sidekiq::CloudWatchMetrics) && defined?(ChatwootApp) && ChatwootApp.chatwoot_cloud? && ENV['ENABLE_SIDEKIQ_CLOUDWATCH'].present?
require 'sidekiq/cloudwatchmetrics'
Rails.logger.info '================================================'
Rails.logger.info 'Sidekiq::CloudWatchMetrics defined'
Rails.logger.info 'ChatwootApp defined'
Rails.logger.info "ChatwootApp.chatwoot_cloud? #{ChatwootApp.chatwoot_cloud?}"
Rails.logger.info "ENV['ENABLE_SIDEKIQ_CLOUDWATCH'] #{ENV.fetch('ENABLE_SIDEKIQ_CLOUDWATCH', nil)}"
Rails.logger.info "ENV['SIDEKIQ_CLOUDWATCH_NAMESPACE'] #{ENV.fetch('SIDEKIQ_CLOUDWATCH_NAMESPACE', nil)}"
Rails.logger.info "ENV['SIDEKIQ_CLOUDWATCH_INTERVAL'] #{ENV.fetch('SIDEKIQ_CLOUDWATCH_INTERVAL', nil)}"
Rails.logger.info '================================================'
# Use EC2 instance role for AWS credentials (no custom client needed)
Sidekiq::CloudWatchMetrics.enable!(
namespace: ENV.fetch('SIDEKIQ_CLOUDWATCH_NAMESPACE', 'Chatwoot/Sidekiq'),
interval: ENV.fetch('SIDEKIQ_CLOUDWATCH_INTERVAL', '60').to_i
)
end