IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-11 05:34:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: wip - get metric descriptors in the backend

Browse Source
This commit is contained in:
Erik Sundell
2018-10-22 16:03:13 +02:00
parent 60617d0bf7
commit ff5f281508
3 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/pluginproxy/ds_auth_provider.go
+6 -5
View File
@@ -12,7 +12,6 @@ import (
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/util"
"golang.org/x/oauth2/google"
)
//ApplyRoute should use the plugin route data to set auth headers and custom headers
@@ -56,6 +55,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
}
gceAutoAuthentication := ds.JsonData.Get("gceAutomaticAuthentication").MustBool()
logger.Info("gceAutoAuthentication", "gceAutoAuthentication", gceAutoAuthentication)
if route.JwtTokenAuth != nil && !gceAutoAuthentication {
if token, err := tokenProvider.getJwtAccessToken(ctx, data); err != nil {
logger.Error("Failed to get access token", "error", err)
@@ -65,21 +65,22 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
}
if gceAutoAuthentication {
tokenSrc, err := google.DefaultTokenSource(ctx, route.JwtTokenAuth.Scopes...)
// tokenSrc, err := google.DefaultTokenSource(ctx, route.JwtTokenAuth.Scopes...)
if err != nil {
logger.Error("Failed to get default credentials", "error", err)
} else {
token, err := tokenSrc.Token()
// token, err := tokenSrc.Token()
token, err := tokenProvider.getJwtAccessToken(ctx, data)
if err != nil {
logger.Error("Failed to get default access token", "error", err)
} else {
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
// req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
}
}
}
logger.Info("Requesting", "url", req.URL.String())
}
func interpolateString(text string, data templateData) (string, error) {