Skip to content

Commit cc69b6c

Browse files
Merge pull request #314458 from qingc/qingc-mcp-oauth
Add OAuth support for MCP server
2 parents fc99bca + da64ec5 commit cc69b6c

1 file changed

Lines changed: 24 additions & 1 deletion

File tree

articles/managed-grafana/grafana-mcp-server.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ To connect to the AMG-MCP endpoint, you need to configure your MCP client with t
4545

4646
- [**Grafana service account token:**](#grafana-service-account-token) A token generated from your Grafana instance (format: `glsa_xxx`)
4747
- [**Entra ID token:**](#entra-id-token) An Azure AD/Entra ID token (e.g., from a managed identity or service principal)
48+
- [**OAuth authentication with Entra ID:**](#oauth-authentication-with-entra-id) An interactive browser-based login flow. The MCP client handles the OAuth flow automatically. Supported by Visual Studio Code with GitHub Copilot and Visual Studio with GitHub Copilot.
4849

4950
### Grafana service account token
5051

@@ -95,6 +96,28 @@ Use an Entra ID token (Azure AD token) for authentication. This approach is usef
9596
}
9697
```
9798

99+
### OAuth authentication with Entra ID
100+
101+
AMG-MCP supports OAuth authentication using Entra ID. No manual token configuration is needed. The following clients are supported:
102+
- Visual Studio Code with GitHub Copilot
103+
- Visual Studio with GitHub Copilot
104+
105+
106+
In your Visual Studio Code or Visual Studio MCP configuration, add the following setting. Replace `<grafana-endpoint>` with your Grafana endpoint.
107+
108+
```json
109+
{
110+
"servers": {
111+
"my-grafana-mcp-server": {
112+
"type": "http",
113+
"url": "https://<grafana-endpoint>/api/azure-mcp"
114+
}
115+
}
116+
}
117+
```
118+
119+
When GitHub Copilot connects to the MCP server, it prompts you to sign in with your Entra ID account.
120+
98121
## Examples
99122

100123
The following examples further demonstrate configuring AMG-MCP in your settings.
@@ -166,4 +189,4 @@ If you encounter any issues, open an issue in the [Azure Managed Grafana GitHub
166189
> [Configure MCP for AI Foundry agents](./how-to-configure-mcp-for-ai-foundry.md)
167190
>
168191
> [!div class="nextstepaction"]
169-
> [Enable zone redundancy](./how-to-enable-zone-redundancy.md)
192+
> [Enable zone redundancy](./how-to-enable-zone-redundancy.md)

0 commit comments

Comments
 (0)