diff --git a/.vib/grafana-loki/cypress/cypress/e2e/grafana_loki.cy.js b/.vib/grafana-loki/cypress/cypress/e2e/grafana_loki.cy.js index c58688628675b3..34b10fc3b2af8f 100644 --- a/.vib/grafana-loki/cypress/cypress/e2e/grafana_loki.cy.js +++ b/.vib/grafana-loki/cypress/cypress/e2e/grafana_loki.cy.js @@ -14,7 +14,7 @@ it('checks Loki range endpoint', () => { form: true, }).then((response) => { expect(response.status).to.eq(200); - expect(response.headers['content-type']).to.eq( + expect(response.headers['content-type'].toLowerCase()).to.eq( 'application/json; charset=utf-8' ); expect(response.body.data.stats.summary).not.to.be.empty; diff --git a/bitnami/grafana-loki/Chart.yaml b/bitnami/grafana-loki/Chart.yaml index a83096b2b75349..23b7b2a0f06dec 100644 --- a/bitnami/grafana-loki/Chart.yaml +++ b/bitnami/grafana-loki/Chart.yaml @@ -6,7 +6,7 @@ annotations: licenses: Apache-2.0 images: | - name: grafana-loki - image: docker.io/bitnami/grafana-loki:2.9.7-debian-12-r0 + image: docker.io/bitnami/grafana-loki:3.0.0-debian-12-r0 - name: memcached image: docker.io/bitnami/memcached:1.6.26-debian-12-r1 - name: nginx @@ -16,7 +16,7 @@ annotations: - name: promtail image: docker.io/bitnami/promtail:3.0.0-debian-12-r0 apiVersion: v2 -appVersion: 2.9.7 +appVersion: 3.0.0 dependencies: - alias: memcachedchunks condition: memcachedchunks.enabled @@ -57,4 +57,4 @@ maintainers: name: grafana-loki sources: - https://github.com/bitnami/charts/tree/main/bitnami/grafana-loki -version: 3.2.1 +version: 4.0.0 diff --git a/bitnami/grafana-loki/README.md b/bitnami/grafana-loki/README.md index 885eaed789364e..fd0f2bf7b12dad 100644 --- a/bitnami/grafana-loki/README.md +++ b/bitnami/grafana-loki/README.md @@ -678,7 +678,7 @@ The [Bitnami grafana-loki](https://github.com/bitnami/containers/tree/main/bitna | `ingester.customReadinessProbe` | Custom readinessProbe that overrides the default one | `{}` | | `ingester.customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | | `ingester.lifecycleHooks` | for the ingester container(s) to automate configuration before or after startup | `{}` | -| `ingester.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if ingester.resources is set (ingester.resources is recommended for production). | `nano` | +| `ingester.resourcesPreset` | Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if ingester.resources is set (ingester.resources is recommended for production). | `micro` | | `ingester.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` | | `ingester.podSecurityContext.enabled` | Enabled Ingester pods' Security Context | `true` | | `ingester.podSecurityContext.fsGroupChangePolicy` | Set filesystem group change policy | `Always` | @@ -1538,6 +1538,10 @@ Find more information about how to deal with common errors related to Bitnami's ## Upgrading +### To 4.0.0 + +This major bumps the Grafana Loki version to its newest major, 3.x.x. This version includes a new storage schema, among other features like structured metadata support. These changes could potentially break your deployments. Please refer to the official [release notes](https://grafana.com/docs/loki/latest/release-notes/v3-0/) and documentation website for further details. + ### To 3.0.0 This major bump changes the following security defaults: @@ -1574,4 +1578,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. diff --git a/bitnami/grafana-loki/templates/compactor/deployment.yaml b/bitnami/grafana-loki/templates/compactor/deployment.yaml index 13bbc56cb71f24..086d40791e71a6 100644 --- a/bitnami/grafana-loki/templates/compactor/deployment.yaml +++ b/bitnami/grafana-loki/templates/compactor/deployment.yaml @@ -95,7 +95,7 @@ spec: args: - -target=compactor - -config.file={{ .Values.loki.dataDir }}/conf/loki.yaml - - -boltdb.shipper.compactor.working-directory={{ .Values.loki.dataDir }}/loki/compactor + - -compactor.working-directory={{ .Values.loki.dataDir }}/loki/compactor {{- if .Values.compactor.extraArgs }} {{- include "common.tplvalues.render" (dict "value" .Values.compactor.extraArgs "context" $) | nindent 12 }} {{- end }} diff --git a/bitnami/grafana-loki/values.yaml b/bitnami/grafana-loki/values.yaml index 6fa74d48b13f5a..b7524f202a4a0f 100644 --- a/bitnami/grafana-loki/values.yaml +++ b/bitnami/grafana-loki/values.yaml @@ -81,7 +81,7 @@ loki: image: registry: docker.io repository: bitnami/grafana-loki - tag: 2.9.7-debian-12-r0 + tag: 3.0.0-debian-12-r0 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -126,17 +126,16 @@ loki: chunk_block_size: 262144 chunk_encoding: snappy chunk_retain_period: 1m - max_transfer_retries: 0 wal: dir: {{ .Values.loki.dataDir }}/wal limits_config: retention_period: 336h - enforce_metric_name: false reject_old_samples: true reject_old_samples_max_age: 168h max_cache_freshness_per_query: 10m split_queries_by_interval: 15m + allow_structured_metadata: true schema_config: configs: @@ -148,16 +147,22 @@ loki: prefix: index_ period: 24h - from: 2024-03-12 + store: tsdb + object_store: filesystem + schema: v12 index: period: 24h prefix: index_ + - from: 2024-04-23 object_store: filesystem - schema: v12 store: tsdb + schema: v13 + index: + prefix: index_ + period: 24h storage_config: boltdb_shipper: - shared_store: filesystem active_index_directory: {{ .Values.loki.dataDir }}/loki/index cache_location: {{ .Values.loki.dataDir }}/loki/cache cache_ttl: 168h @@ -184,7 +189,6 @@ loki: index_gateway_client: server_address: {{ (printf "dns:///%s:9095" (include "grafana-loki.index-gateway.fullname" .)) }} {{- end }} - shared_store: filesystem query_scheduler: max_outstanding_requests_per_tenant: 32768 @@ -193,7 +197,6 @@ loki: max_concurrent: 16 chunk_store_config: - max_look_back_period: 0s {{- if .Values.memcachedchunks.enabled }} chunk_cache_config: memcached: @@ -248,11 +251,11 @@ loki: compactor: working_directory: {{ .Values.loki.dataDir }}/loki/retention - shared_store: filesystem compaction_interval: 10m retention_enabled: true retention_delete_delay: 2h retention_delete_worker_count: 150 + delete_request_store: filesystem ruler: storage: @@ -2027,7 +2030,7 @@ ingester: ## @param ingester.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if ingester.resources is set (ingester.resources is recommended for production). ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15 ## - resourcesPreset: "nano" + resourcesPreset: "micro" ## @param ingester.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads) ## Example: ## resources: