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

Update JWT auth page #87523

Merged
merged 1 commit into from May 14, 2024
Merged

Update JWT auth page #87523

merged 1 commit into from May 14, 2024

Conversation

rjcrutch
Copy link
Contributor

@rjcrutch rjcrutch commented May 8, 2024

JWT is not applicable/available to Grafana Cloud. Only on-premise.

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

JWT is not applicable/available to Grafana Cloud. Only on-premise.
@rjcrutch rjcrutch added type/docs no-changelog Skip including change in changelog/release notes labels May 8, 2024
@rjcrutch rjcrutch requested a review from chri2547 as a code owner May 8, 2024 17:40
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone May 8, 2024
Copy link
Contributor

@JStickler JStickler left a comment

Choose a reason for hiding this comment

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

[docs team]

@jdbaldry jdbaldry added backport v9.4.x Mark PR for automatic backport to v9.4.x backport v9.5.x Bot will automatically open backport PR backport v10.0.x backport v10.1.x backport v10.2.x backport v10.3.x Mark PR for automatic backport to v10.3.x backport v10.4.x backport v11.0.x Mark PR for automatic backport to v11.0.x labels May 9, 2024
Copy link
Contributor

This PR must be merged before a backport PR will be created.

7 similar comments
Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

This PR must be merged before a backport PR will be created.

@jdbaldry jdbaldry merged commit c912cb3 into main May 14, 2024
33 of 34 checks passed
@jdbaldry jdbaldry deleted the jwt-docproduct-fix branch May 14, 2024 14:11
@ephemeral-instances-bot
Copy link

Error building instance: Contact #proj-ephemeral-hg-instances if it is not a compile error. Logs

Error message

handling pull request closed event: deleting instance by slug: unexpected response status: status=502 responseBody=

<title>502 Server Error</title>

Error: Server Error

The server encountered a temporary error and could not complete your request.

Please try again in 30 seconds.

Copy link
Contributor

The backport to v9.4.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-87523-to-v9.4.x origin/v9.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x c912cb399bf87cb335b9f9cbaef92fc8f92bc795

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-87523-to-v9.4.x
# Create the PR body template
PR_BODY=$(gh pr view 87523 --json body --template 'Backport c912cb399bf87cb335b9f9cbaef92fc8f92bc795 from #87523{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v9.4.x] Update JWT auth page" --body-file - --label "type/docs" --label "no-changelog" --label "backport" --base v9.4.x --milestone 9.4.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-87523-to-v9.4.x

# Create a pull request where the `base` branch is `v9.4.x` and the `compare`/`head` branch is `backport-87523-to-v9.4.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87523-to-v9.4.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label May 14, 2024
Copy link
Contributor

The backport to v9.5.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-87523-to-v9.5.x origin/v9.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x c912cb399bf87cb335b9f9cbaef92fc8f92bc795

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-87523-to-v9.5.x
# Create the PR body template
PR_BODY=$(gh pr view 87523 --json body --template 'Backport c912cb399bf87cb335b9f9cbaef92fc8f92bc795 from #87523{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v9.5.x] Update JWT auth page" --body-file - --label "type/docs" --label "no-changelog" --label "backport" --base v9.5.x --milestone 9.5.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-87523-to-v9.5.x

# Create a pull request where the `base` branch is `v9.5.x` and the `compare`/`head` branch is `backport-87523-to-v9.5.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87523-to-v9.5.x

grafana-delivery-bot bot pushed a commit that referenced this pull request May 14, 2024
(cherry picked from commit c912cb3)
grafana-delivery-bot bot pushed a commit that referenced this pull request May 14, 2024
(cherry picked from commit c912cb3)
grafana-delivery-bot bot pushed a commit that referenced this pull request May 14, 2024
(cherry picked from commit c912cb3)
grafana-delivery-bot bot pushed a commit that referenced this pull request May 14, 2024
(cherry picked from commit c912cb3)
grafana-delivery-bot bot pushed a commit that referenced this pull request May 14, 2024
(cherry picked from commit c912cb3)
grafana-delivery-bot bot pushed a commit that referenced this pull request May 14, 2024
(cherry picked from commit c912cb3)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport v9.4.x Mark PR for automatic backport to v9.4.x backport v9.5.x Bot will automatically open backport PR backport v10.0.x backport v10.1.x backport v10.2.x backport v10.3.x Mark PR for automatic backport to v10.3.x backport v10.4.x backport v11.0.x Mark PR for automatic backport to v11.0.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. no-changelog Skip including change in changelog/release notes type/docs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants