feat: Add configurable site (#14266)

mnorbury · web-flow · commit 2c80f9152545 · 2023-10-02T11:33:38.000Z
Add configurable site to allow other DDog regional sites to be used, if no site is specified the existing behaviour is preserved. fixes: #14265
diff --git a/plugins/source/datadog/client/client.go b/plugins/source/datadog/client/client.go
@@ -14,6 +14,9 @@ type Client struct {
 	// It will be passed for each resource fetcher.
 	logger zerolog.Logger
 
+	// The site to use for the API calls - see https://docs.datadoghq.com/getting_started/site/
+	Site string
+
 	Accounts []Account
 	// this is set by the table client multiplexer
 	multiplexedAccount Account
@@ -29,22 +32,15 @@ func (c *Client) ID() string {
 }
 
 func (c *Client) BuildContextV1(ctx context.Context) context.Context {
-	return context.WithValue(
-		ctx,
-		datadog.ContextAPIKeys,
-		map[string]datadog.APIKey{
-			"apiKeyAuth": {
-				Key: c.multiplexedAccount.APIKey,
-			},
-			"appKeyAuth": {
-				Key: c.multiplexedAccount.AppKey,
-			},
-		},
-	)
+	return c.buildContext(ctx)
 }
 
 func (c *Client) BuildContextV2(ctx context.Context) context.Context {
-	return context.WithValue(
+	return c.buildContext(ctx)
+}
+
+func (c *Client) buildContext(ctx context.Context) context.Context {
+	ctx = context.WithValue(
 		ctx,
 		datadog.ContextAPIKeys,
 		map[string]datadog.APIKey{
@@ -56,11 +52,21 @@ func (c *Client) BuildContextV2(ctx context.Context) context.Context {
 			},
 		},
 	)
+	if c.Site != "" {
+		ctx = context.WithValue(
+			ctx,
+			datadog.ContextServerVariables,
+			map[string]string{
+				"site": c.Site,
+			})
+	}
+	return ctx
 }
 
 func (c *Client) withAccount(account Account) schema.ClientMeta {
 	return &Client{
 		logger:             c.logger.With().Str("id", account.Name).Logger(),
+		Site:               c.Site,
 		Accounts:           c.Accounts,
 		multiplexedAccount: account,
 		DDServices:         c.DDServices,
@@ -81,6 +87,7 @@ func Configure(ctx context.Context, logger zerolog.Logger, spec *Spec) (schema.C
 
 	client := Client{
 		logger:     logger,
+		Site:       spec.Site,
 		Accounts:   spec.Accounts,
 		DDServices: NewDatadogServices(apiClient),
 	}
diff --git a/plugins/source/datadog/client/spec.go b/plugins/source/datadog/client/spec.go
@@ -3,6 +3,7 @@ package client
 type Spec struct {
 	Accounts    []Account `json:"accounts"`
 	Concurrency int       `json:"concurrency"`
+	Site        string    `json:"site"`
 }
 
 type Account struct {
diff --git a/website/pages/docs/plugins/sources/datadog/_configuration.mdx b/website/pages/docs/plugins/sources/datadog/_configuration.mdx
@@ -14,5 +14,6 @@ spec:
         api_key: <DD_CLIENT_API_KEY> # Required. API key
         app_key: <DD_CLIENT_APP_KEY> # Required. App key
     # Optional parameters
+    # site: datadoghq.eu
     # concurrency: 10000
 ```
diff --git a/website/pages/docs/plugins/sources/datadog/configuration.mdx b/website/pages/docs/plugins/sources/datadog/configuration.mdx
@@ -16,6 +16,10 @@ This is the (nested) spec used by the Datadog source plugin.
 
   Specify which accounts to sync data from.
 
+- `site` (`string`, optional, default: "")
+
+  The Datadog site to connect to. This is usually one of `datadoghq.com` or `datadoghq.eu` - see [site](https://docs.datadoghq.com/getting_started/site/) documentation for more information.
+
 - `concurrency` (`int`, optional, default: `10000`)
 
   A best effort maximum number of Go routines to use. Lower this number to reduce memory usage.

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package client`
`3`	`3`	`type Spec struct {`
`4`	`4`	Accounts []Account `json:"accounts"`
`5`	`5`	Concurrency int `json:"concurrency"`
	`6`	+ Site string `json:"site"`
`6`	`7`	`}`
`7`	`8`
`8`	`9`	`type Account struct {`