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

Restore blacklist metric #12606

Merged
merged 1 commit into from
May 2, 2023
Merged

Restore blacklist metric #12606

merged 1 commit into from
May 2, 2023

Conversation

Zelldon
Copy link
Member

@Zelldon Zelldon commented Apr 29, 2023

Description

On restart/recovery we need to restore the blacklist metric in order to report it always. Otherwise, we will have gaps in the reports and it is not reliable, due to restarts and resetting of counters.

Change counter to gauge, such that it can be reset/set to a specific value based on the state.

See related comment #8263 (comment)

Related issues

closes #8263

On restart/recovery we need to restore the blacklist metric
in order to report it always. Otherwise we will have gaps in the reports
and it is not reliable, due to restarts and reseting of counters.

Change counter to gauge, such it can be reset/set to a specific value
based on the state.
@Zelldon Zelldon changed the title Reset blacklist metric Restore blacklist metric Apr 29, 2023
@Zelldon
Copy link
Member Author

Zelldon commented Apr 29, 2023

Dashboard changes I would do after #12594 is merged, otherwise we get ugly merge conflicts.

Copy link
Contributor

@remcowesterhoud remcowesterhoud left a comment

Choose a reason for hiding this comment

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

Thanks @Zelldon 🚀

bors merge

zeebe-bors-camunda bot added a commit that referenced this pull request May 1, 2023
12606: Restore blacklist metric r=remcowesterhoud a=Zelldon

## Description
On restart/recovery we need to restore the blacklist metric in order to report it always. Otherwise, we will have gaps in the reports and it is not reliable, due to restarts and resetting of counters.

Change counter to gauge, such that it can be reset/set to a specific value based on the state.

See related comment #8263 (comment)

<!-- Please explain the changes you made here. -->

## Related issues

<!-- Which issues are closed by this PR or are related -->

closes #8263



Co-authored-by: Christopher Zell <zelldon91@googlemail.com>
@zeebe-bors-camunda
Copy link
Contributor

Build failed:

@remcowesterhoud
Copy link
Contributor

There is lots of networking issues with Maven today. Let's retry tomorrow.

@Zelldon
Copy link
Member Author

Zelldon commented May 2, 2023

bors r+

@zeebe-bors-camunda
Copy link
Contributor

Build succeeded:

@zeebe-bors-camunda zeebe-bors-camunda bot merged commit b6e73bb into main May 2, 2023
30 checks passed
@zeebe-bors-camunda zeebe-bors-camunda bot deleted the zell-blacklist-metrics branch May 2, 2023 06:37
@Zelldon Zelldon added backport stable/8.0 backport stable/8.2 Backport a pull request to 8.2.x labels May 3, 2023
@Zelldon
Copy link
Member Author

Zelldon commented May 3, 2023

/backport

@backport-action
Copy link
Collaborator

Backport failed for stable/8.0, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin stable/8.0
git worktree add -d .worktree/backport-12606-to-stable/8.0 origin/stable/8.0
cd .worktree/backport-12606-to-stable/8.0
git checkout -b backport-12606-to-stable/8.0
ancref=$(git merge-base d7a0344d28d7032ff689d2aa28c78d080034057f ffb030f3428eb21d8df61cd5edf10fde77550cac)
git cherry-pick -x $ancref..ffb030f3428eb21d8df61cd5edf10fde77550cac

@backport-action
Copy link
Collaborator

Backport failed for stable/8.1, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin stable/8.1
git worktree add -d .worktree/backport-12606-to-stable/8.1 origin/stable/8.1
cd .worktree/backport-12606-to-stable/8.1
git checkout -b backport-12606-to-stable/8.1
ancref=$(git merge-base d7a0344d28d7032ff689d2aa28c78d080034057f ffb030f3428eb21d8df61cd5edf10fde77550cac)
git cherry-pick -x $ancref..ffb030f3428eb21d8df61cd5edf10fde77550cac

@backport-action
Copy link
Collaborator

Successfully created backport PR for stable/8.2:

zeebe-bors-camunda bot added a commit that referenced this pull request May 3, 2023
12643: [Backport stable/8.2] fix: brokers can list more than 255 backups r=deepthidevaki a=oleschoenburg

Manual backport of #12621 to fix revapi merge conflicts.

12644: [Backport stable/8.2] Restore blacklist metric r=Zelldon a=backport-action

# Description
Backport of #12606 to `stable/8.2`.

relates to #8263

Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
Co-authored-by: Christopher Zell <zelldon91@googlemail.com>
zeebe-bors-camunda bot added a commit that referenced this pull request May 3, 2023
12629: [Backport 8.1]: Introduce experimental SST partitioning r=remcowesterhoud a=Zelldon

## Description
Backports #12483 
<!-- Please explain the changes you made here. -->

## Related issues

<!-- Which issues are closed by this PR or are related -->

relates to #12033



12646: [Backport 8.1]: Restore blacklist metric r=remcowesterhoud a=Zelldon

## Description
Backports #12606

Merge conflicts because of imports.

## Related issues

closes #8263



Co-authored-by: Christopher Zell <zelldon91@googlemail.com>
Co-authored-by: Christopher Kujawa (Zell) <zelldon91@googlemail.com>
zeebe-bors-camunda bot added a commit that referenced this pull request May 3, 2023
12630: [Backport 8.0]: Introduce experimental SST partitioning r=remcowesterhoud a=Zelldon

## Description
Backports  #12483
<!-- Please explain the changes you made here. -->

## Related issues

<!-- Which issues are closed by this PR or are related -->

closes #12033



12645: [Backport 8.0]: Restore blacklist metric r=remcowesterhoud a=Zelldon

## Description

Backports #12606
<!-- Please explain the changes you made here. -->

The PR https://github.com/camunda/zeebe/pull/12306/files wasn't backported to 8.0, which caused some conflicts. I had to add the onRecovered method and call it in the ZeebeDbState.

## Related issues

<!-- Which issues are closed by this PR or are related -->

closes #8263



Co-authored-by: Christopher Zell <zelldon91@googlemail.com>
Co-authored-by: Christopher Kujawa (Zell) <zelldon91@googlemail.com>
@remcowesterhoud remcowesterhoud added release/8.0.14 version:8.2.4 Marks an issue as being completely or in parts released in 8.2.4 labels May 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport stable/8.2 Backport a pull request to 8.2.x version:8.2.4 Marks an issue as being completely or in parts released in 8.2.4
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show blacklisting in the Grafana Dashboard
3 participants