Skip to content

Commit

Permalink
Merge branch 'mvisonneau:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
fitz7 authored Jun 6, 2024
2 parents 44da097 + d2c4e81 commit f9a925f
Show file tree
Hide file tree
Showing 12 changed files with 114 additions and 85 deletions.
19 changes: 10 additions & 9 deletions .goreleaser.pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,16 @@ nfpms:
release:
disable: true

snapcrafts:
- summary: GitLab CI pipelines exporter (prometheus/open-metrics)
description: Monitor GitLab CI pipelines related metrics.
license: Apache-2.0
confinement: strict
grade: devel
apps:
gitlab-ci-pipelines-exporter:
plugs: [home, network, network-bind]
# Disabling until https://github.com/canonical/snapcraft/issues/4769 is resolved
#snapcrafts:
# - summary: GitLab CI pipelines exporter (prometheus/open-metrics)
# description: Monitor GitLab CI pipelines related metrics.
# license: Apache-2.0
# confinement: strict
# grade: devel
# apps:
# gitlab-ci-pipelines-exporter:
# plugs: [home, network, network-bind]

dockers:
- image_templates:
Expand Down
17 changes: 9 additions & 8 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,15 @@ scoops:
owner: mvisonneau
name: scoops

snapcrafts:
- summary: *description
description: Monitor GitLab CI pipelines related metrics.
license: *license
grade: stable
apps:
gitlab-ci-pipelines-exporter:
plugs: [home, network, network-bind]
# Disabling until https://github.com/canonical/snapcraft/issues/4769 is resolved
#snapcrafts:
# - summary: *description
# description: Monitor GitLab CI pipelines related metrics.
# license: *license
# grade: stable
# apps:
# gitlab-ci-pipelines-exporter:
# plugs: [home, network, network-bind]

dockers:
- image_templates:
Expand Down
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ and this project adheres to [0ver](https://0ver.org) (more or less).

## [Unreleased]

## [v0.5.8] - 2024-05-03

### Changed

* fix(devenv): Fix devenv rule in makefile. by @audig in https://github.com/mvisonneau/gitlab-ci-pipelines-exporter/pull/822
* Add gitlab-health-url flag and envvar by @Thor77 in https://github.com/mvisonneau/gitlab-ci-pipelines-exporter/pull/800
* fix project pull webhook args by @fitz7 in https://github.com/mvisonneau/gitlab-ci-pipelines-exporter/pull/828
* go.mod: updated most dependencies

## [v0.5.7] - 2024-03-03

### Changed
Expand Down Expand Up @@ -695,7 +704,8 @@ if not seen in a long time.
- LICENSE
- README

[Unreleased]: https://github.com/mvisonneau/gitlab-ci-pipelines-exporter/compare/v0.5.7...HEAD
[Unreleased]: https://github.com/mvisonneau/gitlab-ci-pipelines-exporter/compare/v0.5.8...HEAD
[v0.5.8]: https://github.com/mvisonneau/gitlab-ci-pipelines-exporter/tree/v0.5.8
[v0.5.7]: https://github.com/mvisonneau/gitlab-ci-pipelines-exporter/tree/v0.5.7
[v0.5.6]: https://github.com/mvisonneau/gitlab-ci-pipelines-exporter/tree/v0.5.6
[v0.5.5]: https://github.com/mvisonneau/gitlab-ci-pipelines-exporter/tree/v0.5.5
Expand Down
2 changes: 1 addition & 1 deletion examples/ha-setup/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
ALLOW_EMPTY_PASSWORD: 'yes'

gitlab-ci-pipelines-exporter-1: &gitlab-ci-pipelines-exporter
image: quay.io/mvisonneau/gitlab-ci-pipelines-exporter:v0.5.7
image: quay.io/mvisonneau/gitlab-ci-pipelines-exporter:v0.5.8
# You can comment out the image name and use the following statement
# to build the image against the current version of the repository
#build: ../..
Expand Down
2 changes: 1 addition & 1 deletion examples/opentelemetry/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
- jaeger

gitlab-ci-pipelines-exporter:
image: quay.io/mvisonneau/gitlab-ci-pipelines-exporter:v0.5.7
image: quay.io/mvisonneau/gitlab-ci-pipelines-exporter:v0.5.8
# You can comment out the image name and use the following statement
# to build the image against the current version of the repository
# build: ../..
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '3.8'
services:
gitlab-ci-pipelines-exporter:
image: quay.io/mvisonneau/gitlab-ci-pipelines-exporter:v0.5.7
image: quay.io/mvisonneau/gitlab-ci-pipelines-exporter:v0.5.8
# You can comment out the image name and use the following statement
# to build the image against the current version of the repository
# build: ../..
Expand Down
2 changes: 1 addition & 1 deletion examples/webhooks/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '3.8'
services:
gitlab-ci-pipelines-exporter:
image: quay.io/mvisonneau/gitlab-ci-pipelines-exporter:v0.5.7
image: quay.io/mvisonneau/gitlab-ci-pipelines-exporter:v0.5.8
# You can comment out the image name and use the following statement
# to build the image against the current version of the repository
# build: ../..
Expand Down
40 changes: 20 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ go 1.22

require (
dario.cat/mergo v1.0.0
github.com/alicebob/miniredis/v2 v2.31.0
github.com/alicebob/miniredis/v2 v2.32.1
github.com/charmbracelet/bubbles v0.18.0
github.com/charmbracelet/bubbletea v0.25.0
github.com/charmbracelet/bubbletea v0.26.1
github.com/charmbracelet/lipgloss v0.10.0
github.com/creasty/defaults v1.7.0
github.com/go-logr/stdr v1.2.2
github.com/go-playground/validator/v10 v10.19.0
github.com/go-playground/validator/v10 v10.20.0
github.com/go-redis/redis_rate/v10 v10.0.1
github.com/google/uuid v1.6.0
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
Expand All @@ -23,25 +23,25 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.2.4
github.com/urfave/cli/v2 v2.27.1
github.com/urfave/cli/v2 v2.27.2
github.com/vmihailenco/msgpack/v5 v5.4.1
github.com/vmihailenco/taskq/memqueue/v4 v4.0.0-beta.4
github.com/vmihailenco/taskq/redisq/v4 v4.0.0-beta.4
github.com/vmihailenco/taskq/v4 v4.0.0-beta.4
github.com/xanzy/go-gitlab v0.102.0
github.com/xanzy/go-gitlab v0.103.0
github.com/xeonx/timeago v1.0.0-rc5
go.openly.dev/pointy v1.3.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0
go.opentelemetry.io/otel v1.25.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0
go.opentelemetry.io/otel/sdk v1.25.0
go.opentelemetry.io/otel/trace v1.25.0
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0
go.opentelemetry.io/otel v1.26.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0
go.opentelemetry.io/otel/sdk v1.26.0
go.opentelemetry.io/otel/trace v1.26.0
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
golang.org/x/mod v0.17.0
golang.org/x/time v0.5.0
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
google.golang.org/protobuf v1.34.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -53,11 +53,11 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/charmbracelet/harmonica v0.2.0 // indirect
github.com/containerd/console v1.0.4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect
Expand All @@ -80,16 +80,16 @@ require (
github.com/muesli/termenv v0.15.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.52.2 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/prometheus/common v0.53.0 // indirect
github.com/prometheus/procfs v0.14.0 // indirect
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.4 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
github.com/yuin/gopher-lua v1.1.0 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
github.com/yuin/gopher-lua v1.1.1 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/net v0.24.0 // indirect
Expand All @@ -98,7 +98,7 @@ require (
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
)
Loading

0 comments on commit f9a925f

Please sign in to comment.