Public/grafana-meta-monitoring-chart
2
0
Fork 0
forked from RemoteSync/grafana-meta-monitoring-chart
Code Pull Requests Activity

Use 1 secret with all values

Browse Source 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
This commit is contained in:
Michel Hollands
2024-04-01 13:40:05 +01:00
parent d9fc9e4f4e
commit 39f50d8580
4 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
charts/meta-monitoring/templates/agent/config.yaml
View File

@@ -45,11 +45,6 @@ data:
name = "logs"
}
remote.kubernetes.configmap "logs_endpoint" {
namespace = "{{- .Values.metaMonitoringNamespace -}}"
name = "logs-endpoint"
}
loki.source.kubernetes "pods" {
clustering {
enabled = true
@@ -90,11 +85,6 @@ data:
name = "metrics"
}
remote.kubernetes.configmap "metrics_endpoint" {
namespace = "{{- .Values.metaMonitoringNamespace -}}"
name = "metrics-endpoint"
}
prometheus.scrape "pods" {
clustering {
enabled = true
@@ -235,11 +225,6 @@ data:
name = "traces"
}
remote.kubernetes.configmap "traces_endpoint" {
namespace = "{{- .Values.metaMonitoringNamespace -}}"
name = "traces-endpoint"
}
// Shamelessly copied from https://github.com/grafana/intro-to-mlt/blob/main/agent/config.river
otelcol.receiver.otlp "otlp_receiver" {
// We don't technically need this, but it shows how to change listen address and incoming port.
@@ -308,7 +293,7 @@ data:
{{- if .Values.cloud.logs.enabled }}
loki.write "cloud" {
endpoint {
url = remote.kubernetes.configmap.logs_endpoint.data["endpoint"]
url = nonsensitive(remote.kubernetes.secret.logs_credentials.data["endpoint"])
basic_auth {
username = nonsensitive(remote.kubernetes.secret.logs_credentials.data["username"])
password = remote.kubernetes.secret.logs_credentials.data["password"]
@@ -320,7 +305,7 @@ data:
{{- if .Values.cloud.metrics.enabled }}
prometheus.remote_write "cloud" {
endpoint {
url = remote.kubernetes.configmap.metrics_endpoint.data["endpoint"]
url = nonsensitive(remote.kubernetes.secret.metrics_credentials.data["endpoint"])
basic_auth {
username = nonsensitive(remote.kubernetes.secret.metrics_credentials.data["username"])
password = remote.kubernetes.secret.metrics_credentials.data["password"]
@@ -332,7 +317,7 @@ data:
{{- if .Values.cloud.traces.enabled }}
otelcol.exporter.otlp "cloud" {
client {
endpoint = remote.kubernetes.configmap.traces_endpoint.data["endpoint"]
endpoint = nonsensitive(remote.kubernetes.secret.traces_credentials.data["endpoint"])
auth = otelcol.auth.basic.creds.handler
}
}

12
charts/meta-monitoring/templates/validate.yaml
View File

@@ -3,20 +3,20 @@
{{- end -}}
{{- if eq .Values.cloud.logs.enabled true -}}
{{- if or (empty .Values.cloud.logs.secret) (empty .Values.cloud.logs.endpointConfigmap) -}}
{{- fail "if cloud.logs is enabled then the secret and endpoint config map have to be filled in" -}}
{{- if empty .Values.cloud.logs.secret -}}
{{- fail "if cloud.logs is enabled then the secret has to be filled in" -}}
{{- end -}}
{{- end -}}
{{- if eq .Values.cloud.metrics.enabled true -}}
{{- if or (empty .Values.cloud.metrics.secret) (empty .Values.cloud.logs.endpointConfigmap) -}}
{{- fail "if cloud.metrics is enabled then the secret and endpoint config map have to be filled in" -}}
{{- if empty .Values.cloud.metrics.secret -}}
{{- fail "if cloud.metrics is enabled then the secret has to be filled in" -}}
{{- end -}}
{{- end -}}
{{- if eq .Values.cloud.traces.enabled true -}}
{{- if or (empty .Values.cloud.traces.secret) (empty .Values.cloud.logs.endpointConfigmap) -}}
{{- fail "if cloud.traces is enabled then the secret and endpoint config map have to be filled in" -}}
{{- if empty .Values.cloud.traces.secret -}}
{{- fail "if cloud.traces is enabled then the secret has to be filled in" -}}
{{- end -}}
{{- end -}}