From 76b9e28d4d8c3548383dcf8bd112c046f40eaafe Mon Sep 17 00:00:00 2001 From: sakisv Date: Thu, 21 Apr 2022 15:30:03 +0300 Subject: [PATCH] Use our own fork of gds_metrics_python and add shared auth token This will allow both prometheis (the shared one and our own) to scrape the /metrics endpoint, each with their own authentication See alphagov/gds_metrics_python#1 for more details --- manifest.yml.j2 | 1 + requirements.in | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifest.yml.j2 b/manifest.yml.j2 index cceff3ee5..62fa0d0d0 100644 --- a/manifest.yml.j2 +++ b/manifest.yml.j2 @@ -49,6 +49,7 @@ applications: SECRET_KEY: '{{ SECRET_KEY }}' ROUTE_SECRET_KEY_1: '{{ ROUTE_SECRET_KEY_1 }}' ROUTE_SECRET_KEY_2: '{{ ROUTE_SECRET_KEY_2 }}' + METRICS_BASIC_AUTH_TOKEN: {{ METRICS_BASIC_AUTH_TOKEN }} AWS_ACCESS_KEY_ID: '{{ AWS_ACCESS_KEY_ID }}' AWS_SECRET_ACCESS_KEY: '{{ AWS_SECRET_ACCESS_KEY }}' diff --git a/requirements.in b/requirements.in index ffb607e07..2a4d87e41 100644 --- a/requirements.in +++ b/requirements.in @@ -33,4 +33,4 @@ govuk-frontend-jinja @ git+https://github.com/alphagov/govuk-frontend-jinja.git@ # gds-metrics requires prometheseus 0.2.0, override that requirement as later versions bring significant performance gains prometheus-client==0.14.0 -gds-metrics==0.2.4 +git+https://github.com/alphagov/gds_metrics_python.git@6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72 diff --git a/requirements.txt b/requirements.txt index 70f0c585e..8937488b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -67,7 +67,7 @@ flask-redis==0.4.0 # via notifications-utils flask-wtf==1.0.1 # via -r requirements.in -gds-metrics==0.2.4 +gds-metrics @ git+https://github.com/alphagov/gds_metrics_python.git@6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72 # via -r requirements.in geojson==2.5.0 # via notifications-utils