github-personal/cozystack
1
0
Fork 0
mirror of https://github.com/outbackdingo/cozystack.git synced 2026-01-27 18:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ingress for grafana and alerta (#401)

Browse Source 
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
This commit is contained in:
Andrei Kvapil
2024-10-07 21:12:53 +02:00
committed by GitHub
parent 845f22db58
commit 15001dc6ad
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/extra/monitoring/templates/alerta/alerta.yaml
View File

@@ -148,18 +148,18 @@ metadata:
labels:
app: alerta
annotations:
acme.cert-manager.io/http01-ingress-class: {{ $ingress }}
{{- if ne $issuerType "cloudflare" }}
acme.cert-manager.io/http01-ingress-class: {{ $ingress }}
acme.cert-manager.io/http01-ingress-class: {{ $ingress }}
{{- end }}
cert-manager.io/cluster-issuer: letsencrypt-prod
spec:
ingressClassName: {{ $ingress }}
tls:
- hosts:
- "{{ .Values.host | default (printf "alerta.%s" $host) }}"
- "{{ printf "alerta.%s" (.Values.host | default $host) }}"
secretName: alerta-tls
rules:
- host: "{{ .Values.host | default (printf "alerta.%s" $host) }}"
- host: "{{ printf "alerta.%s" (.Values.host | default $host) }}"
http:
paths:
- path: /

6
packages/extra/monitoring/templates/grafana/grafana.yaml
View File

@@ -25,7 +25,7 @@ spec:
password: ${GF_DATABASE_PASSWORD}
#ssl_mode: require
server:
root_url: "https://{{ .Values.host | default (printf "grafana.%s" $host) }}"
root_url: "https://{{ printf "grafana.%s" (.Values.host | default $host) }}"
security:
admin_user: user
admin_password: ${GF_PASSWORD}
@@ -100,7 +100,7 @@ spec:
spec:
ingressClassName: "{{ $ingress }}"
rules:
- host: "{{ .Values.host | default (printf "grafana.%s" $host) }}"
- host: "{{ printf "grafana.%s" (.Values.host | default $host) }}"
http:
paths:
- backend:
@@ -112,5 +112,5 @@ spec:
pathType: Prefix
tls:
- hosts:
- "{{ .Values.host | default (printf "grafana.%s" $host) }}"
- "{{ printf "grafana.%s" (.Values.host | default $host) }}"
secretName: grafana-ingress-tls