From 87a36ee7ea63879432a242dc60aff51ac7590f06 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Mon, 25 Mar 2024 14:18:28 -0700 Subject: [PATCH] chore: grafana internal credentials (#59) --- .github/workflows/pull-request-master.yml | 28 +++++++++++++---------- .github/workflows/push-master.yml | 28 +++++++++++++---------- .github/workflows/push-tag-release.yml | 7 +++--- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/.github/workflows/pull-request-master.yml b/.github/workflows/pull-request-master.yml index b26c7af..a978f66 100644 --- a/.github/workflows/pull-request-master.yml +++ b/.github/workflows/pull-request-master.yml @@ -49,12 +49,13 @@ jobs: actions: read steps: - name: ci-lint - uses: smartcontractkit/.github/actions/ci-lint-go@9e7cc0779934cae4a9028b8588c9adb64d8ce68c # ci-lint-go@0.1.0 + uses: smartcontractkit/.github/actions/ci-lint-go@5b1046c28343660ecb84844c6fa95a66d1cdb52e # ci-lint-go@0.2.1 with: # grafana inputs metrics-job-name: ci-lint - gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} - gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} # env inputs use-env-files: "true" env-files: ./tools/env/ci.env @@ -69,12 +70,13 @@ jobs: runs-on: ubuntu-latest steps: - name: ci-lint-misc - uses: smartcontractkit/.github/actions/ci-lint-misc@9e7cc0779934cae4a9028b8588c9adb64d8ce68c # ci-lint-misc@0.1.0 + uses: smartcontractkit/.github/actions/ci-lint-misc@6b08487b176ef7cad086526d0b54ddff6691c044 # ci-lint-misc@0.1.1 with: # grafana inputs metrics-job-name: ci-lint-misc - gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} - gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} ci-test: runs-on: ubuntu-latest @@ -84,12 +86,13 @@ jobs: actions: read steps: - name: ci-test - uses: smartcontractkit/.github/actions/ci-test-go@9e7cc0779934cae4a9028b8588c9adb64d8ce68c # ci-test-go@0.1.0 + uses: smartcontractkit/.github/actions/ci-test-go@5b1046c28343660ecb84844c6fa95a66d1cdb52e # ci-test-go@0.1.2 with: # grafana inputs metrics-job-name: ci-test - gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} - gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} # docker inputs use-docker-compose: "true" docker-compose-workdir: ./tools/docker/setup-postgres @@ -108,12 +111,13 @@ jobs: runs-on: ubuntu-latest steps: - name: ci-sonarqube - uses: smartcontractkit/.github/actions/ci-sonarqube@cc4cbbd6d39a8e84915b356379a4ef6a16dceaf9 # ci-sonarqube@0.2.0 + uses: smartcontractkit/.github/actions/ci-sonarqube@5b1046c28343660ecb84844c6fa95a66d1cdb52e # ci-sonarqube@0.3.2 with: # grafana inputs metrics-job-name: ci-sonarqube - gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} - gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} # sonarqube inputs sonar-token: ${{ secrets.SONAR_TOKEN }} sonar-host-url: ${{ secrets.SONAR_HOST_URL }} diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index 0c450e4..16b7666 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -40,12 +40,13 @@ jobs: actions: read steps: - name: ci-lint - uses: smartcontractkit/.github/actions/ci-lint-go@f94f14f46f7b3c51c49bffbea420edd2f01134dc # ci-lint-go@0.2.0 + uses: smartcontractkit/.github/actions/ci-lint-go@5b1046c28343660ecb84844c6fa95a66d1cdb52e # ci-lint-go@0.2.1 with: # grafana inputs metrics-job-name: ci-lint - gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} - gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} # env inputs use-env-files: "true" env-files: ./tools/env/ci.env @@ -64,12 +65,13 @@ jobs: actions: read steps: - name: ci-test - uses: smartcontractkit/.github/actions/ci-test-go@9e7cc0779934cae4a9028b8588c9adb64d8ce68c # ci-test-go@0.1.0 + uses: smartcontractkit/.github/actions/ci-test-go@5b1046c28343660ecb84844c6fa95a66d1cdb52e # ci-test-go@0.1.2 with: # grafana inputs metrics-job-name: ci-test - gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} - gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} # docker inputs use-docker-compose: "true" docker-compose-workdir: ./tools/docker/setup-postgres @@ -88,12 +90,13 @@ jobs: runs-on: ubuntu-latest steps: - name: ci-sonarqube - uses: smartcontractkit/.github/actions/ci-sonarqube@cc4cbbd6d39a8e84915b356379a4ef6a16dceaf9 # ci-sonarqube@0.2.0 + uses: smartcontractkit/.github/actions/ci-sonarqube@5b1046c28343660ecb84844c6fa95a66d1cdb52e # ci-sonarqube@0.3.2 with: # grafana inputs metrics-job-name: ci-sonarqube - gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} - gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} # sonarqube inputs sonar-token: ${{ secrets.SONAR_TOKEN }} sonar-host-url: ${{ secrets.SONAR_HOST_URL }} @@ -109,7 +112,7 @@ jobs: steps: - name: cd-release id: cd-release - uses: smartcontractkit/.github/actions/cicd-changesets@c5b65fcfe12a5a14b60b03605748af0b0c6cfbea # cicd-changesets@0.2.0 + uses: smartcontractkit/.github/actions/cicd-changesets@5b1046c28343660ecb84844c6fa95a66d1cdb52e # cicd-changesets@0.2.2 with: # general inputs git-user: app-token-issuer-foundations[bot] @@ -121,8 +124,9 @@ jobs: aws-lambda-url: ${{ secrets.AWS_FOUNDATIONS_GATI_URL }} # grafana inputs metrics-job-name: cd-release - gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} - gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} cicd-build-publish-artifacts-release: # Call push-tag-release for median@7.7.7 diff --git a/.github/workflows/push-tag-release.yml b/.github/workflows/push-tag-release.yml index ae47f01..85c27b5 100644 --- a/.github/workflows/push-tag-release.yml +++ b/.github/workflows/push-tag-release.yml @@ -65,7 +65,7 @@ jobs: actions: read steps: - name: cicd-build-publish-artifacts-release - uses: smartcontractkit/.github/actions/cicd-build-publish-artifacts-go@25645c21796ebb5554693fcc0d312dc88330fbe0 # cicd-build-publish-artifacts-go@0.2.0 + uses: smartcontractkit/.github/actions/cicd-build-publish-artifacts-go@5b1046c28343660ecb84844c6fa95a66d1cdb52e # cicd-build-publish-artifacts-go@0.2.2 with: # general inputs app-name: chainlink-feeds-${{ needs.check-tags.outputs.tag-name }} @@ -74,8 +74,9 @@ jobs: checkout-ref: ${{ inputs.tag }} # grafana inputs metrics-job-name: cicd-build-publish-artifacts-release - gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} - gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} # aws inputs aws-region: ${{ secrets.AWS_REGION }} aws-role-arn: ${{ secrets.AWS_OIDC_IAM_ROLE_ARN }}