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

scylladb.servicemonitor.yaml: Support Enterprise 2023 #1679

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scylladb.servicemonitor.yaml: Support Enterprise 2023 #1679

wants to merge 1 commit into from

Conversation

amnonh
Copy link

@amnonh amnonh commented Jan 7, 2024

Newer ScyllaDB versions (2023.1, 5.4) move the latency calculation from the Prometheus Server to ScyllaDB itself.

The Prometheus server needs to rename those newly calculated metrics to be aligned with the ones calculated by the recording rules.

This patch adds the missing metrics_relabel config from Sylla-monitoring.

Resolves #1672

@amnonh
scylladb.servicemonitor.yaml: Support Enterprise 2023
59797a6 
Newer ScyllaDB versions (2023.1, 5.4) moves the latency calculation from
the Prometheus Server to ScyllaDB itself.

The promethues server needs to rename those newly-calculated metrics to
be alligned with the ones calculated by the recording rules.

This patch adds the missing metrics_relabel config from Sylla-monitoring.

Fixes scylladb#1672

Signed-off-by: Amnon Heiman <amnon@scylladb.com>
@scylla-operator-bot scylla-operator-bot bot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jan 7, 2024
@scylla-operator-bot scylla-operator-bot
Copy link
Contributor

Keywords which can automatically close issues and at(@) or hashtag(#) mentions are not allowed in commit messages.

The list of commits with invalid commit messages:

  • 59797a6 scylladb.servicemonitor.yaml: Support Enterprise 2023

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@scylla-operator-bot scylla-operator-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: amnonh
Once this PR has been reviewed and has the lgtm label, please assign zimnx for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@scylla-operator-bot scylla-operator-bot bot added do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 7, 2024
@rzetelskik
Copy link
Member

rzetelskik commented Jan 9, 2024 •
edited

/kind feature
/priority important-soon

@amnonh unit tests need updating https://prow.scylla-operator.scylladb.com/view/gs/scylla-operator-prow/pr-logs/pull/scylladb_scylla-operator/1679/pull-scylla-operator-unit/1743933989065854976

also please remove the "resolves" keyword from the commit message: #1679 (comment)
thanks!

@scylla-operator-bot scylla-operator-bot bot added kind/feature Categorizes issue or PR as related to a new feature. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jan 9, 2024
@scylla-operator-bot scylla-operator-bot
Copy link
Contributor

@amnonh: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/unit 59797a6 link true /test unit
ci/prow/e2e-gke-release-script-latest 59797a6 link true /test e2e-gke-release-script-latest

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rzetelskik rzetelskik Awaiting requested review from rzetelskik

@zimnx zimnx Awaiting requested review from zimnx

Assignees
No one assigned
Labels
do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. kind/feature Categorizes issue or PR as related to a new feature. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Prometheus metrics relabel is not up to date
2 participants
@amnonh @rzetelskik