Skip to content

Commit

Permalink
merge upstream 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
yylyyl committed Feb 26, 2023
2 parents 449a01d + 9d71493 commit e689f7e
Show file tree
Hide file tree
Showing 12 changed files with 647 additions and 179 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VERSION=1.2.0
VERSION=1.3.0
REVISION=1~bpo+1
27 changes: 24 additions & 3 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,11 +1,32 @@
prometheus-podman3-exporter (1.2.0-1~bpo+1) unstable; urgency=medium
prometheus-podman3-exporter (1.3.0-bpo347~1) unstable; urgency=medium

* Debianize the package
* Remove unnecessary files
* Rename package
* Support podman v3
* Downgrade github.com/containers/podman/v3 to v3.4.7
* Downgrade github.com/containers/image/v5 to v5.17.0
* Downgrade github.com/cri-o/ocicni to v0.2.1-0.20210621164014-d0acc7862283
* Downgrade github.com/sirupsen/logrus to v1.8.1
* Downgrade golang to 1.17
* Fix incompatibility with network
* Update contents in README.md and install.md

-- Peter Yang <[email protected]> Fri, 24 Feb 2023 23:25:24 -0500
-- Peter Yang <[email protected]> Sun, 26 Feb 2023 18:09:30 -0500

prometheus-podman-exporter (1.3.0) UNRELEASED; urgency=low

* Add health status in container metrics
* update net/block io metric help string to include the type (bytes)
* Fix copy-pasted root example
* Bump podman/v4 to v4.4.2
* Bump github.com/containers/image/v5 from 5.23.1 to 5.24.2
* Bump github.com/prometheus/common from 0.39.0 to 0.40.0
* Bump github.com/prometheus/common from 0.38.0 to 0.39.0
* Bump github.com/prometheus/common from 0.37.0 to 0.38.0
* Bump github.com/prometheus/exporter-toolkit from 0.8.1 to 0.8.2
* github workflow - quay.io container image tag fix

-- Navid Yaghoobi <[email protected]> Sat Feb 25 2023

prometheus-podman-exporter (1.2.0-1) UNRELEASED; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/go-kit/log v0.2.1
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/common v0.39.0
github.com/prometheus/common v0.40.0
github.com/prometheus/exporter-toolkit v0.8.2
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.6.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -866,8 +866,8 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI=
github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q=
github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF1y5TlSt9OE=
github.com/prometheus/exporter-toolkit v0.8.2 h1:sbJAfBXQFkG6sUkbwBun8MNdzW9+wd5YfPYofbmj0YM=
github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0=
github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
Expand Down
36 changes: 16 additions & 20 deletions vendor/github.com/prometheus/common/expfmt/decode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions vendor/github.com/prometheus/common/expfmt/text_parse.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e689f7e

Please sign in to comment.