openstack/openstack-helm-infra
Code Issues Proposed changes

Prometheus: Fix Prometheus endpoints in apache config

Browse Source 
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
This commit is contained in:
Steve Wilkerson 2018-08-28 09:38:02 -05:00
parent 55424bacfd
commit 61b2dbf941
1 changed files with 9 additions and 0 deletions

9
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>