Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-05-30 00:23:19 +0300
committerPawel Chojnacki <pawel@chojnacki.ws>2017-06-02 20:45:58 +0300
commitae8f7666e597493ab404f8524c1216a924338291 (patch)
tree1e7684337782584f90b8b8a9d3e5980393e633c7 /app/services
parentc134a72cdb7e6de8b70dc60de99cf4edc68a9227 (diff)
Add prometheus text formatter
+ rename controler method to #index from #metrics + remove assertion from nullMetric
Diffstat (limited to 'app/services')
-rw-r--r--app/services/metrics_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/metrics_service.rb b/app/services/metrics_service.rb
index 0faa86a228b..025598cdc76 100644
--- a/app/services/metrics_service.rb
+++ b/app/services/metrics_service.rb
@@ -24,11 +24,11 @@ class MetricsService
private
def formatter
- @formatter ||= PrometheusText.new
+ @formatter ||= Gitlab::HealthChecks::PrometheusTextFormat.new
end
def multiprocess_metrics_path
- @multiprocess_metrics_path ||= Rails.root.join(ENV['prometheus_multiproc_dir'])
+ @multiprocess_metrics_path ||= Rails.root.join(ENV['prometheus_multiproc_dir']).freeze
end
def metric_to_prom_line(metric)