Skip to content

Commit 34957d2

Browse files
committed
Merge develop into develop
1 parent f44eb35 commit 34957d2

15 files changed

+514
-428
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16 as builder
1+
FROM golang:1.18 as builder
22

33
WORKDIR /app
44
COPY . .

README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Authentication can either via a Github Token or the Github App Authentication 3
2525
| Github App Private Key | app_private_key, gpk | GITHUB_APP_PRIVATE_KEY | - | Github App Authentication Private Key |
2626
| Github Refresh | github_refresh, gr | GITHUB_REFRESH | 30 | Refresh time Github Actions status in sec |
2727
| Github Organizations | github_orgas, go | GITHUB_ORGAS | - | List all organizations you want get informations. Format \<orga1>,\<orga2>,\<orga3> (like test1,test2) |
28-
| Github Repos | github_repos, grs | GITHUB_REPOS | - | List all repositories you want get informations. Format \<orga>/\<repo>,\<orga>/\<repo2>,\<orga>/\<repo3> (like test/test) |
28+
| Github Repos | github_repos, grs | GITHUB_REPOS | - | [Optional] List all repositories you want get informations. Format \<orga>/\<repo>,\<orga>/\<repo2>,\<orga>/\<repo3> (like test/test). Defaults to all repositories owned by the organizations. |
2929
| Exporter port | port, p | PORT | 9999 | Exporter port |
3030
| Github Api URL | github_api_url, url | GITHUB_API_URL | api.github.com | Github API URL (primarily for Github Enterprise usage) |
3131
| Github Enterprise Name | enterprise_name | ENTERPRISE_NAME | "" | Enterprise name. Needed for enterprise endpoints (/enterprises/{ENTERPRISE_NAME}/*). Currently used to get Enterprise level tunners status |
@@ -44,6 +44,7 @@ Gauge type
4444
| 1 | Success |
4545
| 2 | Skipped |
4646
| 3 | In Progress |
47+
| 4 | Queued |
4748

4849
**Fields**
4950

@@ -105,6 +106,7 @@ Gauge type
105106
| os | Operating system (linux/macos/windows) |
106107
| repo | Repository like \<org>/\<repo> |
107108
| status | Runner status (online/offline) |
109+
| busy | Runner busy or not (true/false) |
108110

109111
### github_runner_organization_status
110112
Gauge type
@@ -126,6 +128,7 @@ Gauge type
126128
| os | Operating system (linux/macos/windows) |
127129
| orga | Organization name |
128130
| status | Runner status (online/offline) |
131+
| busy | Runner busy or not (true/false) |
129132

130133
### github_runner_enterprise_status
131134
Gauge type
@@ -268,4 +271,4 @@ spec:
268271
# separate plaintext aws secret needed for ssh key
269272
- key: MySecretManagerKeyPrivateKey
270273
name: github_app_private_key
271-
```
274+
```

go.mod

+36-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,40 @@
1-
module github-actions-exporter
1+
module github.com/spendesk/github-actions-exporter
22

3-
go 1.16
3+
go 1.18
44

55
require (
6-
github.com/andybalholm/brotli v1.0.3 // indirect
7-
github.com/bradleyfalzon/ghinstallation v1.1.1
8-
github.com/fasthttp/router v1.3.9
9-
github.com/go-kit/kit v0.10.0 // indirect
10-
github.com/google/go-github v17.0.0+incompatible // indirect
11-
github.com/google/go-github/v38 v38.1.0
12-
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
13-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
14-
github.com/prometheus/client_golang v1.11.0
15-
github.com/urfave/cli/v2 v2.3.0
16-
github.com/valyala/fasthttp v1.22.0
17-
golang.org/x/oauth2 v0.0.0-20210311163135-5366d9dc1934
6+
github.com/bradleyfalzon/ghinstallation/v2 v2.1.0
7+
github.com/die-net/lrucache v0.0.0-20220628165024-20a71bc65bf1
8+
github.com/fasthttp/router v1.4.11
9+
github.com/google/go-github v17.0.0+incompatible
10+
github.com/google/go-github/v45 v45.2.0
11+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
12+
github.com/prometheus/client_golang v1.13.0
13+
github.com/urfave/cli/v2 v2.11.2
14+
github.com/valyala/fasthttp v1.39.0
15+
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094
16+
)
17+
18+
require (
19+
github.com/andybalholm/brotli v1.0.4 // indirect
20+
github.com/beorn7/perks v1.0.1 // indirect
21+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
22+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
23+
github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
24+
github.com/golang/protobuf v1.5.2 // indirect
25+
github.com/google/go-querystring v1.1.0 // indirect
26+
github.com/klauspost/compress v1.15.0 // indirect
27+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
28+
github.com/prometheus/client_model v0.2.0 // indirect
29+
github.com/prometheus/common v0.37.0 // indirect
30+
github.com/prometheus/procfs v0.8.0 // indirect
31+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
32+
github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d // indirect
33+
github.com/valyala/bytebufferpool v1.0.0 // indirect
34+
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
35+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
36+
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
37+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
38+
google.golang.org/appengine v1.6.7 // indirect
39+
google.golang.org/protobuf v1.28.1 // indirect
1840
)

0 commit comments

Comments
 (0)