Merge branch 'pg_extraction_log_broadcaster' of https://github.com/sm…

…artcontractkit/chainlink into pg_extraction_tx_store
smartcontractkit · Mar 7, 2024 · 4ea80fd · 4ea80fd
2 parents fcd810b + 65dc6b6
commit 4ea80fd
Show file tree

Hide file tree

Showing 546 changed files with 56,461 additions and 9,228 deletions.
diff --git a/.ct.yml b/.ct.yml
@@ -3,3 +3,8 @@ target-branch: develop
 chart-dirs: 'charts'
 check-version-increment: false
 validate-maintainers: false
+charts-repos:
+  - mockserver=https://www.mock-server.com
+  - opentelemetry-collector=https://open-telemetry.github.io/opentelemetry-helm-charts
+  - tempo=https://grafana.github.io/helm-charts
+  - grafana=https://grafana.github.io/helm-charts
diff --git a/.github/actions/build-chainlink-image/action.yml b/.github/actions/build-chainlink-image/action.yml
@@ -11,10 +11,6 @@ inputs:
   git_commit_sha:
     description: The git commit sha to use for the image tag
     default: ${{ github.sha }}
-  GRAFANA_CLOUD_BASIC_AUTH:
-    description: "grafana cloud basic auth"
-  GRAFANA_CLOUD_HOST:
-    description: "grafana cloud hostname"
   AWS_REGION:
     description: "AWS region to use for ECR"
   AWS_ROLE_TO_ASSUME:

diff --git a/.github/actions/golangci-lint/action.yml b/.github/actions/golangci-lint/action.yml
@@ -21,11 +21,13 @@ inputs:
   go-module-file:
     description: Set where the go module file is located at
     default: "go.sum"
-  # grafana cloud inputs
+  # grafana inputs
   gc-host:
-    description: "grafana cloud hostname"
+    description: "grafana hostname"
   gc-basic-auth:
-    description: "grafana cloud basic auth"
+    description: "grafana basic auth"
+  gc-org-id:
+    description: "grafana org id"
 
 runs:
   using: composite
@@ -64,9 +66,10 @@ runs:
         path: ${{ inputs.go-directory }}/golangci-lint-report.xml
     - name: Collect Metrics
       if: always()
-      uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
+      uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
       with:
         basic-auth: ${{ inputs.gc-basic-auth }}
         hostname: ${{ inputs.gc-host }}
+        org-id: ${{ inputs.gc-org-id }}
         this-job-name: ${{ inputs.name }}
       continue-on-error: true
diff --git a/.github/actions/setup-create-base64-config-live-testnets/action.yml b/.github/actions/setup-create-base64-config-live-testnets/action.yml
@@ -12,6 +12,9 @@ inputs:
     default: "public.ecr.aws/chainlink/chainlink"
   chainlinkVersion:
     description: The git commit sha to use for the image tag
+  chainlinkPostgresVersion:
+    description: The postgres version to use with the chainlink node
+    default: "15.6"
   pyroscopeServer:
     description: URL of Pyroscope server
   pyroscopeEnvironment:
@@ -52,6 +55,7 @@ runs:
         PYROSCOPE_KEY: ${{ inputs.pyroscopeKey }}
         CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
         CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
+        CHAINLINK_POSTGRES_VERSION: ${{ inputs.chainlinkPostgresVersion }}
         LOKI_ENDPOINT: ${{ inputs.lokiEndpoint }}
         LOKI_TENANT_ID: ${{ inputs.lokiTenantId }}
         LOKI_BASIC_AUTH: ${{ inputs.lokiBasicAuth }}
@@ -89,12 +93,13 @@ runs:
         [ChainlinkImage]
         image="$CHAINLINK_IMAGE"
         version="$CHAINLINK_VERSION"
+        postgres_version="$CHAINLINK_POSTGRES_VERSION"
 
         [Pyroscope]
         enabled=$pyroscope_enabled
         server_url="$PYROSCOPE_SERVER"
         environment="$PYROSCOPE_ENVIRONMENT"
-        key="$PYROSCOPE_KEY"
+        key_secret="$PYROSCOPE_KEY"
 
         [Logging]
         run_id="$RUN_ID"
@@ -105,7 +110,7 @@ runs:
         [Logging.Loki]
         tenant_id="$LOKI_TENANT_ID"
         endpoint="$LOKI_URL"
-        basic_auth="$LOKI_BASIC_AUTH"
+        basic_auth_secret="$LOKI_BASIC_AUTH"
 
         [Logging.Grafana]
         base_url="$GRAFANA_URL"

diff --git a/.github/actions/setup-create-base64-config/action.yml b/.github/actions/setup-create-base64-config/action.yml
@@ -12,6 +12,9 @@ inputs:
   chainlinkImage:
     description: The chainlink image to use
     default: "public.ecr.aws/chainlink/chainlink"
+  chainlinkPostgresVersion:
+    description: The postgres version to use with the chainlink node
+    default: "15.6"
   chainlinkVersion:
     description: The git commit sha to use for the image tag
   pyroscopeServer:
@@ -48,6 +51,7 @@ runs:
         PYROSCOPE_KEY: ${{ inputs.pyroscopeKey }}
         CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
         CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
+        CHAINLINK_POSTGRES_VERSION: ${{ inputs.chainlinkPostgresVersion }}
         LOKI_ENDPOINT: ${{ inputs.lokiEndpoint }}
         LOKI_TENANT_ID: ${{ inputs.lokiTenantId }}
         LOKI_BASIC_AUTH: ${{ inputs.lokiBasicAuth }}
