diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-05-29 14:19:43 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 19:45:58 +0200 |
| commit | c134a72cdb7e6de8b70dc60de99cf4edc68a9227 (patch) | |
| tree | 0082ba4d422cc53eea223583bca9c98cbc823c96 /app/controllers/metrics_controller.rb | |
| parent | 770f07cd5c68075bb261f4b6139c92b2ac9309c0 (diff) | |
| download | gitlab-ce-c134a72cdb7e6de8b70dc60de99cf4edc68a9227.tar.gz | |
Move Prometheus presentation logic to PrometheusText
+ Use NullMetrics to mock metrics when unused
+ Use method_missing in NullMetrics mocking
+ Update prometheus gem to version that correctly uses transitive dependencies
+ Ensure correct folders are used in Multiprocess prometheus client tests.
+ rename Sessions controller's metric
Diffstat (limited to 'app/controllers/metrics_controller.rb')
| -rw-r--r-- | app/controllers/metrics_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/metrics_controller.rb b/app/controllers/metrics_controller.rb index 9bcd6f96b34..0e9a19c0b6f 100644 --- a/app/controllers/metrics_controller.rb +++ b/app/controllers/metrics_controller.rb @@ -5,10 +5,8 @@ class MetricsController < ActionController::Base before_action :validate_prometheus_metrics - def metrics - response = "#{metrics_service.health_metrics_text}\n#{metrics_service.prometheus_metrics_text}" - - render text: response, content_type: 'text/plain; version=0.0.4' + def index + render text: metrics_service.metrics_text, content_type: 'text/plain; verssion=0.0.4' end private |