Merge pull request #2440 from alphagov/monitoring_test

Enable Prometheus Exporter for EKS only
alphagov · May 17, 2022 · 3e952b5 · 3e952b5
2 parents 0cb24a4 + eed835a
commit 3e952b5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -29,7 +29,7 @@ RUN GOVUK_APP_DOMAIN=www.gov.uk \
 
 FROM $base_image
 
-ENV RAILS_ENV=production GOVUK_APP_NAME=government-frontend GOVUK_APP_DOMAIN=www.gov.uk GOVUK_WEBSITE_ROOT=https://www.gov.uk PORT=3090
+ENV GOVUK_PROMETHEUS_EXPORTER=true RAILS_ENV=production GOVUK_APP_NAME=government-frontend GOVUK_APP_DOMAIN=www.gov.uk GOVUK_WEBSITE_ROOT=https://www.gov.uk PORT=3090
 
 RUN apt-get update -qy && \
     apt-get upgrade -y && \

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -110,14 +110,14 @@ GEM
     globalid (1.0.0)
       activesupport (>= 5.0)
     govuk_ab_testing (2.4.2)
-    govuk_app_config (4.4.3)
-      logstasher (>= 1.2.2, < 2.2.0)
-      prometheus_exporter (~> 2.0.2)
-      puma (~> 5.0)
-      sentry-rails (~> 4.5.0)
-      sentry-ruby (~> 4.5.0)
-      statsd-ruby (~> 1.5.0)
-      unicorn (>= 5.4, < 5.9)
+    govuk_app_config (4.5.0)
+      logstasher (~> 2.1)
+      prometheus_exporter (~> 2.0)
+      puma (~> 5.6)
+      sentry-rails (~> 5.2)
+      sentry-ruby (~> 5.2)
+      statsd-ruby (~> 1.5)
+      unicorn (~> 6.1)
     govuk_personalisation (0.11.2)
       plek (>= 1.9.0)
       rails (>= 6, < 8)
@@ -294,7 +294,6 @@ GEM
     rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sassc (2.4.0)
@@ -308,16 +307,14 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sentry-rails (4.5.2)
+    sentry-rails (5.3.0)
       railties (>= 5.0)
-      sentry-ruby-core (~> 4.5.0)
-    sentry-ruby (4.5.2)
+      sentry-ruby-core (~> 5.3.0)
+    sentry-ruby (5.3.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      faraday (>= 1.0)
-      sentry-ruby-core (= 4.5.2)
-    sentry-ruby-core (4.5.2)
+      sentry-ruby-core (= 5.3.0)
+    sentry-ruby-core (5.3.0)
       concurrent-ruby
-      faraday
     simplecov (0.19.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -351,7 +348,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.1)
     unicode-display_width (2.1.0)
-    unicorn (5.8.0)
+    unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     webmock (3.8.3)

diff --git a/config/initializers/prometheus.rb b/config/initializers/prometheus.rb
@@ -0,0 +1,2 @@
+require "govuk_app_config/govuk_prometheus_exporter"
+GovukPrometheusExporter.configure
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		require "govuk_app_config/govuk_prometheus_exporter"
		GovukPrometheusExporter.configure