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

MSSQL Integration - Update documentation with extra windows authentication details #6325

Merged

Conversation

StefanKurek
Copy link
Contributor

PR Description

Updates MSSQL Integration documentation to explicitly mention some of the windows authentication options that can be used within the connection_string config param for both static and flow modes.

Which issue(s) this PR fixes

NA

Notes to the Reviewer

PR Checklist

  • CHANGELOG.md updated
  • Documentation added

@edwin-onattu
Copy link

Requested by WF

Copy link
Contributor

@clayton-cornell clayton-cornell left a comment

Choose a reason for hiding this comment

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

Some suggestions

@clayton-cornell clayton-cornell added the type/docs Docs Squad label across all Grafana Labs repos label Feb 7, 2024
@StefanKurek StefanKurek force-pushed the feat/update-mssql-integration-docs branch from b0af3a9 to fe2fdb6 Compare February 7, 2024 20:35
@StefanKurek
Copy link
Contributor Author

@clayton-cornell Implemented your feedback (with a few tweaks). Ready for another look.

Copy link
Contributor

@clayton-cornell clayton-cornell left a comment

Choose a reason for hiding this comment

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

LGTM

@StefanKurek StefanKurek force-pushed the feat/update-mssql-integration-docs branch 2 times, most recently from ae4b178 to 1702b5a Compare February 8, 2024 13:12
Copy link
Contributor

@clayton-cornell clayton-cornell left a comment

Choose a reason for hiding this comment

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

LGTM

@clayton-cornell
Copy link
Contributor

@StefanKurek This looks safe to backport to v0.39, 0.38, and 0.37... correct?

@StefanKurek
Copy link
Contributor Author

StefanKurek commented Feb 8, 2024

@StefanKurek This looks safe to backport to v0.39, 0.38, and 0.37... correct?

@clayton-cornell Yeah, this shouldn't be an issue.

@StefanKurek StefanKurek force-pushed the feat/update-mssql-integration-docs branch from 36218ad to 7f0444b Compare February 8, 2024 18:25
@clayton-cornell clayton-cornell merged commit 86e6378 into grafana:main Feb 8, 2024
13 checks passed
@grafanabot
Copy link
Contributor

The backport to release-v0.37 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-6325-to-release-v0.37 origin/release-v0.37
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 86e6378145461d79a554d08327b64e0fca57629f
# Push it to GitHub
git push --set-upstream origin backport-6325-to-release-v0.37
git switch main
# Remove the local backport branch
git branch -D backport-6325-to-release-v0.37

Then, create a pull request where the base branch is release-v0.37 and the compare/head branch is backport-6325-to-release-v0.37.

@grafanabot
Copy link
Contributor

The backport to release-v0.38 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-6325-to-release-v0.38 origin/release-v0.38
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 86e6378145461d79a554d08327b64e0fca57629f
# Push it to GitHub
git push --set-upstream origin backport-6325-to-release-v0.38
git switch main
# Remove the local backport branch
git branch -D backport-6325-to-release-v0.38

Then, create a pull request where the base branch is release-v0.38 and the compare/head branch is backport-6325-to-release-v0.38.

@grafanabot
Copy link
Contributor

The backport to release-v0.39 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-6325-to-release-v0.39 origin/release-v0.39
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 86e6378145461d79a554d08327b64e0fca57629f
# Push it to GitHub
git push --set-upstream origin backport-6325-to-release-v0.39
git switch main
# Remove the local backport branch
git branch -D backport-6325-to-release-v0.39

Then, create a pull request where the base branch is release-v0.39 and the compare/head branch is backport-6325-to-release-v0.39.

@clayton-cornell
Copy link
Contributor

Cancelled backport to v0.38 and v0.37. There are too many differences in this section between 0.39 and previous versions.

@StefanKurek StefanKurek deleted the feat/update-mssql-integration-docs branch February 9, 2024 13:55
BarunKGP pushed a commit to BarunKGP/grafana-agent that referenced this pull request Feb 20, 2024
…ation details (grafana#6325)

* Updates MSSQL Integrations docs with extra auth details

* Tweaks wording of MSSQL integration auth section in docs
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Mar 11, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport release-v0.39 frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. type/docs Docs Squad label across all Grafana Labs repos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants