-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
fix(clustering): fix compat for prometheus ai metrics config fields #13417
Conversation
kong/clustering/compat/checkers.lua
Outdated
@@ -37,6 +37,18 @@ local compatible_checkers = { | |||
dp_version, log_suffix) | |||
end | |||
end | |||
|
|||
if plugin.name == 'prometheus' then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this file is meant for complex transformations or deprecation message, for this fix we can just add it here https://github.com/Kong/kong/blob/master/kong/clustering/compat/removed_fields.lua#L147
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@fffonion noted. I just made the change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! We still need the test you prevsiouly added though, sorry I didn't make it clear 😅
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No worries :)
I have Just added it back
8fd525e
to
cae5dfa
Compare
Cherry-pick failed for Please cherry-pick the changes locally. git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13417-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13417-to-master-to-upstream
git checkout -b cherry-pick-13417-to-master-to-upstream
ancref=$(git merge-base 40c86fa09710d8e59f01f839eb26e45d27257876 cae5dfa222e6c7a242e08eda81a7ed7a1cc2db82)
git cherry-pick -x $ancref..cae5dfa222e6c7a242e08eda81a7ed7a1cc2db82 |
here is the cherry pick PR: https://github.com/Kong/kong-ee/pull/9807 |
Summary
Fix compat prometheus ai metrics
https://konghq.atlassian.net/browse/KAG-4934
Checklist
changelog/unreleased/kong
orskip-changelog
label added on PR if changelog is unnecessary. README.mdIssue reference
Fix #[issue number]