Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from upstream #2

Open
wants to merge 309 commits into
base: master
Choose a base branch
from
Open

Conversation

imriz
Copy link

@imriz imriz commented Mar 16, 2021

No description provided.

sysadmind and others added 30 commits June 22, 2021 09:27
add the query string `ignore_unavailable=true` for `_all/_stats` api

Signed-off-by: bruc vv <brucvv@gmail.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Synchronize common files from prometheus/prometheus
Signed-off-by: Joe Adams <github@joeadams.io>
Signed-off-by: Joe Adams <github@joeadams.io>
Add changelog entries for 1.2.1
Signed-off-by: Joe Adams <github@joeadams.io>
This was introduced in #411, and is in the 1.2.0 release.

Signed-off-by: Mandar Gokhale <mandarg@mandarg.com>
…and easy provisionning use.

Signed-off-by: Cédric de Saint Martin <cdesaintmartin@wiremind.fr>
Document `es.indices_mappings` flag
Grafana dashboard: remove the Example from the name, allowing direct and easy provisionning use.
Fixes #454

Signed-off-by: Tim de Pater <git@trafex.nl>
Signed-off-by: Tim de Pater <git@trafex.nl>
…nation

Signed-off-by: Tim de Pater <git@trafex.nl>
Signed-off-by: Tim de Pater <git@trafex.nl>
Add the ability to use ApiKey based authentication
…nect to the ES node

Signed-off-by: Guillaume Lecerf <glecerf@gmail.com>
…-password

Allow to specify ES_USERNAME/ES_PASSWORD environment variables to connect to the ES node
* Clean up main.go

- Remove signal channel in favor of signal.NotifyContext
- Move shutdown context creation after signal wait so that the timeout is valid during shutdown

Signed-off-by: Joe Adams <github@joeadams.io>
Signed-off-by: Joe Adams <github@joeadams.io>
* feat: replace go-kit/kit with go-kit/log

Signed-off-by: Yoan Blanc <yblanc@edgelab.ch>

* fixup! feat: replace go-kit/kit with go-kit/log

Signed-off-by: Yoan Blanc <yblanc@edgelab.ch>

* fixup! fixup! feat: replace go-kit/kit with go-kit/log

Signed-off-by: Yoan Blanc <yblanc@edgelab.ch>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
* Updates for v1.3.0

- Update CHANGELOG
- Ugrade modules
- Bump VERSION

Signed-off-by: Joe Adams <github@joeadams.io>

* Bump 1.3.0 date

Signed-off-by: Joe Adams <github@joeadams.io>
* Add search_query_current and indexing_index_current

Signed-off-by: Loc Mai <lmai@axon.com>

* update descriptions

Signed-off-by: Loc Mai <lmai@axon.com>

* Update collector/indices.go

Co-authored-by: Ben Kochie <superq@gmail.com>
Signed-off-by: Loc Mai <lmai@axon.com>

* rename to current_indexed_docs

Signed-off-by: Loc Mai <lmai@axon.com>

* update docs

Signed-off-by: Loc Mai <lmai@axon.com>

* fix ordering

Signed-off-by: Loc Mai <lmai@axon.com>

* fix ordering

Signed-off-by: Loc Mai <lmai@axon.com>

* change back to index_current

Signed-off-by: Loc Mai <lmai@axon.com>

Co-authored-by: Ben Kochie <superq@gmail.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
* Remove non-existing CPU metrics

I couldn't find any Elasticsearch versions where these CPU metrics
were exposed, so they are always set to 0.

Signed-off-by: Jonathan Ballet <jonathan.ballet@camunda.com>

* remove more

