1 files changed, 6 insertions, 0 deletions
diff --git a/lib/gitlab/prometheus.rb b/lib/gitlab/prometheus.rb
index 62239779454..8827507955d 100644
--- a/lib/gitlab/prometheus.rb
+++ b/lib/gitlab/prometheus.rb
@@ -50,6 +50,12 @@ module Gitlab
 
     def get(url)
       handle_response(HTTParty.get(url))
+    rescue SocketError
+      raise PrometheusError, "Can't connect to #{url}"
+    rescue OpenSSL::SSL::SSLError
+      raise PrometheusError, "#{url} contains invalid SSL data"
+    rescue HTTParty::Error
+      raise PrometheusError, "Network connection error"
     end
 
     def handle_response(response)