Merge from upstream #2
Open
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: Carlos Alexandro Becker <[email protected]>
Signed-off-by: Carlos Alexandro Becker <[email protected]>
Remove duplicating increment `elasticsearch_index_stats_total_scrapes` counter
Signed-off-by: Tero Saarni <[email protected]>
Update the codebase for the new prometheus-comunity location. * Replace Travis with CircleCI. * Update to standard Prometheus Makefile.common * Update all Go references. * Drop vendor/ dir * Update vendoring to use Go modules. Signed-off-by: SuperQ <[email protected]>
Signed-off-by: SuperQ <[email protected]>
Update for prometheus-community
* Update Go modules to latest. * Fix golangci-lint issues. * Update to use promhttp.Handler() * Enable lint test. * Fix up Makefile.common. Signed-off-by: SuperQ <[email protected]>
Update Go modules
Signed-off-by: prombot <[email protected]>
Synchronize common files from prometheus/prometheus
Fix a race condition in pkg/clusterinfo mockConsumer by protecting the data with a mutex. This resolves the issue where `make` fails to complete the build and tests. Signed-off-by: Joe Adams <[email protected]>
Signed-off-by: Joe Adams <[email protected]>
Signed-off-by: Joe Adams <[email protected]>
As per #419, this functionality is failing for elasticsearch version 7.13+ due to a breaking change in the response from elasticsearch. This adds some test fixtures for a range of elasticsearch versions including 7.13 to help ensure that future changes fix the incompatibility with 7.13 and maintain compatibility with versions < 7.13. Signed-off-by: Joe Adams <[email protected]>
fix(test): resolve test race conditions
…ve-second-inc Fix elasticsearch_index_stats_total_scrapes counter
* #257: Add gauge for total fields mapped in an index Signed-off-by: Mike Roest <[email protected]> Co-authored-by: Marco Sohns <[email protected]> Co-authored-by: Jeff Nadler <[email protected]>
Implement hot-reload for TLS client certificate
fix metric name for gc counter
Signed-off-by: Carlos Alexandro Becker <[email protected]>
Signed-off-by: Joe Adams <[email protected]>
…ic_name Revert "fix metric name for gc counter"
* Release 1.2.0 Signed-off-by: Joe Adams <[email protected]>
Signed-off-by: Joe Adams <[email protected]>
Release 1.2 -> master
- Move metric Desc to vars to aid in unused linter checks - Use new Collector interface Signed-off-by: Joe Adams <[email protected]>
Signed-off-by: Joe Adams <[email protected]>
Signed-off-by: Tamara Bernshtein <[email protected]> Signed-off-by: TomaBere <[email protected]>
- Drop extra test for authenticated requests to elasticsearch. Auth is common across all collectors, so it doesn't make sense to have specific tests for an individual collector. - Add missing descriptions - Drop tests for minor versions besides the most recent. The output is very large for this collector, and there is little value in testing every single minor version. - Update tests to test the output of the metrics - Refactor the node roles metric to have the role be dynamic, and to export 0 values for roles that are missing. Signed-off-by: Joe Adams <[email protected]>
Signed-off-by: Joe Adams <[email protected]>
Signed-off-by: Joe Adams <[email protected]>
- Refactor tests to test the output of the collector - Merge tests for index stats and alias - Add missing metric descriptions in Describe() Signed-off-by: Joe Adams <[email protected]>
Synchronize common files from prometheus/prometheus
Signed-off-by: prombot <[email protected]>
Synchronize common files from prometheus/prometheus
Add tests for shards collector
Refactor tests for nodes collector
Refactor tests for indices collector
The bulk of this change set 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 In addition to the parts that were straightforward conversions, this also: - refactors much of the logging config to adopt slog - removed custom `logger.go` setup for go-kit - adopt promslog/flag and use that to handle parsing log level/format flags - for consistent behavior, keep log output flag to allow toggle stdout/stderr for output - adopt promslog for logger setup - enables sloglint in golangci-lint config - drops go-kit/log exclusions from lint config - tidies mods to drop go-kit/log and go-logfmt/logfmt deps Signed-off-by: TJ Hoplock <[email protected]> * ci: update deprecated golangci-lint config Fixes: ``` WARN [config_reader] The configuration option `linters.errcheck.exclude` is deprecated, please use `linters.errcheck.exclude-functions`. ``` Signed-off-by: TJ Hoplock <[email protected]> --------- Signed-off-by: TJ Hoplock <[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]>
- Update README to include section about configuring the logging settings. - Update CHANGELOG with information about breaking changes in the logging output from #942. Signed-off-by: Joe Adams <[email protected]>
…es/github.com/prometheus/client_golang-1.20.5 Bump github.com/prometheus/client_golang from 1.20.4 to 1.20.5
Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.27.24 to 1.28.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@config/v1.27.24...v1.28.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…es/github.com/aws/aws-sdk-go-v2/config-1.28.0 Bump github.com/aws/aws-sdk-go-v2/config from 1.27.24 to 1.28.0
Signed-off-by: prombot <[email protected]>
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]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…953) Bumps [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2) from 1.32.2 to 1.32.3. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@v1.32.2...v1.32.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.28.0 to 1.28.3. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@v1.28.0...config/v1.28.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#965) Bumps [github.com/aws/aws-sdk-go-v2/credentials](https://github.com/aws/aws-sdk-go-v2) from 1.17.44 to 1.17.46. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@credentials/v1.17.44...credentials/v1.17.46) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.28.0 to 0.31.0. - [Commits](golang/crypto@v0.28.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.28.3 to 1.28.6. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@config/v1.28.3...config/v1.28.6) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: prombot <[email protected]>
* Add github actions workflow for testing PRs This may need some more work because it's not always easy to test actions locally. Signed-off-by: Joe Adams <[email protected]> * Add build and publish jobs Signed-off-by: Joe Adams <[email protected]> * Update main branch references with checks for master Signed-off-by: Joe Adams <[email protected]> --------- Signed-off-by: Joe Adams <[email protected]>
This is a complete refactor of the dashboard system. It brings the dashboard creation, metrics, alerting, etc into alignment with other projects that use jsonnet/grafonnet/mixins. This should allow users to customize what we have created and deploy into their environments. The dashboard was the focus of this iteration, reaching parity with the previous dashboard. - Add in jsonnet and grafonnet - Add scripts to compile and lint mixin - Add CI for the mixin --------- Signed-off-by: Joe Adams <[email protected]>
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.