1 files changed, 10 insertions, 2 deletions
diff --git a/app/services/prometheus/proxy_service.rb b/app/services/prometheus/proxy_service.rb
index a62eb76b8ce..3585c90fc8f 100644
--- a/app/services/prometheus/proxy_service.rb
+++ b/app/services/prometheus/proxy_service.rb
@@ -5,9 +5,17 @@ module Prometheus
     include ReactiveCaching
     include Gitlab::Utils::StrongMemoize
 
-    self.reactive_cache_key = ->(service) { service.cache_key }
+    self.reactive_cache_key = ->(service) { [] }
     self.reactive_cache_lease_timeout = 30.seconds
-    self.reactive_cache_refresh_interval = 30.seconds
+
+    # reactive_cache_refresh_interval should be set to a value higher than
+    # reactive_cache_lifetime.  If the refresh_interval is less than lifetime
+    # then the ReactiveCachingWorker will re-query prometheus for this
+    # PromQL query even though it's (probably) already been picked up by
+    # the frontend
+    # refresh_interval should be set less than lifetime only if this data
+    # is expected to change *and* be fetched again by the frontend
+    self.reactive_cache_refresh_interval = 90.seconds
     self.reactive_cache_lifetime = 1.minute
     self.reactive_cache_worker_finder = ->(_id, *args) { from_cache(*args) }