From 61b2dbf94191605960bf1ce0e60c635b1b299749 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Tue, 28 Aug 2018 09:38:02 -0500
Subject: [PATCH] Prometheus: Fix Prometheus endpoints in apache config

This updates the endpoints in the apache configuration for
Prometheus to correctly define the file used for http basic auth
to validate the admin user. The Prometheus endpoints restricted to
the admin user specified file for the authbasicprovider, but did
not provide the file used for validating the user. This adds the
file correctly

Change-Id: I8561281236fb1efa2e51af342e30314aae8e5285
---
 prometheus/values.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index 4ce4115d38..c1b1764406 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -346,6 +346,7 @@ conf:
           AuthName "Prometheus"
           AuthType Basic
           AuthBasicProvider file
+          AuthUserFile /usr/local/apache2/conf/.htpasswd
           Require valid-user
       </Location>
       <Location /api/v1/status/config>
@@ -354,6 +355,7 @@ conf:
           AuthName "Prometheus"
           AuthType Basic
           AuthBasicProvider file
+          AuthUserFile /usr/local/apache2/conf/.htpasswd
           Require valid-user
       </Location>
       # Restrict access to the /flags (dashboard) and /api/v1/status/flags (http) endpoints
@@ -364,6 +366,7 @@ conf:
           AuthName "Prometheus"
           AuthType Basic
           AuthBasicProvider file
+          AuthUserFile /usr/local/apache2/conf/.htpasswd
           Require valid-user
       </Location>
       <Location /api/v1/status/flags>
@@ -372,6 +375,7 @@ conf:
           AuthName "Prometheus"
           AuthType Basic
           AuthBasicProvider file
+          AuthUserFile /usr/local/apache2/conf/.htpasswd
           Require valid-user
       </Location>
       # Restrict access to the /status (dashboard) endpoint to the admin user
@@ -381,6 +385,7 @@ conf:
           AuthName "Prometheus"
           AuthType Basic
           AuthBasicProvider file
+          AuthUserFile /usr/local/apache2/conf/.htpasswd
           Require valid-user
       </Location>
       # Restrict access to the /rules (dashboard) endpoint to the admin user
@@ -390,6 +395,7 @@ conf:
           AuthName "Prometheus"
           AuthType Basic
           AuthBasicProvider file
+          AuthUserFile /usr/local/apache2/conf/.htpasswd
           Require valid-user
       </Location>
       # Restrict access to the /targets (dashboard) and /api/v1/targets (http) endpoints
@@ -400,6 +406,7 @@ conf:
           AuthName "Prometheus"
           AuthType Basic
           AuthBasicProvider file
+          AuthUserFile /usr/local/apache2/conf/.htpasswd
           Require valid-user
       </Location>
       <Location /api/v1/targets>
@@ -408,6 +415,7 @@ conf:
           AuthName "Prometheus"
           AuthType Basic
           AuthBasicProvider file
+          AuthUserFile /usr/local/apache2/conf/.htpasswd
           Require valid-user
       </Location>
       # Restrict access to the /api/v1/admin/tsdb/ endpoints (http) to the admin user.
@@ -419,6 +427,7 @@ conf:
           AuthName "Prometheus"
           AuthType Basic
           AuthBasicProvider file
+          AuthUserFile /usr/local/apache2/conf/.htpasswd
           Require valid-user
       </Location>
     </VirtualHost>