Merge branch 'master' into nikola-jokic/key-vault
This commit is contained in:
		
						commit
						88b8ba6aaf
					
				|  | @ -134,7 +134,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: | ||||
| #         [ | ||||
|  | @ -144,6 +144,7 @@ githubConfigSecret: | |||
| #           "job_name", | ||||
| #           "event_name", | ||||
| #           "job_result", | ||||
| #           "job_workflow_ref", | ||||
| #         ] | ||||
| #   gauges: | ||||
| #     gha_assigned_jobs: | ||||
|  | @ -165,7 +166,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, | ||||
|  | @ -223,6 +224,7 @@ githubConfigSecret: | |||
| #           "job_name", | ||||
| #           "event_name", | ||||
| #           "job_result", | ||||
| #           "job_workflow_ref" | ||||
| #         ] | ||||
| #       buckets: | ||||
| #         [ | ||||
|  |  | |||
|  | @ -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, | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue