Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(operator): Update Loki operand to v3.3.2 #15800

Merged
merged 3 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.7.1
createdAt: "2024-11-25T18:28:02Z"
createdAt: "2025-01-16T18:30:58Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
features.operators.openshift.io/disconnected: "true"
Expand Down Expand Up @@ -1854,7 +1854,7 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.2.1
value: docker.io/grafana/loki:3.3.2
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down Expand Up @@ -1984,7 +1984,7 @@ spec:
provider:
name: Grafana Loki SIG Operator
relatedImages:
- image: docker.io/grafana/loki:3.2.1
- image: docker.io/grafana/loki:3.3.2
name: loki
- image: quay.io/observatorium/api:latest
name: gateway
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.7.1
createdAt: "2024-11-25T18:27:59Z"
createdAt: "2025-01-16T18:30:55Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down Expand Up @@ -1834,7 +1834,7 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.2.1
value: docker.io/grafana/loki:3.3.2
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down Expand Up @@ -1952,7 +1952,7 @@ spec:
provider:
name: Grafana Loki SIG Operator
relatedImages:
- image: docker.io/grafana/loki:3.2.1
- image: docker.io/grafana/loki:3.3.2
name: loki
- image: quay.io/observatorium/api:latest
name: gateway
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: quay.io/openshift-logging/loki-operator:0.1.0
createdAt: "2024-11-25T18:28:06Z"
createdAt: "2025-01-16T18:31:01Z"
description: |
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
## Prerequisites and Requirements
Expand Down Expand Up @@ -1839,7 +1839,7 @@ spec:
- /manager
env:
- name: RELATED_IMAGE_LOKI
value: quay.io/openshift-logging/loki:v3.2.1
value: quay.io/openshift-logging/loki:v3.3.2
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down Expand Up @@ -1963,7 +1963,7 @@ spec:
provider:
name: Red Hat
relatedImages:
- image: quay.io/openshift-logging/loki:v3.2.1
- image: quay.io/openshift-logging/loki:v3.3.2
name: loki
- image: quay.io/observatorium/api:latest
name: gateway
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.2.1
value: docker.io/grafana/loki:3.3.2
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.2.1
value: docker.io/grafana/loki:3.3.2
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_LOKI
value: docker.io/grafana/loki:3.2.1
value: docker.io/grafana/loki:3.3.2
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_LOKI
value: quay.io/openshift-logging/loki:v3.2.1
value: quay.io/openshift-logging/loki:v3.3.2
- name: RELATED_IMAGE_GATEWAY
value: quay.io/observatorium/api:latest
- name: RELATED_IMAGE_OPA
Expand Down
1 change: 1 addition & 0 deletions operator/docs/operator/compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ The versions of Loki compatible to be run with the Loki Operator are:
* v3.1.1
* v3.2.0
* v3.2.1
* v3.3.2
4 changes: 2 additions & 2 deletions operator/hack/addons_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: logcli
image: docker.io/grafana/logcli:3.2.1-amd64
image: docker.io/grafana/logcli:3.3.2-amd64
imagePullPolicy: IfNotPresent
command:
- /bin/sh
Expand Down Expand Up @@ -73,7 +73,7 @@ spec:
spec:
containers:
- name: promtail
image: docker.io/grafana/promtail:3.2.1
image: docker.io/grafana/promtail:3.3.2
args:
- -config.file=/etc/promtail/promtail.yaml
- -log.level=info
Expand Down
4 changes: 2 additions & 2 deletions operator/hack/addons_ocp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: logcli
image: docker.io/grafana/logcli:3.2.1-amd64
image: docker.io/grafana/logcli:3.3.2-amd64
imagePullPolicy: IfNotPresent
command:
- /bin/sh
Expand Down Expand Up @@ -70,7 +70,7 @@ spec:
spec:
containers:
- name: promtail
image: docker.io/grafana/promtail:3.2.1
image: docker.io/grafana/promtail:3.3.2
args:
- -config.file=/etc/promtail/promtail.yaml
- -log.level=info
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,8 @@
{
"expr": "sum(loki_ingester_memory_chunks{namespace=\"$namespace\", job=~\".+-ingester-http\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "series",
"legendLink": null,
"step": 10
"legendLink": null
}
],
"title": "Series",
Expand Down Expand Up @@ -115,10 +113,8 @@
{
"expr": "sum(loki_ingester_memory_chunks{namespace=\"$namespace\", job=~\".+-ingester-http\"}) / sum(loki_ingester_memory_streams{namespace=\"$namespace\", job=~\".+-ingester-http\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "chunks",
"legendLink": null,
"step": 10
"legendLink": null
}
],
"title": "Chunks per series",
Expand Down Expand Up @@ -177,26 +173,20 @@
{
"expr": "histogram_quantile(0.99, sum(rate(loki_ingester_chunk_utilization_bucket{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) by (le)) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "99th Percentile",
"refId": "A",
"step": 10
"refId": "A"
},
{
"expr": "histogram_quantile(0.50, sum(rate(loki_ingester_chunk_utilization_bucket{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) by (le)) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "50th Percentile",
"refId": "B",
"step": 10
"refId": "B"
},
{
"expr": "sum(rate(loki_ingester_chunk_utilization_sum{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) * 1 / sum(rate(loki_ingester_chunk_utilization_count{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Average",
"refId": "C",
"step": 10
"refId": "C"
}
],
"title": "Utilization",
Expand Down Expand Up @@ -261,26 +251,20 @@
{
"expr": "histogram_quantile(0.99, sum(rate(loki_ingester_chunk_age_seconds_bucket{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) by (le)) * 1e3",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "99th Percentile",
"refId": "A",
"step": 10
"refId": "A"
},
{
"expr": "histogram_quantile(0.50, sum(rate(loki_ingester_chunk_age_seconds_bucket{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) by (le)) * 1e3",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "50th Percentile",
"refId": "B",
"step": 10
"refId": "B"
},
{
"expr": "sum(rate(loki_ingester_chunk_age_seconds_sum{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) * 1e3 / sum(rate(loki_ingester_chunk_age_seconds_count{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Average",
"refId": "C",
"step": 10
"refId": "C"
}
],
"title": "Age",
Expand Down Expand Up @@ -357,26 +341,20 @@
{
"expr": "histogram_quantile(0.99, sum(rate(loki_ingester_chunk_entries_bucket{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) by (le)) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "99th Percentile",
"refId": "A",
"step": 10
"refId": "A"
},
{
"expr": "histogram_quantile(0.50, sum(rate(loki_ingester_chunk_entries_bucket{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) by (le)) * 1",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "50th Percentile",
"refId": "B",
"step": 10
"refId": "B"
},
{
"expr": "sum(rate(loki_ingester_chunk_entries_sum{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) * 1 / sum(rate(loki_ingester_chunk_entries_count{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Average",
"refId": "C",
"step": 10
"refId": "C"
}
],
"title": "Log Entries Per Chunk",
Expand Down Expand Up @@ -440,10 +418,8 @@
{
"expr": "sum(rate(loki_chunk_store_index_entries_per_chunk_sum{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) / sum(rate(loki_chunk_store_index_entries_per_chunk_count{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Index Entries",
"legendLink": null,
"step": 10
"legendLink": null
}
],
"title": "Index Entries Per Chunk",
Expand Down Expand Up @@ -501,10 +477,8 @@
{
"expr": "loki_ingester_flush_queue_length{namespace=\"$namespace\", job=~\".+-ingester-http\"} or cortex_ingester_flush_queue_length{namespace=\"$namespace\", job=~\".+-ingester-http\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
"legendLink": null
}
],
"title": "Queue Length",
Expand All @@ -517,6 +491,8 @@
"3xx": "#6ED0E0",
"4xx": "#EF843C",
"5xx": "#E24D42",
"OK": "#7EB26D",
"cancel": "#A9A9A9",
"error": "#E24D42",
"success": "#7EB26D"
},
Expand Down Expand Up @@ -697,12 +673,10 @@
"stack": true,
"targets": [
{
"expr": "sum by (status) (\n label_replace(label_replace(rate(loki_ingester_chunk_age_seconds_count{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval]),\n \"status\", \"${1}xx\", \"status_code\", \"([0-9])..\"),\n \"status\", \"${1}\", \"status_code\", \"([a-z]+)\"))\n",
"expr": "sum by (status) (\n label_replace(label_replace(rate(loki_ingester_chunk_age_seconds_count{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval]),\n \"status\", \"${1}xx\", \"status_code\", \"([0-9])..\"),\n \"status\", \"${1}\", \"status_code\", \"([a-zA-Z]+)\"))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{status}}",
"refId": "A",
"step": 10
"refId": "A"
}
],
"title": "Flush Rate",
Expand Down Expand Up @@ -760,10 +734,8 @@
{
"expr": "sum(rate(loki_ingester_chunks_flushed_total{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{pod}}",
"legendLink": null,
"step": 10
"legendLink": null
}
],
"title": "Chunks Flushed/Second",
Expand Down Expand Up @@ -810,10 +782,8 @@
{
"expr": "sum by (reason) (rate(loki_ingester_chunks_flushed_total{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) / ignoring(reason) group_left sum(rate(loki_ingester_chunks_flushed_total{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{reason}}",
"legendLink": null,
"step": 10
"legendLink": null
}
],
"title": "Chunk Flush Reason",
Expand Down Expand Up @@ -889,26 +859,20 @@
{
"expr": "histogram_quantile(0.5, sum(rate(loki_ingester_chunk_bounds_hours_bucket{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) by (le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p50",
"legendLink": null,
"step": 10
"legendLink": null
},
{
"expr": "histogram_quantile(0.99, sum(rate(loki_ingester_chunk_bounds_hours_bucket{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) by (le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "p99",
"legendLink": null,
"step": 10
"legendLink": null
},
{
"expr": "sum(rate(loki_ingester_chunk_bounds_hours_sum{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval])) / sum(rate(loki_ingester_chunk_bounds_hours_count{namespace=\"$namespace\", job=~\".+-ingester-http\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "avg",
"legendLink": null,
"step": 10
"legendLink": null
}
],
"title": "Chunk Duration hours (end-start)",
Expand Down Expand Up @@ -939,7 +903,7 @@
"value": "default"
},
"hide": 0,
"label": "Data Source",
"label": "Data source",
"name": "datasource",
"options": [ ],
"query": "prometheus",
Expand Down
Loading
Loading