Add configuration support for DataDog multi-regions

jfrog · Apr 24, 2024 · 6649441 · 6649441
1 parent 302d7c0
commit 6649441
Show file tree

Hide file tree

Showing 9 changed files with 187 additions and 124 deletions.
diff --git a/README.md b/README.md
diff --git a/docker-build/docker.env b/docker-build/docker.env
@@ -1,9 +1,7 @@
 JF_PRODUCT_DATA_INTERNAL=path_to_jfrog_logs
 DATADOG_API_KEY=change_me
+DATADOG_API_HOST=datadoghq.com
 JPD_URL=https://change_me.jfrog.io
 JPD_ADMIN_USERNAME=admin
 JFROG_ADMIN_TOKEN=change_me
 COMMON_JPD=false
-
-
-
diff --git a/fluent.conf.rt b/fluent.conf.rt
@@ -14,7 +14,7 @@
   @type jfrog_send_metrics
   target_platform "DATADOG"
   apikey "#{ENV['DATADOG_API_KEY']}"
-  url "https://api.datadoghq.com/api/v2/series"
+  url "https://api.#{ENV['DATADOG_API_HOST']}/api/v2/series"
   # ddtags ["instance:test-artifactory", "cluster:GKE"]
 </match>
 # ALL CALLHOME
@@ -370,7 +370,7 @@
     include_tag_key true
     dd_source jfrog_platform
     service jfrog_artifactory
-    host http-intake.logs.datadoghq.com
+    host "http-intake.logs.#{ENV['DATADOG_API_HOST']}"
     <buffer>
       flush_interval 1s
       # frequency of the buffer flush

diff --git a/fluent.conf.xray b/fluent.conf.xray
@@ -14,7 +14,7 @@
   @type jfrog_send_metrics
   target_platform "DATADOG"
   apikey "#{ENV['DATADOG_API_KEY']}"
-  url "https://api.datadoghq.com/api/v2/series"
+  url "https://api.#{ENV['DATADOG_API_HOST']}/api/v2/series"
   # ddtags ["instance:test-artifactory", "cluster:GKE"]
 </match>
 # ALL CALLHOME
@@ -322,7 +322,7 @@
     include_tag_key true
     dd_source jfrog_platform
     service jfrog_xray
-    host http-intake.logs.datadoghq.com
+    host "http-intake.logs.#{ENV['DATADOG_API_HOST']}"
     <buffer>
       flush_interval 1s
       # frequency of the buffer flush

diff --git a/helm/artifactory-ha-values.yaml b/helm/artifactory-ha-values.yaml
@@ -36,10 +36,13 @@ artifactory:
           value: {{ .Values.jfrog.observability.common_jpd | quote }}
         - name: DATADOG_API_KEY
           value: {{ .Values.datadog.api_key }}
+        - name: DATADOG_API_HOST
+          value: {{ .Values.datadog.api_host }}
         - name: FLUENTD_CONF
           value: ../../../../{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
 datadog:
   api_key: DATADOG_API_KEY
+  api_host: DATADOG_API_HOST
 jfrog:
   observability:
     jpd_url: JPD_URL

diff --git a/helm/artifactory-values.yaml b/helm/artifactory-values.yaml
@@ -36,10 +36,13 @@ artifactory:
           value: {{ .Values.jfrog.observability.common_jpd | quote }}
         - name: DATADOG_API_KEY
           value: {{ .Values.datadog.api_key }}
+        - name: DATADOG_API_HOST
+          value: {{ .Values.datadog.api_host }}
         - name: FLUENTD_CONF
           value: ../../../../{{ .Values.artifactory.persistence.mountPath }}/etc/fluentd/fluentd.conf
 datadog:
   api_key: DATADOG_API_KEY
+  api_host: DATADOG_API_HOST
 jfrog:
   observability:
     jpd_url: JPD_URL

diff --git a/helm/jfrog_helm.env b/helm/jfrog_helm.env
@@ -1,4 +1,5 @@
 export DATADOG_API_KEY=DATADOG_API_KEY
+export DATADOG_API_HOST=datadoghq.com
 export JPD_URL=http://abc.jfrog.io
 export JPD_ADMIN_USERNAME=admin
-export COMMON_JPD=false
+export COMMON_JPD=false
diff --git a/helm/xray-values.yaml b/helm/xray-values.yaml
@@ -42,8 +42,11 @@ common:
           value: {{ .Values.jfrog.observability.common_jpd | quote }}
         - name: DATADOG_API_KEY
           value: {{ .Values.datadog.api_key }}
+        - name: DATADOG_API_HOST
+          value: {{ .Values.datadog.api_host }}
 datadog:
   api_key: DATADOG_API_KEY
+  api_host: DATADOG_API_HOST
 jfrog:
   observability:
     jpd_url: JPD_URL

diff --git a/jfrog.env b/jfrog.env
@@ -1,6 +1,7 @@
 export JF_PRODUCT_DATA_INTERNAL=JF_PRODUCT_DATA_INTERNAL
 export DATADOG_API_KEY=DATADOG_API_KEY
+export DATADOG_API_HOST=datadoghq.com
 export JPD_URL=http://abc.jfrog.io
 export JPD_ADMIN_USERNAME=admin
 export JFROG_ADMIN_TOKEN=JFROG_ADMIN_TOKEN
-export COMMON_JPD=false
+export COMMON_JPD=false