@@ -91,12 +95,13 @@ runs:
         [ChainlinkImage]
         image="$CHAINLINK_IMAGE"
         version="$CHAINLINK_VERSION"
+        postgres_version="$CHAINLINK_POSTGRES_VERSION"
 
         [Pyroscope]
         enabled=$pyroscope_enabled
         server_url="$PYROSCOPE_SERVER"
         environment="$PYROSCOPE_ENVIRONMENT"
-        key="$PYROSCOPE_KEY"
+        key_secret="$PYROSCOPE_KEY"
 
         [Logging]
         test_log_collect=$test_log_collect
@@ -108,7 +113,7 @@ runs:
         [Logging.Loki]
         tenant_id="$LOKI_TENANT_ID"
         endpoint="$LOKI_ENDPOINT"
-        basic_auth="$LOKI_BASIC_AUTH"
+        basic_auth_secret="$LOKI_BASIC_AUTH"
 
         [Logging.Grafana]
         base_url="$GRAFANA_URL"

diff --git a/.github/actions/setup-create-base64-upgrade-config/action.yml b/.github/actions/setup-create-base64-upgrade-config/action.yml
@@ -9,6 +9,9 @@ inputs:
     default: "public.ecr.aws/chainlink/chainlink"
   chainlinkVersion:
     description: The git commit sha to use for the image tag
+  chainlinkPostgresVersion:
+    description: The postgres version to use with the chainlink node
+    default: "15.6"
   upgradeImage:
     description: The chainlink image to upgrade to
     default: "public.ecr.aws/chainlink/chainlink"
@@ -25,6 +28,7 @@ runs:
         SELECTED_NETWORKS: ${{ inputs.selectedNetworks }}
         CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
         CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
+        CHAINLINK_POSTGRES_VERSION: ${{ inputs.chainlinkPostgresVersion }}
         UPGRADE_IMAGE: ${{ inputs.upgradeImage }}
         UPGRADE_VERSION: ${{ inputs.upgradeVersion }}
       run: |
@@ -50,6 +54,7 @@ runs:
         [ChainlinkImage]
         image="$CHAINLINK_IMAGE"
         version="$CHAINLINK_VERSION"
+        postgres_version="$CHAINLINK_POSTGRES_VERSION"
 
         [ChainlinkUpgradeImage]
         image="$UPGRADE_IMAGE"

diff --git a/.github/actions/setup-merge-base64-config/action.yml b/.github/actions/setup-merge-base64-config/action.yml
@@ -8,6 +8,14 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Install dasel
+      shell: bash
+      run: |
+        if ! which dasel > /dev/null; then
+          curl -L -o dasel "https://github.com/TomWright/dasel/releases/download/v2.6.0/dasel_linux_amd64" && chmod +x dasel && sudo mv dasel /usr/local/bin/
+        else
+          echo "Dasel is already installed."
+        fi
     - name: Add masks and export base64 config
       shell: bash
       run: |
@@ -16,9 +24,9 @@ runs:
         echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
 
         decoded_toml=$(echo $BASE64_CONFIG_OVERRIDE | base64 -d)
-        CHAINLINK_IMAGE=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*image[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
+        CHAINLINK_IMAGE=$(echo "$decoded_toml" | dasel -r toml 'ChainlinkImage.image')
         echo ::add-mask::$CHAINLINK_IMAGE
-        CHAINLINK_VERSION=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*version[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
+        CHAINLINK_VERSION=$(echo "$decoded_toml" | dasel -r toml 'ChainlinkImage.version')
         NETWORKS=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*selected_networks[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
 
         if [ -n "$CHAINLINK_IMAGE" ]; then
@@ -42,9 +50,9 @@ runs:
         [Logging.Loki]
         tenant_id="$LOKI_TENANT_ID"
         endpoint="$LOKI_URL"
-        basic_auth="$LOKI_BASIC_AUTH"
+        basic_auth_secret="$LOKI_BASIC_AUTH"
         # legacy, you only need this to access the cloud version
-        # bearer_token="bearer_token"
+        # bearer_token_secret="bearer_token"
         EOF
 
         echo "$decoded_toml" >> final_config.toml

diff --git a/.github/actions/setup-parse-base64-config/action.yml b/.github/actions/setup-parse-base64-config/action.yml
@@ -8,13 +8,21 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Install dasel
+      shell: bash
+      run: |
+        if ! which dasel > /dev/null; then
+          curl -L -o dasel "https://github.com/TomWright/dasel/releases/download/v2.6.0/dasel_linux_amd64" && chmod +x dasel && sudo mv dasel /usr/local/bin/
+        else
+          echo "Dasel is already installed."
+        fi
     - name: Add masks and export base64 config
       shell: bash
       run: |
         decoded_toml=$(echo $BASE64_CONFIG_OVERRIDE | base64 -d)
-        CHAINLINK_IMAGE=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*image[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
+        CHAINLINK_IMAGE=$(echo "$decoded_toml" | dasel -r toml 'ChainlinkImage.image')
         echo ::add-mask::$CHAINLINK_IMAGE
-        CHAINLINK_VERSION=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*version[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
+        CHAINLINK_VERSION=$(echo "$decoded_toml" | dasel -r toml 'ChainlinkImage.version')
         NETWORKS=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*selected_networks[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
         ETH2_EL_CLIENT=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*execution_layer[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)