diff --git a/Makefile b/Makefile index 382ade7e..ce92592b 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ endif DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1) VERSION ?= dev COMMIT_SHA = $(shell git rev-parse HEAD) -RUNNER_VERSION ?= 2.324.0 +RUNNER_VERSION ?= 2.325.0 TARGETPLATFORM ?= $(shell arch) RUNNER_NAME ?= ${DOCKER_USER}/actions-runner RUNNER_TAG ?= ${VERSION} diff --git a/charts/gha-runner-scale-set/values.yaml b/charts/gha-runner-scale-set/values.yaml index 35922f84..d7e6dac9 100644 --- a/charts/gha-runner-scale-set/values.yaml +++ b/charts/gha-runner-scale-set/values.yaml @@ -131,7 +131,7 @@ githubConfigSecret: # counters: # gha_started_jobs_total: # labels: -# ["repository", "organization", "enterprise", "job_name", "event_name"] +# ["repository", "organization", "enterprise", "job_name", "event_name", "job_workflow_ref"] # gha_completed_jobs_total: # labels: # [ @@ -141,6 +141,7 @@ githubConfigSecret: # "job_name", # "event_name", # "job_result", +# "job_workflow_ref", # ] # gauges: # gha_assigned_jobs: @@ -162,7 +163,7 @@ githubConfigSecret: # histograms: # gha_job_startup_duration_seconds: # labels: -# ["repository", "organization", "enterprise", "job_name", "event_name"] +# ["repository", "organization", "enterprise", "job_name", "event_name","job_workflow_ref"] # buckets: # [ # 0.01, @@ -220,6 +221,7 @@ githubConfigSecret: # "job_name", # "event_name", # "job_result", +# "job_workflow_ref" # ] # buckets: # [ diff --git a/cmd/ghalistener/metrics/metrics.go b/cmd/ghalistener/metrics/metrics.go index 5dad8b97..51ef91fb 100644 --- a/cmd/ghalistener/metrics/metrics.go +++ b/cmd/ghalistener/metrics/metrics.go @@ -21,6 +21,7 @@ const ( labelKeyOrganization = "organization" labelKeyRepository = "repository" labelKeyJobName = "job_name" + labelKeyJobWorkflowRef = "job_workflow_ref" labelKeyEventName = "event_name" labelKeyJobResult = "job_result" ) @@ -75,11 +76,12 @@ var metricsHelp = metricsHelpRegistry{ func (e *exporter) jobLabels(jobBase *actions.JobMessageBase) prometheus.Labels { return prometheus.Labels{ - labelKeyEnterprise: e.scaleSetLabels[labelKeyEnterprise], - labelKeyOrganization: jobBase.OwnerName, - labelKeyRepository: jobBase.RepositoryName, - labelKeyJobName: jobBase.JobDisplayName, - labelKeyEventName: jobBase.EventName, + labelKeyEnterprise: e.scaleSetLabels[labelKeyEnterprise], + labelKeyOrganization: jobBase.OwnerName, + labelKeyRepository: jobBase.RepositoryName, + labelKeyJobName: jobBase.JobDisplayName, + labelKeyJobWorkflowRef: jobBase.JobWorkflowRef, + labelKeyEventName: jobBase.EventName, } } diff --git a/runner/Makefile b/runner/Makefile index 7fdc7827..6a0b7ac5 100644 --- a/runner/Makefile +++ b/runner/Makefile @@ -6,7 +6,7 @@ DIND_ROOTLESS_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind-rootless OS_IMAGE ?= ubuntu-22.04 TARGETPLATFORM ?= $(shell arch) -RUNNER_VERSION ?= 2.324.0 +RUNNER_VERSION ?= 2.325.0 RUNNER_CONTAINER_HOOKS_VERSION ?= 0.7.0 DOCKER_VERSION ?= 24.0.7 diff --git a/runner/VERSION b/runner/VERSION index bef5082a..63a843f1 100644 --- a/runner/VERSION +++ b/runner/VERSION @@ -1,2 +1,2 @@ -RUNNER_VERSION=2.324.0 +RUNNER_VERSION=2.325.0 RUNNER_CONTAINER_HOOKS_VERSION=0.7.0 \ No newline at end of file diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 82b31979..7b23d7c6 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -36,7 +36,7 @@ var ( testResultCMNamePrefix = "test-result-" - RunnerVersion = "2.324.0" + RunnerVersion = "2.325.0" RunnerContainerHooksVersion = "0.7.0" )