diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-05-29 23:23:19 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 19:45:58 +0200 |
| commit | ae8f7666e597493ab404f8524c1216a924338291 (patch) | |
| tree | 1e7684337782584f90b8b8a9d3e5980393e633c7 /app | |
| parent | c134a72cdb7e6de8b70dc60de99cf4edc68a9227 (diff) | |
| download | gitlab-ce-ae8f7666e597493ab404f8524c1216a924338291.tar.gz | |
Add prometheus text formatter
+ rename controler method to #index from #metrics
+ remove assertion from nullMetric
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/metrics_service.rb | 4 |
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) |