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(dns): added /status/dns API to status_listen port #13466

Merged
merged 2 commits into from
Aug 9, 2024

Conversation

chobits
Copy link
Contributor

@chobits chobits commented Aug 7, 2024

Summary

The dns statistics API should be added into status_listen port, otherwise we'll not get the DNS statistics from admin_listen port in DP.

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 KAG-5115

@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Aug 7, 2024
@chobits chobits force-pushed the fix/dns_stats_api_path branch from a01e13c to 2dc24ea Compare August 7, 2024 08:40
@chobits chobits force-pushed the fix/dns_stats_api_path branch from 0c1a3c0 to eb2f185 Compare August 7, 2024 08:53
@pull-request-size pull-request-size bot added size/L and removed size/M labels Aug 7, 2024
@chobits chobits force-pushed the fix/dns_stats_api_path branch from 2844eb6 to 9e4c795 Compare August 7, 2024 09:58
@chobits chobits requested review from ADD-SP and chronolaw August 7, 2024 09:58
@chobits chobits force-pushed the fix/dns_stats_api_path branch from 9e4c795 to 78312b2 Compare August 7, 2024 10:00
Copy link
Contributor

@ADD-SP ADD-SP left a comment

Choose a reason for hiding this comment

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

Shall we add a changelog entry?

@chobits

This comment was marked as resolved.

@chobits

This comment was marked as resolved.

@chobits chobits force-pushed the fix/dns_stats_api_path branch from 78312b2 to fca4938 Compare August 8, 2024 09:19
@chobits chobits force-pushed the fix/dns_stats_api_path branch from fca4938 to 39e6b79 Compare August 8, 2024 09:23
@chobits
Copy link
Contributor Author

chobits commented Aug 8, 2024

Shall we add a changelog entry?

fixed

@ADD-SP ADD-SP merged commit 9d8933d into master Aug 9, 2024
27 checks passed
@ADD-SP ADD-SP deleted the fix/dns_stats_api_path branch August 9, 2024 03:03
@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-13466-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13466-to-master-to-upstream
git checkout -b cherry-pick-13466-to-master-to-upstream
ancref=$(git merge-base 0f73339b558497d4ecd4d0fb64ad866270ff164b 6ddc7e2d1b51558b16a1fcbacacd4fe400f7d06f)
git cherry-pick -x $ancref..6ddc7e2d1b51558b16a1fcbacacd4fe400f7d06f

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Aug 9, 2024
@chobits
Copy link
Contributor Author

chobits commented Aug 9, 2024

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-13466-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13466-to-master-to-upstream
git checkout -b cherry-pick-13466-to-master-to-upstream
ancref=$(git merge-base 0f73339b558497d4ecd4d0fb64ad866270ff164b 6ddc7e2d1b51558b16a1fcbacacd4fe400f7d06f)
git cherry-pick -x $ancref..6ddc7e2d1b51558b16a1fcbacacd4fe400f7d06f

wait this https://github.com/Kong/kong-ee/pull/9913 to be merged, then I'll trigger the bot to cherry pick it.

@chobits chobits added cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee and removed cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Aug 12, 2024
@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-13466-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13466-to-master-to-upstream
git checkout -b cherry-pick-13466-to-master-to-upstream
ancref=$(git merge-base 0f73339b558497d4ecd4d0fb64ad866270ff164b 6ddc7e2d1b51558b16a1fcbacacd4fe400f7d06f)
git cherry-pick -x $ancref..6ddc7e2d1b51558b16a1fcbacacd4fe400f7d06f

@kikito kikito removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Aug 13, 2024
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/admin-api size/L skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants