Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add configuration support for DataDog multi-regions #48

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Add configuration support for DataDog multi-regions #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
284 changes: 169 additions & 115 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions docker-build/docker.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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



4 changes: 2 additions & 2 deletions fluent.conf.rt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions fluent.conf.xray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions helm/artifactory-ha-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions helm/artifactory-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion helm/jfrog_helm.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions helm/xray-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion jfrog.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading