modify again

paypal · Nov 26, 2024 · 0ae8186 · 0ae8186
1 parent ddf6dae
commit 0ae8186
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,5 @@
-FROM dockerhub.paypalcorp.com/golang:1.22-bullseye AS builder
+FROM golang:1.22
 
-ENV GOPROXY=https://artifactory.g.devqa.gcp.dev.paypalinc.com/artifactory/api/go/go
 WORKDIR /go/src/github.com/paypal/load-watcher
 COPY . .
 RUN make build

diff --git a/pkg/watcher/internal/metricsprovider/datadog.go b/pkg/watcher/internal/metricsprovider/datadog.go
@@ -34,7 +34,7 @@ import (
 
 const (
 	// Datadog Request Params
-	DefaultDatadogAddress    = "paypal-prod.datadoghq.com"
+	DefaultDatadogAddress    = "datadoghq.com"
 	datadogHostFilter        = "host:"
 	datadogClusterFilter     = "cluster_name:"
 	datadogHostNameSuffixKey = "DATADOG_HOST_NAME_SUFFIX"
@@ -340,12 +340,12 @@ Sample input:
         {
           "name": "query1",
           "data_source": "metrics",
-          "query": "max:cpu.utilization{host:dcg01pimangedp99991.dcg01.chd.paypalinc.com, cluster_name:dcg01bmcaas} by {host}.rollup(max, 60) "
+          "query": "max:cpu.utilization{host:<host>, cluster_name:<cluster_name>} by {host}.rollup(max, 60) "
         },
         {
           "name": "query2",
           "data_source": "metrics",
-          "query": "max:memory.utilization{host:dcg01pimangedp99991.dcg01.chd.paypalinc.com, cluster_name:dcg01bmcaas} by {host}.rollup(max, 60)"
+          "query": "max:memory.utilization{host:<host>, cluster_name:<cluster_name>} by {host}.rollup(max, 60)"
         }
       ],
       "interval": 900
@@ -366,14 +366,14 @@ Sample metricData output:
             "series": [
                 {
                     "group_tags": [
-                        "host:dcg01pimangedp99991.dcg01.chd.paypalinc.com"
+                        "host:<host>"
                     ],
                     "query_index": 0,
                     "unit": null
                 },
                 {
                     "group_tags": [
-                        "host:dcg01pimangedp99991.dcg01.chd.paypalinc.com"
+                        "host:<host>>"
                     ],
                     "query_index": 1,
                     "unit": null

diff --git a/pkg/watcher/internal/metricsprovider/datadog_test.go b/pkg/watcher/internal/metricsprovider/datadog_test.go
@@ -9,7 +9,7 @@ import (
 
 // Below environment variables need to be set in order to run the unit test
 // DATADOG_CLUSTER_NAME
-// METRICS_PROVIDER_ADDRESS defaults to paypal-prod.datadoghq.com
+// METRICS_PROVIDER_ADDRESS defaults to datadoghq.com
 // METRICS_PROVIDER_APP_KEY
 // METRICS_PROVIDER_TOKEN
 // host