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.

Sign up for GitHub

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

Jump to bottom

operator: Add a custom metric that collects Lokistacks requiring a schema upgrade #11513

Merged
merged 19 commits into from Jan 22, 2024
Merged

operator: Add a custom metric that collects Lokistacks requiring a schema upgrade #11513

merged 19 commits into from Jan 22, 2024

Conversation

btaani
Copy link
Contributor

@btaani btaani commented Dec 18, 2023 •
edited

What this PR does / why we need it:
Adds a custom metric that collects Lokistacks that require a storage schema upgrade, as well as a Prometheus alert that gets shown in the console whenever it's triggered

Sample notifications pane from the console:
image

Which issue(s) this PR fixes:
Fixes LOG-4804 (piggybacking on [#11158]

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 18, 2023 •
edited

Trivy scan found the following vulnerabilities:

  • HIGH, Target: docker.io/grafana/loki:main-24fa648 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libcrypto3 v3.1.3-r0. Fixed in v3.1.4-r0
  • HIGH, Target: docker.io/grafana/loki:main-24fa648 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libssl3 v3.1.3-r0. Fixed in v3.1.4-r0
    \nTo see more details on these vulnerabilities, and how/where to fix them, please run docker build -t grafana/loki:main-24fa648 -f cmd/loki/Dockerfile .
    trivy i grafana/loki:main-24fa648 on your branch. If these were not introduced by your PR, please considering fixing them in via a subsequent PR. Thanks!

@btaani btaani marked this pull request as ready for review January 10, 2024 10:36
@btaani btaani requested review from periklis, xperimental and a team as code owners January 10, 2024 10:36
@btaani btaani changed the title operator: Add a custom metric that collects Loki stacks requiring a schema upgrade operator: Add a custom metric that collects Lokistacks requiring a schema upgrade Jan 10, 2024
@pull-request-size pull-request-size bot added size/L and removed size/M labels Jan 10, 2024
@pull-request-size pull-request-size bot added size/M and removed size/L labels Jan 10, 2024
periklis
periklis reviewed Jan 12, 2024
View reviewed changes
Copy link
Collaborator

@periklis periklis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

operator/docs/lokistack/sop.md Outdated Show resolved Hide resolved
btaani and others added 2 commits January 12, 2024 14:20
@btaani @periklis
Update operator/docs/lokistack/sop.md
b494d20 
Co-authored-by: Periklis Tsirakidis <periklis@nefeli.eu>
@btaani
Merge branch 'main' into log-4804
2089983
xperimental
xperimental reviewed Jan 16, 2024
View reviewed changes
operator/internal/manifests/internal/alerts/prometheus-alerts.yaml Outdated Show resolved Hide resolved
operator/docs/lokistack/sop.md Outdated Show resolved Hide resolved
operator/docs/lokistack/sop.md Outdated Show resolved Hide resolved
operator/internal/manifests/internal/alerts/prometheus-alerts.yaml Show resolved Hide resolved
operator/internal/manifests/internal/alerts/prometheus-alerts.yaml Outdated Show resolved Hide resolved
operator/internal/metrics/metrics.go Outdated Show resolved Hide resolved
btaani and others added 2 commits January 17, 2024 12:49
@btaani @xperimental
Update operator/internal/manifests/internal/alerts/prometheus-alerts.…
ac4296a 
…yaml

Co-authored-by: Robert Jacob <xperimental@solidproject.de>
@btaani @xperimental
Update operator/docs/lokistack/sop.md
0247b5f 
Co-authored-by: Robert Jacob <xperimental@solidproject.de>
btaani and others added 6 commits January 17, 2024 12:50
@btaani @xperimental
Update operator/docs/lokistack/sop.md
0c79f39 
Co-authored-by: Robert Jacob <xperimental@solidproject.de>
@btaani @xperimental
Update operator/internal/metrics/metrics.go
950528b 
Co-authored-by: Robert Jacob <xperimental@solidproject.de>
@btaani @xperimental
Update operator/internal/manifests/internal/alerts/prometheus-alerts.…
4824474 
…yaml

Co-authored-by: Robert Jacob <xperimental@solidproject.de>
@btaani
address PR comments
0676d82
@btaani
address PR comments
5716715
@btaani
Merge branch 'main' into log-4804
4afa1da
@periklis periklis enabled auto-merge (squash) January 22, 2024 13:01
@periklis periklis merged commit 837cfc0 into grafana:main Jan 22, 2024
14 checks passed
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@btaani @xperimental
@periklis @rhnasc
operator: Add a custom metric that collects Lokistacks requiring a sc…
7942b4e 
…hema upgrade (grafana#11513)

Co-authored-by: Robert Jacob <rojacob@redhat.com>
Co-authored-by: Periklis Tsirakidis <periklis@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xperimental xperimental xperimental left review comments

@periklis periklis periklis approved these changes

Assignees
No one assigned
Labels
sig/operator size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@btaani @xperimental @periklis