Merge pull request #1 from Spendesk/develop

Merge upstream

Author: mcmarkj

deploy/helm-chart/github-actions-exporter/Chart.yaml

@@ -11,4 +11,4 @@ version: 0.1.4
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.8.0
+appVersion: 1.8.1

pkg/metrics/get_runners_from_github.go

@@ -17,7 +17,7 @@ var (
 			Name: "github_runner_status",
 			Help: "runner status",
 		},
-		[]string{"repo", "os", "name", "id"},
+		[]string{"repo", "os", "name", "id", "busy"},
 	)
 )
 
@@ -32,9 +32,9 @@ func getRunnersFromGithub() {
 			} else {
 				for _, runner := range resp.Runners {
 					if runner.GetStatus() == "online" {
-						runnersGauge.WithLabelValues(repo, *runner.OS, *runner.Name, strconv.FormatInt(runner.GetID(), 10)).Set(1)
+						runnersGauge.WithLabelValues(repo, *runner.OS, *runner.Name, strconv.FormatInt(runner.GetID(), 10), strconv.FormatBool(runner.GetBusy())).Set(1)
 					} else {
-						runnersGauge.WithLabelValues(repo, *runner.OS, *runner.Name, strconv.FormatInt(runner.GetID(), 10)).Set(0)
+						runnersGauge.WithLabelValues(repo, *runner.OS, *runner.Name, strconv.FormatInt(runner.GetID(), 10), strconv.FormatBool(runner.GetBusy())).Set(0)
 					}
 				}
 			}

pkg/metrics/get_runners_organization_from_github.go

@@ -17,7 +17,7 @@ var (
 			Name: "github_runner_organization_status",
 			Help: "runner status",
 		},
-		[]string{"organization", "os", "name", "id"},
+		[]string{"organization", "os", "name", "id", "busy"},
 	)
 )
 
@@ -33,9 +33,9 @@ func getRunnersOrganizationFromGithub() {
 				} else {
 					for _, runner := range resp.Runners {
 						if runner.GetStatus() == "online" {
-							runnersOrganizationGauge.WithLabelValues(orga, *runner.OS, *runner.Name, strconv.FormatInt(runner.GetID(), 10)).Set(1)
+							runnersOrganizationGauge.WithLabelValues(orga, *runner.OS, *runner.Name, strconv.FormatInt(runner.GetID(), 10), strconv.FormatBool(runner.GetBusy())).Set(1)
 						} else {
-							runnersOrganizationGauge.WithLabelValues(orga, *runner.OS, *runner.Name, strconv.FormatInt(runner.GetID(), 10)).Set(0)
+							runnersOrganizationGauge.WithLabelValues(orga, *runner.OS, *runner.Name, strconv.FormatInt(runner.GetID(), 10), strconv.FormatBool(runner.GetBusy())).Set(0)
 						}
 					}
 					if rr.NextPage == 0 {

pkg/metrics/get_workflow_runs_from_github.go

@@ -52,7 +52,7 @@ func getRelevantFields(repo string, run *github.WorkflowRun) []string {
 	return result
 }
 
-// getWorkflowRunsFromGithub - return informations and status about a worflow
+// getWorkflowRunsFromGithub - return informations and status about a workflow
 func getWorkflowRunsFromGithub() {
 	for {
 		for _, repo := range config.Github.Repositories.Value() {