Signed-off-by: Jonathan Ballet <jonathan.ballet@camunda.com>
dependabot bot and others added 30 commits February 15, 2025 13:01
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.29.0 to 0.33.0.
- [Commits](golang/net@v0.29.0...v0.33.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Corrected the description in below lines

esExportDataStream = kingpin.Flag("es.data_stream",
			"Export stats for Data Streams.").

Signed-off-by: Sandhya <108527554+Sandhyaranitp@users.noreply.github.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
)

Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.13.1 to 0.14.0.
- [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.1...v0.14.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/exporter-toolkit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
BREAKING CHANGES:

The flag `--es.slm` has been renamed to `--collector.slm`.

The logging system has been replaced with log/slog from the stdlib. This change is being made across the prometheus ecosystem. The logging output has changed, but the messages and levels remain the same. The `ts` label for the timestamp has bewen replaced with `time`, the accuracy is less, and the timezone is not forced to UTC. The `caller` field has been replaced by the `source` field, which now includes the full path to the source file. The `level` field now exposes the log level in capital letters.

* [CHANGE] Rename --es.slm to --collector.slm #932
* [CHANGE] Replace logging system #942
* [ENHANCEMENT] Add external refresh stats #933

Signed-off-by: SuperQ <superq@gmail.com>
Actions are currently failing to publish the images because the image names are incorrect. I'm not positive if there are more changes necessary yet, but this should correct the organization name.

See https://github.com/prometheus-community/elasticsearch_exporter/actions/runs/13350556606/job/37286525153

Signed-off-by: Joe Adams <github@joeadams.io>
Bumps [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) from 1.36.1 to 1.36.3.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json)
- [Commits](aws/aws-sdk-go-v2@v1.36.1...v1.36.3)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.5 to 1.21.0.
- [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.5...v1.21.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
This code path was not perviously covered by tests. This adds a test case for the most recently tested version of elasticsearch with Indices.shard set to true.

Signed-off-by: Joe Adams <github@joeadams.io>
Signed-off-by: Joe Adams <github@joeadams.io>
We have moved to GitHub Actions, so disable CircleCI jobs. Will revisit removing this file in the future.

Signed-off-by: Joe Adams <github@joeadams.io>
…les/github.com/aws/aws-sdk-go-v2-1.36.3

Bump github.com/aws/aws-sdk-go-v2 from 1.36.1 to 1.36.3
…les/github.com/prometheus/client_golang-1.21.0

Bump github.com/prometheus/client_golang from 1.20.5 to 1.21.0
Reduce the montly PR updates by grouping the AWS Go modules.

Signed-off-by: SuperQ <superq@gmail.com>
Bumps the aws group with 3 updates: [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2), [github.com/aws/aws-sdk-go-v2/credentials](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2).


Updates `github.com/aws/aws-sdk-go-v2/config` from 1.29.6 to 1.29.8
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json)
- [Commits](aws/aws-sdk-go-v2@config/v1.29.6...config/v1.29.8)

Updates `github.com/aws/aws-sdk-go-v2/credentials` from 1.17.59 to 1.17.61
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json)
- [Commits](aws/aws-sdk-go-v2@credentials/v1.17.59...credentials/v1.17.61)

Updates `github.com/aws/aws-sdk-go-v2/service/sts` from 1.33.14 to 1.33.16
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json)
- [Commits](aws/aws-sdk-go-v2@service/sns/v1.33.14...service/sns/v1.33.16)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws
- dependency-name: github.com/aws/aws-sdk-go-v2/credentials
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws
- dependency-name: github.com/aws/aws-sdk-go-v2/service/sts
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws
...

Signed-off-by: dependabot[bot] <support@github.com>
…les/aws-e4759fe239

Bump the aws group with 3 updates
- Refactor tests to test the output of the collector
- Add missing metric descriptions in Describe()

Signed-off-by: Joe Adams <github@joeadams.io>
-  Move metric DESC to vars to aid in unused linter checks
-  Clean up HTTP requests and JSON handling

Will refactor to use the Collector interface in a future change

Signed-off-by: Joe Adams <github@joeadams.io>
- Move metric DESC to vars to aid in unused linter checks
- Use new Collector interface

Signed-off-by: Joe Adams <github@joeadams.io>
This config isn't needed because we're the code doesn't fail the linter check. The config is however preventing golangci-lint from being upgraded because this does not pass the schema validation.

Signed-off-by: Joe Adams <github@joeadams.io>
* Refactor ILM collector

Consolidate the ILM collector logic into a single collector using the new Collector interface

Signed-off-by: Joe Adams <github@joeadams.io>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.33.0 to 0.36.0.
- [Commits](golang/net@v0.33.0...v0.36.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: prombot <prometheus-team@googlegroups.com>
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.2.0 to 6.5.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@ec5d184...2226d7c)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.