Skip to content

Commit

Permalink
CLDR-17699 updated per code review
Browse files Browse the repository at this point in the history
- ddenv to dd_env
- add comments explaining what dd is
  • Loading branch information
srl295 committed Jun 11, 2024
1 parent b8eaab5 commit 6ab111d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: DataDog sourcemap upload
# only on push to main!
if: github.repository == 'unicode-org/cldr' && github.event_name == 'push' && github.ref == 'refs/heads/main' && github.event.inputs.git-ref == ''
run: npx --package=@datadog/datadog-ci datadog-ci sourcemaps upload tools/cldr-apps/src/main/webapp/dist/ --minified-path-prefix=/cldr-apps/dist/ --release-version=r${{ github.event.inputs.git-ref }} --service=surveytool
env:
DATADOG_SITE: ${{ secrets.DATADOG_SITE }}
Expand Down
6 changes: 4 additions & 2 deletions tools/scripts/ansible/hosts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ cldr-smoke.unicode.org
cldr-staging.unicode.org

[staging:vars]
ddenv=staging
# dd_env is the DataDog environment, staging vs prod
dd_env=staging

[prod]
st.unicode.org

[prod:vars]
ddenv=prod
# dd_env is the DataDog environment, staging vs prod
dd_env=prod

# CLDR Commit Checker web hosting here
[ccc]
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/ansible/monitoring-playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
block: |
# enable apm and set the env
enabled: true
env: {{ ddenv }}
env: {{ dd_env }}
marker: '# {mark} ANSIBLE MANAGED BLOCK'
insertafter: '^apm_config:'
2 changes: 1 addition & 1 deletion tools/scripts/ansible/templates/bootstrap-properties.j2
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ org.unicode.cldr.util.CLDRConfigImpl.cldrHome="{{ cldr_path }}"
# datadog things
dd.dynamic.instrumentation.enabled=true
dd.logs.injection=true
dd.env={{ ddenv }}
dd.env={{ dd_env }}

# for DD: use json!
com.ibm.ws.logging.message.format=json
Expand Down

0 comments on commit 6ab111d

Please sign in to comment.