diff --git a/charts/meta-monitoring/Chart.lock b/charts/meta-monitoring/Chart.lock index a6a6294..7d88c29 100644 --- a/charts/meta-monitoring/Chart.lock +++ b/charts/meta-monitoring/Chart.lock @@ -8,5 +8,8 @@ dependencies: - name: mimir-distributed repository: https://grafana.github.io/helm-charts version: 4.4.1 -digest: sha256:9238265d064bb85c3607f8be22c32c84837f2115c25978aebf6782b0a125c22c -generated: "2023-06-19T11:29:07.999693+01:00" +- name: minio + repository: https://charts.min.io + version: 5.0.11 +digest: sha256:a010b5c0c7e82b65bee8c6b4b039b6bdcb294f8bd545afe6462221693a487291 +generated: "2023-06-28T10:37:38.589479+01:00" diff --git a/charts/meta-monitoring/Chart.yaml b/charts/meta-monitoring/Chart.yaml index dde9cb7..512caee 100644 --- a/charts/meta-monitoring/Chart.yaml +++ b/charts/meta-monitoring/Chart.yaml @@ -34,4 +34,7 @@ dependencies: - name: mimir-distributed repository: https://grafana.github.io/helm-charts version: "4.4.1" - condition: local.enabled \ No newline at end of file + condition: local.enabled +- name: minio + repository: https://charts.min.io + version: "5.0.11" \ No newline at end of file diff --git a/charts/meta-monitoring/charts/minio-5.0.11.tgz b/charts/meta-monitoring/charts/minio-5.0.11.tgz new file mode 100644 index 0000000..1f7dc55 Binary files /dev/null and b/charts/meta-monitoring/charts/minio-5.0.11.tgz differ diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml index 0e102dc..0c17e39 100644 --- a/charts/meta-monitoring/values.yaml +++ b/charts/meta-monitoring/values.yaml @@ -4,9 +4,9 @@ namespacesToMonitor: - tempo clusterName: "observability" # TODO check if this can be derived local: - enabled: false -cloud: enabled: true +cloud: + enabled: false logs: endpoint: username: @@ -18,6 +18,11 @@ cloud: # The following are configuration for the dependencies. # These should not be changed. +global: + minio: + rootUser: "rootuser" + rootPassword: "rootpassword" + loki: loki: auth_enabled: false @@ -51,4 +56,56 @@ grafana-agent: name: "agent-configmap" key: 'config.river' -# mimir-distributed: +mimir-distributed: + minio: + enabled: false + mimir: + structuredConfig: + alertmanager_storage: + s3: + bucket_name: mimir-ruler + access_key_id: "{{ .Values.global.minio.rootUser }}" + endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" + secret_access_key: "{{ .Values.global.minio.rootPassword }}" + insecure: true + blocks_storage: + backend: s3 + s3: + bucket_name: mimir-tsdb + access_key_id: "{{ .Values.global.minio.rootUser }}" + endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" + secret_access_key: "{{ .Values.global.minio.rootPassword }}" + insecure: true + ruler_storage: + s3: + bucket_name: mimir-ruler + access_key_id: "{{ .Values.global.minio.rootUser }}" + endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000" + secret_access_key: "{{ .Values.global.minio.rootPassword }}" + insecure: true + +minio: + rootUser: rootuser + buckets: + - name: loki + policy: none + purge: false + - name: tempo + policy: none + purge: false + - name: mimir-ruler + policy: none + purge: false + - name: mimir-tsdb + policy: none + purge: false + mode: standalone + persistence: + size: 5Gi + resources: + requests: + cpu: 100m + memory: 128Mi + rootPassword: rootpassword + # Changed the mc config path to '/tmp' from '/etc' as '/etc' is only writable by root and OpenShift will not permit this. + configPathmc: "/tmp/minio/mc/" \ No newline at end of file