diff --git a/Gemfile b/Gemfile index 0fef04096..a19d67498 100644 --- a/Gemfile +++ b/Gemfile @@ -107,8 +107,6 @@ gem 'warden' gem 'webrick', require: false gem 'yabeda-graphql' gem 'yabeda-prometheus' -gem 'yabeda-puma-plugin' -gem 'yabeda-rails' gem 'yabeda-sidekiq' gem 'zipline' gem 'zxcvbn-ruby', require: 'zxcvbn' diff --git a/Gemfile.lock b/Gemfile.lock index d55b4e387..48dca8525 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -866,15 +866,6 @@ GEM prometheus-client (>= 3.0, < 5.0) rack yabeda (~> 0.10) - yabeda-puma-plugin (0.7.1) - json - puma - yabeda (~> 0.5) - yabeda-rails (0.9.0) - activesupport - anyway_config (>= 1.3, < 3) - railties - yabeda (~> 0.8) yabeda-sidekiq (0.12.0) anyway_config (>= 1.3, < 3) sidekiq @@ -1037,8 +1028,6 @@ DEPENDENCIES webrick yabeda-graphql yabeda-prometheus - yabeda-puma-plugin - yabeda-rails yabeda-sidekiq zipline zxcvbn-ruby diff --git a/config/env.example.optional b/config/env.example.optional index 79710f04e..ffad0f1cd 100644 --- a/config/env.example.optional +++ b/config/env.example.optional @@ -244,7 +244,7 @@ REDIS_SIDEKIQ_PASSWORD='sentinel_and_redis_password' REDIS_SIDEKIQ_USERNAME='sentinel_and_redis_username' # configuration for prometheus metrics web server on /metrics -# launched with sidekiq and puma +# launched with sidekiq # adjust according to your prometheus probe, 127.0.0.1 or your local/admin net address # it's advised to avoid 0.0.0.0 or if you do, please configure ACL elsewhere (webserver, reverse proxy, ...) PROMETHEUS_EXPORTER_BIND="127.0.0.1" diff --git a/config/initializers/prometheus_metrics.rb b/config/initializers/prometheus_metrics.rb deleted file mode 100644 index aa9f7bec5..000000000 --- a/config/initializers/prometheus_metrics.rb +++ /dev/null @@ -1,3 +0,0 @@ -if ENV['PROMETHEUS_EXPORTER_ENABLED'] == 'enabled' && !Sidekiq.server? - Prometheus::Client.config.data_store = Prometheus::Client::DataStores::DirectFileStore.new(dir: Rails.root.join('tmp', 'prometheus')) -end diff --git a/config/puma.rb b/config/puma.rb index 470a8760d..67843488a 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -45,4 +45,3 @@ end plugin :tmp_restart activate_control_app -plugin :yabeda