fix: Merge upstream, and add aggregate labels to build faster graphs #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: prombot <[email protected]>
Add new type ParseDateAndTime to parse timestamps from DisplayString and report it as unix timestamp. * Add type to parse date and time (fixes: prometheus#1232) * Change date and time parsing to use strptime format --------- Signed-off-by: PhiBo <[email protected]>
Signed-off-by: prombot <[email protected]>
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.55.0 to 0.57.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.55.0...v0.57.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: prombot <[email protected]>
…les/github.com/prometheus/common-0.57.0 Bump github.com/prometheus/common from 0.55.0 to 0.57.0
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.0 to 1.20.3. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/v1.20.3/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.20.0...v1.20.3) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…les/github.com/prometheus/client_golang-1.20.3 Bump github.com/prometheus/client_golang from 1.20.0 to 1.20.3
Bumps [github.com/gosnmp/gosnmp](https://github.com/gosnmp/gosnmp) from 1.37.0 to 1.38.0. - [Release notes](https://github.com/gosnmp/gosnmp/releases) - [Changelog](https://github.com/gosnmp/gosnmp/blob/master/CHANGELOG.md) - [Commits](gosnmp/gosnmp@v1.37.0...v1.38.0) --- updated-dependencies: - dependency-name: github.com/gosnmp/gosnmp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…les/github.com/gosnmp/gosnmp-1.38.0 Bump github.com/gosnmp/gosnmp from 1.37.0 to 1.38.0
Synchronize common files from prometheus/prometheus
Signed-off-by: PhiBo <[email protected]>
Signed-off-by: prombot <[email protected]>
Synchronize common files from prometheus/prometheus
Signed-off-by: Urmas Närep <[email protected]>
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.3 to 1.20.4. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.20.3...v1.20.4) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…les/github.com/prometheus/client_golang-1.20.4 Bump github.com/prometheus/client_golang from 1.20.3 to 1.20.4
Signed-off-by: prombot <[email protected]>
) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.57.0 to 0.60.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.57.0...v0.60.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This PR includes:
- Go version updates, so that `log/slog` can be used
- linter updates to remove configs for `go-kit/log` that are no longer
needed, and enable `sloglint` linter
- Go dep updates for prometheus/{client_golang,common,exporter-toolkit}
libs
The bulk of this PR was automated by the following script which is being
used to aid in converting the various exporters/projects to use slog:
https://gist.github.com/tjhop/49f96fb7ebbe55b12deee0b0312d8434
Builds and passes tests.
Signed-off-by: TJ Hoplock <[email protected]>
Signed-off-by: prombot <[email protected]>
Signed-off-by: Matvey Kruglov <[email protected]>
Signed-off-by: dsgnr <[email protected]>
…cket Set UseUnconnectedUDPSocket option if one of the modules has if set
Signed-off-by: Sebastian Schubert <[email protected]>
…729196855 updated generator doc; fixes prometheus#1268
Signed-off-by: dsgnr <[email protected]>
Improve config parsing error message for cases where the generator is built from a commit that supports newer features than the deployed exporter. Signed-off-by: SuperQ <[email protected]>
Improve config error message
Add HPE MIBs
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.60.0 to 0.60.1. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.60.0...v0.60.1) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.4 to 1.20.5. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.20.4...v1.20.5) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: prombot <[email protected]>
…les/github.com/prometheus/common-0.60.1 Bump github.com/prometheus/common from 0.60.0 to 0.60.1
…client_golang-1.20.5
Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.13.0 to 0.13.1. - [Release notes](https://github.com/prometheus/exporter-toolkit/releases) - [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md) - [Commits](prometheus/exporter-toolkit@v0.13.0...v0.13.1) --- updated-dependencies: - dependency-name: github.com/prometheus/exporter-toolkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…les/github.com/prometheus/exporter-toolkit-0.13.1 Bump github.com/prometheus/exporter-toolkit from 0.13.0 to 0.13.1
…les/github.com/prometheus/client_golang-1.20.5 Bump github.com/prometheus/client_golang from 1.20.4 to 1.20.5
Synchronize common files from prometheus/prometheus
…heus-main # Conflicts: # .circleci/config.yml # .github/workflows/container_description.yml # .github/workflows/golangci-lint.yml # collector/collector.go # go.mod # go.sum # main.go # snmp.yml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.