Add Y Label field to yml and responses

3 files changed, 5 insertions, 10 deletions

diff --git a/lib/gitlab/prometheus/metric.rb b/lib/gitlab/prometheus/metric.rb
index 2818afb34b0..777cf030ceb 100644
--- a/lib/gitlab/prometheus/metric.rb
+++ b/lib/gitlab/prometheus/metric.rb
@@ -1,12 +1,13 @@
 module Gitlab::Prometheus
   class Metric
-    attr_reader :group, :title, :detect, :weight, :queries
+    attr_reader :group, :title, :detect, :weight, :y_label, :queries
 
-    def initialize(group, title, detect, weight, queries = [])
+    def initialize(group, title, detect, weight, y_label, queries = [])
       @group = group
       @title = title
       @detect = detect
       @weight = weight
+      @y_label = y_label || 'Values'
       @queries = queries
     end
 
@@ -14,7 +15,7 @@ module Gitlab::Prometheus
       missing_fields = [:title, :detect, :weight, :queries].select { |key| !entry.has_key?(key) }
       raise ParsingError.new("entry missing required fields #{missing_fields}") unless missing_fields.empty?
 
-      Metric.new(group, entry[:title], entry[:detect], entry[:weight], entry[:queries])
+      Metric.new(group, entry[:title], entry[:detect], entry[:weight], entry[:y_label],entry[:queries])
     end
 
     def self.metrics_from_list(group, list)
diff --git a/lib/gitlab/prometheus/metrics_sources.rb b/lib/gitlab/prometheus/metrics_sources.rb
deleted file mode 100644
index 500b6e971a2..00000000000
--- a/lib/gitlab/prometheus/metrics_sources.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Gitlab::Prometheus
-  module MetricsSources
-    def self.additional_metrics
-      @additional_metrics ||= YAML.load_file(Rails.root.join('config/additional_metrics.yml')).deep_symbolize_keys.freeze
-    end
-  end
-end
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
index c48fcadee57..fd7f072834d 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
@@ -22,6 +22,7 @@ module Gitlab::Prometheus::Queries
           {
             title: metric.title,
             weight: metric.weight,
+            y_label: metric.y_label,
             queries: metric.queries.map(&query_processor)
           }
         end