Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/app/models/concerns/prometheus_adapter.rb b/app/models/concerns/prometheus_adapter.rb
index 9df77b565da..99da8b81398 100644
--- a/app/models/concerns/prometheus_adapter.rb
+++ b/app/models/concerns/prometheus_adapter.rb
@@ -16,6 +16,14 @@ module PrometheusAdapter
       raise NotImplementedError
     end
 
+    # This is a light-weight check if a prometheus client is properly configured.
+    def configured?
+      raise NotImplemented
+    end
+
+    # This is a heavy-weight check if a prometheus is properly configured and accesible from GitLab.
+    # This actually sends a request to an external service and often it could take a long time,
+    # Please consider using `configured?` instead if the process is running on unicorn/puma threads.
     def can_query?
       prometheus_client.present?
     end