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

fix(clustering): fix compat for prometheus ai metrics config fields #13417

Merged
merged 1 commit into from
Jul 26, 2024

Conversation

AntoineJac
Copy link
Contributor

@AntoineJac AntoineJac commented Jul 23, 2024

Summary

Fix compat prometheus ai metrics
https://konghq.atlassian.net/browse/KAG-4934

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix #[issue number]

@github-actions github-actions bot added core/clustering cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Jul 23, 2024
@fffonion fffonion changed the title feat: fix compat prometheus ai metrics fix(clustering) fix compat for prometheus ai metrics config fields Jul 23, 2024
@@ -37,6 +37,18 @@ local compatible_checkers = {
dp_version, log_suffix)
end
end

if plugin.name == 'prometheus' then
Copy link
Contributor

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

Copy link
Contributor Author

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

Copy link
Contributor

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 😅

Copy link
Contributor Author

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

@fffonion fffonion force-pushed the feat/fix-prometheus-ai-compat branch from 8fd525e to cae5dfa Compare July 26, 2024 08:22
@AndyZhang0707 AndyZhang0707 changed the title fix(clustering) fix compat for prometheus ai metrics config fields fix(clustering): fix compat for prometheus ai metrics config fields Jul 26, 2024
@fffonion fffonion merged commit c8c5877 into master Jul 26, 2024
27 checks passed
@fffonion fffonion deleted the feat/fix-prometheus-ai-compat branch July 26, 2024 08:54
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

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

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Jul 26, 2024
@AntoineJac
Copy link
Contributor Author

here is the cherry pick PR: https://github.com/Kong/kong-ee/pull/9807

@AndyZhang0707 AndyZhang0707 removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Aug 1, 2024
oowl pushed a commit that referenced this pull request Aug 15, 2024
…13417)(#9807)

* fix(clustering): fix compat for prometheus ai metrics config fields (#13417)

KAG-4934

(cherry picked from commit c8c5877)

* Update removed_fields.lua
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee core/clustering size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants