opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 14:32:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

CloudWatch: Fix http client handling + assume role bug (#107893)

Browse Source
This commit is contained in:
Nathan Vērzemnieks
2025-07-09 06:28:50 -07:00
committed by GitHub
parent c5fbf6217c
commit f34a9fc0c2
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/tsdb/cloudwatch/cloudwatch.go
View File

@ -16,9 +16,9 @@ import (
"github.com/grafana/grafana-aws-sdk/pkg/awsauth" "github.com/grafana/grafana-aws-sdk/pkg/awsauth"
"github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt" "github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
"github.com/grafana/grafana-plugin-sdk-go/backend/log" "github.com/grafana/grafana-plugin-sdk-go/backend/log"
"github.com/grafana/grafana-plugin-sdk-go/backend/proxy"
"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter" "github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/clients" "github.com/grafana/grafana/pkg/tsdb/cloudwatch/clients"
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery" "github.com/grafana/grafana/pkg/tsdb/cloudwatch/kinds/dataquery"
@ -50,7 +50,7 @@ type DataQueryJson struct {
type DataSource struct { type DataSource struct {
Settings models.CloudWatchSettings Settings models.CloudWatchSettings
HTTPClient *http.Client ProxyOpts *proxy.Options
AWSConfigProvider awsauth.ConfigProvider AWSConfigProvider awsauth.ConfigProvider
logger log.Logger logger log.Logger
@ -74,7 +74,10 @@ func (ds *DataSource) newAWSConfig(ctx context.Context, region string) (aws.Conf
Region: region, Region: region,
AccessKey: ds.Settings.AccessKey, AccessKey: ds.Settings.AccessKey,
SecretKey: ds.Settings.SecretKey, SecretKey: ds.Settings.SecretKey,
HTTPClient: ds.HTTPClient, HTTPClient: &http.Client{},
}
if ds.Settings.GrafanaSettings.SecureSocksDSProxyEnabled && ds.Settings.SecureSocksProxyEnabled {
authSettings.ProxyOptions = ds.ProxyOpts
} }
cfg, err := ds.AWSConfigProvider.GetConfig(ctx, authSettings) cfg, err := ds.AWSConfigProvider.GetConfig(ctx, authSettings)
if err != nil { if err != nil {
@ -93,14 +96,11 @@ func NewDatasource(ctx context.Context, settings backend.DataSourceInstanceSetti
if err != nil { if err != nil {
return nil, err return nil, err
} }
httpClient, err := httpclient.New(opts)
if err != nil {
return nil, err
}
ds := &DataSource{ ds := &DataSource{
Settings: instanceSettings, Settings: instanceSettings,
HTTPClient: httpClient, // this is used to build a custom dialer when secure socks proxy is enabled
ProxyOpts: opts.ProxyOptions,
AWSConfigProvider: awsauth.NewConfigProvider(), AWSConfigProvider: awsauth.NewConfigProvider(),
logger: backend.NewLoggerWith("logger", "grafana-cloudwatch-datasource"), logger: backend.NewLoggerWith("logger", "grafana-cloudwatch-datasource"),
tagValueCache: cache.New(tagValueCacheExpiration, tagValueCacheExpiration*5), tagValueCache: cache.New(tagValueCacheExpiration, tagValueCacheExpiration*5),