Permalink
Browse files

Add basic auth to the system alert endpoint

**What**
- Protect the `/system/alert` endpoint when basic auth is enabled
- Update the alert manager config to send the basic auth credentials
- Bump the gateway version

Signed-off-by: Lucas Roesler <roesler.lucas@gmail.com>
  • Loading branch information...
LucasRoesler authored and alexellis committed Jan 22, 2019
1 parent 53645bb commit f61735b1556657c9131c9497fee2548cea35d388
Showing with 13 additions and 4 deletions.
  1. +1 −1 docker-compose.arm64.yml
  2. +3 −2 docker-compose.armhf.yml
  3. +3 −1 docker-compose.yml
  4. +2 −0 gateway/server.go
  5. +4 −0 prometheus/alertmanager.yml
@@ -5,7 +5,7 @@ services:
- "/var/run/docker.sock:/var/run/docker.sock"
ports:
- 8080:8080
image: functions/gateway:0.7.0-arm64
image: functions/gateway:0.10.0-arm64
networks:
- functions
environment:
@@ -3,7 +3,7 @@ services:
gateway:
ports:
- 8080:8080
image: openfaas/gateway:0.9.14-armhf
image: openfaas/gateway:0.10.0-armhf
networks:
- functions
environment:
@@ -169,7 +169,8 @@ services:
configs:
- source: alertmanager_config
target: /alertmanager.yml

secrets:
- basic-auth-password

configs:
prometheus_config:
@@ -3,7 +3,7 @@ services:
gateway:
ports:
- 8080:8080
image: openfaas/gateway:0.9.14
image: openfaas/gateway:0.10.0
networks:
- functions
environment:
@@ -173,6 +173,8 @@ services:
configs:
- source: alertmanager_config
target: /alertmanager.yml
secrets:
- basic-auth-password


configs:
@@ -126,6 +126,8 @@ func main() {
faasHandlers.ScaleFunction = handlers.MakeForwardingProxyHandler(reverseProxy, forwardingNotifiers, urlResolver, nilURLTransformer)

if credentials != nil {
faasHandlers.Alert =
auth.DecorateWithBasicAuth(faasHandlers.Alert, credentials)
faasHandlers.UpdateFunction =
auth.DecorateWithBasicAuth(faasHandlers.UpdateFunction, credentials)
faasHandlers.DeleteFunction =
@@ -20,3 +20,7 @@ receivers:
webhook_configs:
- url: http://gateway:8080/system/alert
send_resolved: true
http_config:
basic_auth:
username: admin
password_file: /run/secrets/basic-auth-password

0 comments on commit f61735b

Please sign in to comment.