Merge pull request #10688 from colinux/delete-yabeda-rails

Tech: remove yabeda-rails et yabeda-graphql
This commit is contained in:
Colin Darie 2024-08-20 09:26:39 +00:00 committed by GitHub
commit 66bf0cca6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 2 additions and 29 deletions

View file

@ -105,10 +105,7 @@ gem 'view_component'
gem 'vite_rails'
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'

View file

@ -859,22 +859,10 @@ GEM
anyway_config (>= 1.0, < 3)
concurrent-ruby
dry-initializer
yabeda-graphql (0.2.3)
graphql (>= 1.9, < 3)
yabeda (~> 0.2)
yabeda-prometheus (0.9.1)
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
@ -1035,10 +1023,7 @@ DEPENDENCIES
web-console
webmock
webrick
yabeda-graphql
yabeda-prometheus
yabeda-puma-plugin
yabeda-rails
yabeda-sidekiq
zipline
zxcvbn-ruby

View file

@ -195,4 +195,4 @@ La compatibilité est testée par Browserstack.<br>[<img src="app/assets/images/
Nous utilisons Skylight pour suivre les performances de notre application.
Par ailleurs, nous utilisons [Yabeda](https://github.com/yabeda-rb/yabeda) pour exporter des metriques au format prometheus. L'activation se fait via la variable d'environnement `PROMETHEUS_EXPORTER_ENABLED` voir config/env.example.optional .
Par ailleurs, nous utilisons [Yabeda](https://github.com/yabeda-rb/yabeda) pour exporter des métriques au format prometheus pour Sidekiq. L'activation se fait via la variable d'environnement `PROMETHEUS_EXPORTER_ENABLED` voir config/env.example.optional .

View file

@ -147,7 +147,6 @@ class API::V2::Schema < GraphQL::Schema
use Timeout, max_seconds: 30
use GraphQL::Batch
use GraphQL::Backtrace
use Yabeda::GraphQL
if Rails.env.development?
class LogQueryDepth < GraphQL::Analysis::AST::QueryDepth

View file

@ -2,9 +2,5 @@
require_relative "config/environment"
if ENV['PROMETHEUS_EXPORTER_ENABLED'] == 'enabled'
Yabeda::Prometheus::Exporter.start_metrics_server!
end
run Rails.application
Rails.application.load_server

View file

@ -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"

View file

@ -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

View file

@ -45,4 +45,3 @@ end
plugin :tmp_restart
activate_control_app
plugin :yabeda