diff --git a/.github/workflows/frontend-deploy-workflow-v2.yml b/.github/workflows/frontend-deploy-workflow-v2.yml index a201470..e820890 100644 --- a/.github/workflows/frontend-deploy-workflow-v2.yml +++ b/.github/workflows/frontend-deploy-workflow-v2.yml @@ -303,7 +303,7 @@ jobs: PUBLIC_CDN_URL: ${{ inputs.cdn-url }} GH_TOKEN: ${{ secrets.GH_TOKEN }} JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }} - JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} + JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }} JARVIS_DATADOG_SITE: datadoghq.com JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }} JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }} @@ -636,7 +636,7 @@ jobs: PUBLIC_CDN_URL: ${{ inputs.cdn-url }} # Jarvis Datadog logging JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }} - JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} + JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }} JARVIS_DATADOG_SITE: datadoghq.com JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }} JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }} @@ -655,7 +655,7 @@ jobs: --tags "workflow_version:${{ env.WORKFLOW_VERSION }}" \ --tags "workflow_file:${{ env.WORKFLOW_FILE }}" env: - DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} + DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }} DATADOG_SITE: datadoghq.com - name: Print deployment info diff --git a/.github/workflows/frontend-pr-workflow-v2.yml b/.github/workflows/frontend-pr-workflow-v2.yml index c300760..43e54f0 100644 --- a/.github/workflows/frontend-pr-workflow-v2.yml +++ b/.github/workflows/frontend-pr-workflow-v2.yml @@ -235,6 +235,8 @@ on: required: false DATADOG_API_KEY: required: false + DATADOG_API_KEY_FRONTEND_METRICS: + required: false JENKINS_OKTA_USERNAME: required: false JENKINS_USER_TOKEN: @@ -297,7 +299,7 @@ jobs: PUBLIC_CDN_URL: ${{ inputs.cdn-url }} GH_TOKEN: ${{ secrets.GH_TOKEN }} JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }} - JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} + JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }} JARVIS_DATADOG_SITE: datadoghq.com JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }} JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }} @@ -466,7 +468,7 @@ jobs: AWS_CLOUDFRONT_DIST: ${{ inputs.cloudfront-dist }} PUBLIC_CDN_URL: ${{ inputs.cdn-url }} JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }} - JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} + JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }} JARVIS_DATADOG_SITE: datadoghq.com JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }} JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }} @@ -477,7 +479,7 @@ jobs: --tags "workflow_version:${{ env.WORKFLOW_VERSION }}" \ --tags "workflow_file:${{ env.WORKFLOW_FILE }}" env: - DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} + DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }} DATADOG_SITE: datadoghq.com - name: Print GitHub SHA @@ -647,4 +649,4 @@ jobs: path: | cypress/screenshots/ cypress/videos/ - retention-days: 7 \ No newline at end of file + retention-days: 7