summaryrefslogtreecommitdiff
path: root/lib/gitlab/prometheus/internal.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-16 18:09:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-16 18:09:47 +0000
commitbf1600d157465f9408aace91073954fd5790c054 (patch)
treef317bb99330769c4eb37621c860af014810e554b /lib/gitlab/prometheus/internal.rb
parent6de7d2c195a8a7fa5702cafa4365f7a9fcac37cd (diff)
downloadgitlab-ce-bf1600d157465f9408aace91073954fd5790c054.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/prometheus/internal.rb')
-rw-r--r--lib/gitlab/prometheus/internal.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/prometheus/internal.rb b/lib/gitlab/prometheus/internal.rb
index d59352119ba..c2f4035821e 100644
--- a/lib/gitlab/prometheus/internal.rb
+++ b/lib/gitlab/prometheus/internal.rb
@@ -25,6 +25,10 @@ module Gitlab
end
end
+ def self.server_address
+ uri&.strip&.sub(/^http[s]?:\/\//, '')
+ end
+
def self.listen_address
Gitlab.config.prometheus.listen_address.to_s if Gitlab.config.prometheus
rescue Settingslogic::MissingSetting