-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(base-cluster/monitoring): cleanup values, add grafana settings
- Loading branch information
Showing
16 changed files
with
258 additions
and
52 deletions.
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
charts/base-cluster/ci/monitoring-ingress-unauthenticated-values.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| monitoring: | ||
| prometheus: | ||
| ingress: | ||
| enabled: true | ||
| alertmanager: | ||
| ingress: | ||
| enabled: true |
14 changes: 14 additions & 0 deletions
14
charts/base-cluster/ci/monitoring-oidc-ingress-disabled-values.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| global: | ||
| authentication: | ||
| config: | ||
| clientId: clientId | ||
| clientSecret: clientSecret | ||
| issuerHost: host.de | ||
| issuerPath: /oidc | ||
| monitoring: | ||
| prometheus: | ||
| ingress: | ||
| enabled: false | ||
| alertmanager: | ||
| ingress: | ||
| enabled: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| global: | ||
| authentication: | ||
| config: | ||
| clientId: clientId | ||
| clientSecret: clientSecret | ||
| issuerHost: keycloak.de | ||
| issuerPath: /auth/realms/test | ||
| grafana: | ||
| apiPath: /outh2/userinfo/grafana | ||
| authenticationPath: /OAuth2/Authorize/grafana | ||
| tokenPath: /OAuth2/Token/grafana | ||
| roleAttributePath: "contains(groups, 'admin') && 'Admin' || Viewer" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy-secret.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| {{- if and .Values.global.authentication.config.clientId .Values.monitoring.prometheus.enabled (or (include "base-cluster.monitoring.authenticated-ingress.enabled" (dict "name" "prometheus" "context" .)) (include "base-cluster.monitoring.authenticated-ingress.enabled" (dict "name" "alertmanager" "context" .))) }} | ||
| {{- $name := include "common.secrets.name" (dict "defaultNameSuffix" "oauth-proxy" "context" $) -}} | ||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: {{ $name }} | ||
| namespace: monitoring | ||
| labels: {{- include "common.labels.stable" $ | nindent 4 }} | ||
| app.kubernetes.io/component: oauth-proxy | ||
| app.kubernetes.io/part-of: monitoring | ||
| type: Opaque | ||
| data: | ||
| # This might change on every `template` call, this can be ignored | ||
| cookieSecret: {{ include "common.secrets.passwords.manage" (dict "secret" $name "key" "cookieSecret" "providedValues" (list "global.authentication.oauthProxy.cookieSecret") "context" (dict "Values" .Values "Release" ((dict "IsUpgrade" false "IsInstall" true "Namespace" "monitoring") | mergeOverwrite (deepCopy .Release)))) }} | ||
| clientID: {{ $.Values.global.authentication.config.clientId | b64enc | quote }} | ||
| clientSecret: {{ $.Values.global.authentication.config.clientSecret | b64enc | quote }} | ||
| {{- end }} |
108 changes: 108 additions & 0 deletions
108
charts/base-cluster/templates/monitoring/kube-prometheus-stack/oauth-proxy.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| {{- if and .Values.global.authentication.config.clientId .Values.monitoring.prometheus.enabled }} | ||
| {{- $backends := list -}} | ||
| {{- if include "base-cluster.monitoring.authenticated-ingress.enabled" (dict "name" "prometheus" "context" .) -}} | ||
| {{- $backends = append $backends (dict "host" "prometheus" "port" 9090) -}} | ||
| {{- end -}} | ||
| {{- if and (include "base-cluster.monitoring.authenticated-ingress.enabled" (dict "name" "alertmanager" "context" .)) false -}} | ||
| {{- $backends = append $backends (dict "host" "alertmanager" "port" 9093) -}} | ||
| {{- end -}} | ||
| {{- range $backend := $backends }} | ||
| {{- $host := $backend.host -}} | ||
| {{- $port := $backend.port -}} | ||
| {{- $targetServiceName := printf "%s-%s" (include "common.names.dependency.fullname" (dict "chartName" "kube-prometheus-stack" "chartValues" (dict) "context" (dict "Release" (dict "Name" "kube-prometheus-stack")))) $host -}} | ||
| apiVersion: helm.toolkit.fluxcd.io/v2beta1 | ||
| kind: HelmRelease | ||
| metadata: | ||
| name: cluster-{{ $host }}-oauth-proxy | ||
| namespace: monitoring | ||
| labels: {{- include "common.labels.standard" $ | nindent 4 }} | ||
| app.kubernetes.io/component: oauth-proxy | ||
| app.kubernetes.io/part-of: prometheus | ||
| spec: | ||
| chart: | ||
| spec: {{- include "base-cluster.helm.chartSpec" (dict "repo" "bitnami" "chart" "oauth2-proxy" "context" $) | nindent 6 }} | ||
| interval: 1h | ||
| values: | ||
| redis: | ||
| enabled: false | ||
| {{- if $.Values.global.imageRegistry }} | ||
| global: | ||
| imageRegistry: {{ $.Values.global.imageRegistry }} | ||
| {{- end }} | ||
| ingress: | ||
| enabled: true | ||
| hostname: {{ include (printf "base-cluster.%s.host" $host) $ }} | ||
| extraTls: |- | ||
| - hosts: | ||
| - {{ "{{ .Values.ingress.hostname }}" }} | ||
| secretName: cluster-wildcard-certificate | ||
| replicaCount: 2 | ||
| pdb: | ||
| create: true | ||
| minAvailable: 1 | ||
| maxUnavailable: "" | ||
| podSecurityContext: | ||
| enabled: true | ||
| containerSecurityContext: | ||
| enabled: true | ||
| resources: {{- toYaml $.Values.global.authentication.oauthProxy.resources | nindent 6 }} | ||
| configuration: | ||
| existingSecret: {{ include "common.secrets.name" (dict "defaultNameSuffix" "oauth-proxy" "context" $) }} | ||
| content: |- | ||
| provider = "oidc" | ||
| reverse_proxy = true | ||
| oidc_issuer_url = {{ printf "https://%s%s" $.Values.global.authentication.config.issuerHost $.Values.global.authentication.config.issuerPath | quote }} | ||
| skip_provider_button = true | ||
| {{- if $.Values.global.authentication.oauthProxy.emailDomains }} | ||
| email_domains = [ "{{ $.Values.global.authentication.oauthProxy.emailDomains | join "\", \"" }}" ] | ||
| {{- end }} | ||
| upstreams = [ {{ printf "http://%s:%d" $targetServiceName $port | quote }} ] | ||
| {{- if eq (include "common.networkPolicy.type" $) "cilium" }} | ||
| --- | ||
| apiVersion: cilium.io/v2 | ||
| kind: CiliumNetworkPolicy | ||
| metadata: | ||
| name: cluster-{{ $host }}-oauth-proxy | ||
| namespace: monitoring | ||
| labels: {{- include "common.labels.standard" $ | nindent 4 }} | ||
| app.kubernetes.io/component: oauth | ||
| app.kubernetes.io/part-of: prometheus | ||
| spec: | ||
| endpointSelector: | ||
| matchLabels: | ||
| app.kubernetes.io/instance: monitoring-cluster-{{ $host }}-oauth-proxy | ||
| ingress: | ||
| - fromRequires: | ||
| - matchLabels: {{- include "common.tplvalues.render" (dict "value" $.Values.global.networkPolicy.ingressLabels "context" $) | nindent 12 }} | ||
| toPorts: | ||
| - ports: | ||
| - port: "4180" | ||
| protocol: TCP | ||
| egress: | ||
| - toEndpoints: | ||
| - matchLabels: | ||
| app.kubernetes.io/name: {{ $host | quote }} | ||
| io.kubernetes.pod.namespace: monitoring | ||
| toPorts: | ||
| - ports: | ||
| - port: {{ $port | quote }} | ||
| protocol: TCP | ||
| - toFQDNs: | ||
| - matchName: {{ $.Values.global.authentication.config.issuerHost | quote }} | ||
| toPorts: | ||
| - ports: | ||
| - port: "443" | ||
| protocol: TCP | ||
| - toEndpoints: | ||
| - matchLabels: {{- include "common.tplvalues.render" (dict "value" $.Values.global.networkPolicy.dnsLabels "context" $) | nindent 12 }} | ||
| toPorts: | ||
| - ports: | ||
| - port: "53" | ||
| protocol: UDP | ||
| rules: | ||
| dns: | ||
| - matchName: {{ $.Values.global.authentication.config.issuerHost | quote }} | ||
| {{- end }} | ||
| --- | ||
| {{- end }} | ||
| {{- end }} |
Oops, something went wrong.