Skip to content

feat: accept X-Grafana-Service-Account-Token in headers too #280

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: accept X-Grafana-Service-Account-Token in headers too #280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions mcpgrafana.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ const (
grafanaUsernameEnvVar = "GRAFANA_USERNAME"
grafanaPasswordEnvVar = "GRAFANA_PASSWORD"

grafanaURLHeader = "X-Grafana-URL"
grafanaAPIKeyHeader = "X-Grafana-API-Key"
grafanaURLHeader = "X-Grafana-URL"
grafanaServiceAccountTokenHeader = "X-Grafana-Service-Account-Token"
grafanaAPIKeyHeader = "X-Grafana-API-Key" // Deprecated: use X-Grafana-Service-Account-Token instead
)

func urlAndAPIKeyFromEnv() (string, string) {
Expand Down Expand Up @@ -68,7 +69,15 @@ func userAndPassFromEnv() *url.Userinfo {

func urlAndAPIKeyFromHeaders(req *http.Request) (string, string) {
u := strings.TrimRight(req.Header.Get(grafanaURLHeader), "/")
apiKey := req.Header.Get(grafanaAPIKeyHeader)

// Check for the new service account token header first
apiKey := req.Header.Get(grafanaServiceAccountTokenHeader)
if apiKey != "" {
return u, apiKey
}

// Fall back to the deprecated API key header
apiKey = req.Header.Get(grafanaAPIKeyHeader)
return u, apiKey
}

Expand Down
Loading