diff --git a/charts/mimir-singleton/Chart.yaml b/charts/mimir-singleton/Chart.yaml index 978fa5a..292742d 100644 --- a/charts/mimir-singleton/Chart.yaml +++ b/charts/mimir-singleton/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.3 +version: 0.1.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/mimir-singleton/templates/_helpers.tpl b/charts/mimir-singleton/templates/_helpers.tpl index f20f067..abd1a32 100644 --- a/charts/mimir-singleton/templates/_helpers.tpl +++ b/charts/mimir-singleton/templates/_helpers.tpl @@ -65,5 +65,5 @@ Create the name of the service account to use Calculate the config from structured and unstructured text input */}} {{- define "mimir-singleton.calculatedConfig" -}} -{{ tpl (mergeOverwrite (tpl .Values.config . | fromYaml) .Values.structuredConfig | toYaml) . }} +{{ tpl (mergeOverwrite (tpl .Values.config.config . | fromYaml) .Values.config.structuredConfig | toYaml) . }} {{- end -}} \ No newline at end of file diff --git a/charts/mimir-singleton/values.yaml b/charts/mimir-singleton/values.yaml index a4c2ece..cb107f8 100644 --- a/charts/mimir-singleton/values.yaml +++ b/charts/mimir-singleton/values.yaml @@ -99,45 +99,76 @@ tolerations: [] affinity: {} -config: | - multitenancy_enabled: true - target: all,alertmanager,compactor - - limits: - out_of_order_time_window: 10m - max_global_series_per_user: 1000000 - native_histograms_ingestion_enabled: true - - server: - http_listen_port: 9009 - - ruler_storage: - backend: local - local: - directory: /tmp/ruler - - blocks_storage: - backend: local - tsdb: - dir: /tmp/mimir/tsdb - - alertmanager_storage: - backend: local - local: - path: /tmp/mimir/alertmanager - - ingester: - ring: - replication_factor: 1 - - frontend: - query_result_response_format: protobuf - - ruler: - enable_api: true - alertmanager_url: http://localhost:9009/alertmanager/ - -structuredConfig: {} +config: + multitenancy_enabled: false + config: | + multitenancy_enabled: {{ .Values.config.multitenancy_enabled }} + target: all,alertmanager,compactor + + limits: + out_of_order_time_window: 10m + max_global_series_per_user: 1000000 + native_histograms_ingestion_enabled: true + + server: + http_listen_port: 9009 + log_level: error + + ruler_storage: + backend: filesystem + filesystem: + dir: /tmp/mimir/rules + + blocks_storage: + backend: filesystem + bucket_store: + sync_dir: /tmp/mimir/tsdb-sync + filesystem: + dir: /tmp/mimir/data/tsdb + tsdb: + dir: /tmp/mimir/tsdb + + compactor: + data_dir: /tmp/mimir/compactor + sharding_ring: + kvstore: + store: memberlist + + distributor: + ring: + instance_addr: 127.0.0.1 + kvstore: + store: memberlist + + alertmanager_storage: + backend: local + local: + path: /tmp/mimir/alertmanager + web: + external_url: {{ .Values.alertManager.external_url }} + + ingester: + ring: + instance_addr: 127.0.0.1 + kvstore: + store: memberlist + replication_factor: 1 + + store_gateway: + sharding_ring: + replication_factor: 1 + + frontend: + query_result_response_format: protobuf + + ruler: + enable_api: true + alertmanager_url: http://localhost:9009/alertmanager/ + + structuredConfig: {} + +alertManager: + external_url: http://localhost:9009/alertmanager monitoring: enabled: false