Merge branch 'develop' into integration-test-runner-size-defaults-cle…

…anup

.changeset/cyan-crabs-explode.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Add support for workflow jobs to Operator UI #wip #added

.changeset/hot-dryers-flash.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+core/services: update llo & versioning to use sqlutil #internal

.changeset/many-pillows-reflect.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+core/services/keeper: switch to sqlutil.DataSource #internal

.changeset/poor-socks-travel.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+core/services/ocr2/plugins/ocr2keeper/evmregister/v21/upkeepstate: use sqlutil instead of pg.QOpts #internal

.changeset/real-numbers-taste.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+core/services/functions: switch to sqlutil.DataStore #internal

.changeset/rich-jars-flow.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Narrowing topic, data_word indexes by adding (evm_chain_id, address, event_sig) to the index definition #db_update

.changeset/sweet-sloths-laugh.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+core/sessions: switch to sqlutil.DataSource #internal

.changeset/swift-horses-unite.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+core/bridges: use sqlutil.DataSource #internal

.changeset/ten-clouds-collect.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal

.changeset/tender-crews-jam.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+vrfv2plus - account for num words in coordinator gas overhead in v2plus wrapper

.github/actions/build-sign-publish-chainlink/action.yml

@@ -110,6 +110,8 @@ runs:
         role-to-assume: ${{ inputs.aws-role-to-assume }}
         role-duration-seconds: ${{ inputs.aws-role-duration-seconds }}
         aws-region: ${{ inputs.aws-region }}
+        mask-aws-account-id: true
+        role-session-name: build-sign-publish-chainlink
 
     - if: inputs.publish == 'true'
       name: Login to ECR

.github/workflows/build-publish.yml

@@ -6,7 +6,6 @@ on:
     tags:
       - "v*"
     branches:
-      - master
       - "release/**"
 
 jobs:

.github/workflows/build.yml

@@ -2,9 +2,6 @@ name: "Build Chainlink"
 
 on:
   pull_request:
-  push:
-    branches:
-      - master
 
 jobs:
   build-chainlink:

.github/workflows/ci-core.yml

@@ -9,7 +9,6 @@ concurrency:
 on:
   push:
     branches:
-      - master
       - develop
       - "release/*"
   merge_group:
@@ -19,7 +18,7 @@ on:
   workflow_dispatch:
     inputs:
       distinct_run_name:
-        description: 'A unique identifier for this run, used when running from other repos'
+        description: "A unique identifier for this run, used when running from other repos"
         required: false
         type: string
       evm-ref:
@@ -29,7 +28,6 @@ on:
         type: string
 
 jobs:
-
   filter: # No need to run core tests if there are only changes to the integration-tests
     name: Detect Changes
     permissions:
@@ -211,7 +209,7 @@ jobs:
     needs: [filter, core]
     name: Flakey Test Detection
     runs-on: ubuntu-latest
-    if: ${{ always() && github.actor != 'dependabot[bot]' }} 
+    if: ${{ always() && github.actor != 'dependabot[bot]' }}
     env:
       CL_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/chainlink_test?sslmode=disable
     steps:
@@ -234,7 +232,7 @@ jobs:
       - name: Touching core/web/assets/index.html
         if: ${{ needs.filter.outputs.changes == 'true' }}
         run: mkdir -p core/web/assets && touch core/web/assets/index.html
-      - name: Download Go vendor packages 
+      - name: Download Go vendor packages
         if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go mod download
       - name: Replace chainlink-evm deps

.github/workflows/goreleaser-build-publish-develop.yml

@@ -25,6 +25,8 @@ jobs:
           role-to-assume: ${{ secrets.AWS_OIDC_IAM_ROLE_ARN }}
           role-duration-seconds: ${{ secrets.AWS_ROLE_DURATION_SECONDS }}
           aws-region: ${{ secrets.AWS_REGION }}
+          mask-aws-account-id: true
+          role-session-name: goreleaser-build-publish-chainlink.push-chainlink-develop-goreleaser
       - name: Build, sign, and publish image
         id: build-sign-publish
         uses: ./.github/actions/goreleaser-build-sign-publish

.github/workflows/helm-chart-publish.yml

@@ -20,6 +20,8 @@ jobs:
           role-to-assume: ${{ secrets.AWS_ROLE_ARN_GATI }}
           role-duration-seconds: ${{ secrets.AWS_ROLE_DURATION_SECONDS }}
           aws-region: ${{ secrets.AWS_REGION }}
+          mask-aws-account-id: true
+          role-session-name: helm-publish.helm-release
 
       - name: Get Github Token
         id: get-gh-token

.github/workflows/operator-ui-ci.yml

@@ -31,9 +31,10 @@ jobs:
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_CHAINLINK_CI_OPERATOR_UI_ACCESS_TOKEN_ISSUER_ROLE_ARN }}
+          aws-region: ${{ secrets.AWS_REGION }}
           role-duration-seconds: 3600
           role-session-name: operator-ui-ci.check-gql
-          aws-region: ${{ secrets.AWS_REGION }}
+          mask-aws-account-id: true
 
       - name: Get Github Token
         id: get-gh-token

.github/workflows/pr-labels.yml

@@ -34,9 +34,10 @@ jobs:
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_CRIB_ROLE_ARN_SAND }}
-          role-duration-seconds: 900
-          role-session-name: gha-pr-labels-crib
           aws-region: ${{ secrets.AWS_REGION }}
+          role-duration-seconds: 900
+          mask-aws-account-id: true
+          role-session-name: pr-labels.crib
 
       - name: Comment CRIB details on PR
         run: ./.github/scripts/crib/pr-comment-crib-env.js

charts/chainlink-cluster/README.md

@@ -151,6 +151,9 @@ We are using [Grabana](https://github.com/K-Phoen/grabana) lib to create dashboa
 
 You can also select dashboard platform in `INFRA_PLATFORM` either `kubernetes` or `docker`
 
+You can select the dashboard panels with `PANELS_INCLUDED` which is a list of panel names separated by comma
+If you don't specify it will include core panels by default
+
 ```
 export LOKI_TENANT_ID=promtail
 export LOKI_URL=...
@@ -159,7 +162,7 @@ export GRAFANA_TOKEN=...
 export PROMETHEUS_DATA_SOURCE_NAME=Thanos
 export LOKI_DATA_SOURCE_NAME=Loki
 export INFRA_PLATFORM=kubernetes
-export GRAFANA_FOLDER=CRIB
+export GRAFANA_FOLDER=DashboardCoreDebug
 export DASHBOARD_NAME=CL-Cluster
 
 devspace run dashboard_deploy

charts/chainlink-cluster/dashboard/cmd/delete.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	lib "github.com/smartcontractkit/chainlink/dashboard-lib"
+)
+
+func main() {
+	cfg := lib.ReadEnvDeployOpts()
+	db := lib.NewDashboard(cfg.Name, cfg, nil)
+	err := db.Delete()
+	if err != nil {
+		lib.L.Fatal().Err(err).Msg("failed to delete the dashboard")
+	}
+	lib.L.Info().
+		Str("Name", db.Name).
+		Str("GrafanaURL", db.DeployOpts.GrafanaURL).
+		Str("GrafanaFolder", db.DeployOpts.GrafanaFolder).
+		Msg("Dashboard deleted")
+}

charts/chainlink-cluster/dashboard/cmd/deploy.go

@@ -3,31 +3,48 @@ package main
 import (
 	"github.com/K-Phoen/grabana/dashboard"
 	lib "github.com/smartcontractkit/chainlink/dashboard-lib"
+	atlas_don "github.com/smartcontractkit/chainlink/dashboard-lib/atlas-don"
 	core_don "github.com/smartcontractkit/chainlink/dashboard-lib/core-don"
 	k8spods "github.com/smartcontractkit/chainlink/dashboard-lib/k8s-pods"
 	waspdb "github.com/smartcontractkit/wasp/dashboard"
-)
-
-const (
-	DashboardName = "Chainlink Cluster (DON)"
+	"strings"
 )
 
 func main() {
 	cfg := lib.ReadEnvDeployOpts()
-	db := lib.NewDashboard(DashboardName, cfg,
+	db := lib.NewDashboard(cfg.Name, cfg,
 		[]dashboard.Option{
 			dashboard.AutoRefresh("10s"),
 			dashboard.Tags([]string{"generated"}),
 		},
 	)
-	db.Add(
-		core_don.New(
-			core_don.Props{
-				PrometheusDataSource: cfg.DataSources.Prometheus,
-				PlatformOpts:         core_don.PlatformPanelOpts(cfg.Platform),
-			},
-		),
-	)
+	if len(cfg.PanelsIncluded) == 0 || cfg.PanelsIncluded["core"] {
+		db.Add(
+			core_don.New(
+				core_don.Props{
+					PrometheusDataSource: cfg.DataSources.Prometheus,
+					PlatformOpts:         core_don.PlatformPanelOpts(cfg.Platform),
+				},
+			),
+		)
+		// TODO: refactor as a component later
+		addWASPRows(db, cfg)
+	}
+	if cfg.PanelsIncluded["ocr"] || cfg.PanelsIncluded["ocr2"] || cfg.PanelsIncluded["ocr3"] {
+		for key := range cfg.PanelsIncluded {
+			if strings.Contains(key, "ocr") {
+				db.Add(
+					atlas_don.New(
+						atlas_don.Props{
+							PrometheusDataSource: cfg.DataSources.Prometheus,
+							PlatformOpts:         atlas_don.PlatformPanelOpts(cfg.Platform, key),
+							OcrVersion:           key,
+						},
+					),
+				)
+			}
+		}
+	}
 	if cfg.Platform == "kubernetes" {
 		db.Add(
 			k8spods.New(
@@ -38,13 +55,11 @@ func main() {
 			),
 		)
 	}
-	// TODO: refactor as a component later
-	addWASPRows(db, cfg)
 	if err := db.Deploy(); err != nil {
 		lib.L.Fatal().Err(err).Msg("failed to deploy the dashboard")
 	}
 	lib.L.Info().
-		Str("Name", DashboardName).
+		Str("Name", db.Name).
 		Str("GrafanaURL", db.DeployOpts.GrafanaURL).
 		Str("GrafanaFolder", db.DeployOpts.GrafanaFolder).
 		Msg("Dashboard deployed")

charts/chainlink-cluster/templates/chainlink-cm.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.chainlink.enabled }}
 {{- range $cfg := .Values.chainlink.nodes }}
 apiVersion: v1
 kind: ConfigMap
@@ -69,3 +70,4 @@ data:
   {{ end }}
 ---
 {{- end }}
+{{- end }}

charts/chainlink-cluster/templates/chainlink-db-deployment.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.db.enabled }}
 {{- range $cfg := .Values.chainlink.nodes }}
 apiVersion: apps/v1
 {{ if $.Values.db.stateful }}
@@ -150,3 +151,4 @@ spec:
 {{- end }}
 ---
 {{- end }}
+{{- end }}

charts/chainlink-cluster/templates/chainlink-db-networkpolicy.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.networkPolicies.enabled }}
+{{- if and .Values.db.enabled .Values.networkPolicies.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -18,4 +18,4 @@ spec:
       ports:
         - protocol: TCP
           port: 5432
-{{- end }}
+{{- end }}

charts/chainlink-cluster/templates/chainlink-db-service.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.db.enabled }}
 {{- range $cfg := .Values.chainlink.nodes }}
 apiVersion: v1
 kind: Service
@@ -13,4 +14,5 @@ spec:
       port: 5432
       targetPort: 5432
 ---
-{{- end }}
+{{- end }}
+{{- end }}

charts/chainlink-cluster/templates/chainlink-node-deployment.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.chainlink.enabled }}
 {{- range $index, $cfg := .Values.chainlink.nodes }}
 apiVersion: apps/v1
 kind: Deployment
@@ -126,3 +127,4 @@ spec:
 {{- end }}
 ---
 {{- end }}
+{{- end }}

charts/chainlink-cluster/templates/chainlink-node-networkpolicy.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.networkPolicies.enabled }}
+{{- if and .Values.chainlink.enabled .Values.networkPolicies.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -15,4 +15,4 @@ spec:
       - podSelector:
           matchLabels:
             app: {{ $.Release.Name }}
-{{- end }}
+{{- end }}

charts/chainlink-cluster/templates/chainlink-node-service.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.chainlink.enabled }}
 {{- range $cfg := .Values.chainlink.nodes }}
 apiVersion: v1
 kind: Service
@@ -15,4 +16,5 @@ spec:
     instance: {{ $cfg.name }}
   type: ClusterIP
 ---
-{{- end }}
+{{- end }}
+{{- end }}

charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml

@@ -1,4 +1,4 @@
-{{- if $.Values.prometheusMonitor }}
+{{- if and .Values.chainlink.enabled .Values.prometheusMonitor }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:

charts/chainlink-cluster/templates/chainlink-secret.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.chainlink.enabled }}
 {{- range $cfg := .Values.chainlink.nodes }}
 apiVersion: v1
 kind: Secret
@@ -9,4 +10,5 @@ data:
   apicredentials: bm90cmVhbEBmYWtlZW1haWwuY2hudHdvY2hhaW5zCg==
   node-password: VC50TEhrY213ZVBUL3AsXXNZdW50andIS0FzcmhtIzRlUnM0THVLSHd2SGVqV1lBQzJKUDRNOEhpbXdnbWJhWgo=
 ---
-{{- end }}
+{{- end }}
+{{- end }}