Commit graph

11634 commits

Author SHA1 Message Date
Marco Pracucci 0ad967ebd3
Merge pull request #508 from grafana/sync-upstream-2023-06-30
Sync upstream 2023 06 30
2023-07-06 14:54:33 +02:00
Charles Korn 6f75f8768f
Merge pull request #511 from grafana/charleskorn/fix-benchmark
Add missing `InstallCodec` call to benchmark
2023-07-05 17:41:04 +10:00
Charles Korn 5e8b550ad5
Add missing InstallCodec call to benchmark
@bboreham noticed that `BenchmarkRespond` was missing a call to `InstallCodec` in 
https://github.com/prometheus/prometheus/pull/11905#discussion_r1251255249
2023-07-05 10:36:39 +10:00
Bryan Boreham b72f01414a lint
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2023-07-04 15:01:02 +00:00
Bryan Boreham 013fdb9460 Update goleak for change in glog
Evidently the internal type changed.
2023-07-04 15:01:02 +00:00
Marco Pracucci 34e7d9d997 Fix race condition in ChunkDiskMapper.Truncate() (#12500)
* Fix race condition in ChunkDiskMapper.Truncate()

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Added unit test

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Update tsdb/chunks/head_chunks.go

Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>

---------

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
2023-07-04 15:01:02 +00:00
Matthias Loibl 68362e3bc7 Remove Add(0)
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
2023-07-04 15:01:02 +00:00
Matthias Loibl ba4454c195 web: Initialize requestCounter metrics to 0 with handler and 200k labels.
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
2023-07-04 15:01:02 +00:00
cui fliter 5fc639dabc fix some typos (#12498)
Signed-off-by: cui fliter <imcusg@gmail.com>
2023-07-04 15:01:02 +00:00
dependabot[bot] 041c8c8ece build(deps): bump github.com/stretchr/testify
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.2 to 1.8.4.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.8.2...v1.8.4)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-04 15:01:02 +00:00
dependabot[bot] d965a9b8e6 build(deps): bump golang.org/x/oauth2 from 0.8.0 to 0.9.0
Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.8.0 to 0.9.0.
- [Commits](https://github.com/golang/oauth2/compare/v0.8.0...v0.9.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-04 15:01:02 +00:00
dependabot[bot] 713fafa693 build(deps): bump github.com/aws/aws-sdk-go from 1.44.276 to 1.44.284
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.276 to 1.44.284.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.276...v1.44.284)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-04 15:01:02 +00:00
dependabot[bot] fc84190b6b build(deps): bump github.com/influxdata/influxdb
Bumps [github.com/influxdata/influxdb](https://github.com/influxdata/influxdb) from 1.11.0 to 1.11.2.
- [Release notes](https://github.com/influxdata/influxdb/releases)
- [Changelog](https://github.com/influxdata/influxdb/blob/master/CHANGELOG_OLD.md)
- [Commits](https://github.com/influxdata/influxdb/commits)

---
updated-dependencies:
- dependency-name: github.com/influxdata/influxdb
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-04 15:01:02 +00:00
SuperQ 9de9d20e5c Update depguard config syntax.
Signed-off-by: SuperQ <superq@gmail.com>
2023-07-04 15:01:01 +00:00
SuperQ f8dee099b2 Disable revive unused-parameter
Signed-off-by: SuperQ <superq@gmail.com>
2023-07-04 15:01:01 +00:00
SuperQ d4a224a503 Update golangci-lint
* Update golangci-lint to v1.53.3.
* Update the sync script handler for the old golanci-lint action.

Signed-off-by: SuperQ <superq@gmail.com>
2023-07-04 15:01:01 +00:00
Filip Petkovski 9949d83331 Add nolint for NewParser function
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
2023-07-04 15:01:01 +00:00
Filip Petkovski df6e388d53 parser: Allow parsing arbitrary functions
In Thanos we would like to start experimenting with custom functions that are
currently not part of the PromQL spec. We would do this by adding an implementation
for those functions in the Thanos engine: https://github.com/thanos-community/promql-engine and allow
users to decide which engine they want to use on a per-query basis.

Since we use the PromQL parser from Prometheus, injecting functions in the global `Functions` variable
would mean they also become available for the Prometheus engine. To avoid this side-effect, this commit
exposes a Parser interface in which the supported functions can be injected as an option. If not functions
are injected, the parser implementation will default to the functions defined in the global Functions variable.

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux e86fe245b6 feat refactoring checkrules func
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux 3a37731155 fix: update doc
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux 7f1f842eba fix: apply suggested changes
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux 488ece2899 fix: apply suggested changes
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux ce00e8c7a8 promtool: read from stdin if no filenames are provided in check rules
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
John Losito 04ce186a4d Update configuration.md
Signed-off-by: John Losito <lositojohnj@gmail.com>
2023-07-04 15:01:01 +00:00
Justin Lei 92668d9bf7 Also pass chunkOpts into appendPreprocessor
Signed-off-by: Justin Lei <justin.lei@grafana.com>
2023-07-04 15:01:01 +00:00
Justin Lei 7622d5ac5f Group args to append to memSeries in chunkOpts
Signed-off-by: Justin Lei <justin.lei@grafana.com>
2023-07-04 15:01:01 +00:00
François Gouteroux e0ab445e9a fix: apply suggested changes
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux 3b96cd2feb fix: apply suggested changes
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux 9a55e301f7 feat: enhance stdin check and add tests parsing error
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux 8f4ef5029c feat: support histogram and summary metric types
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux 430a664cf4 feat: make push metrics labels generic and repeatable
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux 25d352e6e9 feat: add suggested changes, tests, and stdin support
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
François Gouteroux 5b9accd2b5 feat(promtool): add push metrics command
Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>
2023-07-04 15:01:01 +00:00
tyltr 96717579d2 typo
Signed-off-by: tyltr <tylitianrui@126.com>
2023-07-04 15:01:01 +00:00
Julien Pivotto ceecaae085 Stepping up as 2.46 release shepherd (#12494)
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2023-07-04 15:01:01 +00:00
Matt Harbison 407b6be630 Fix path handling in File-SD watcher to allow directory monitoring on Windows
Previously, `d.paths` were normalized to backslashes on Windows, even when if
the config file used Unix style.  The end result meant always watching `./`, so
changes for this config were always ignored:

    scrape_configs:
      - job_name: 'envmsc1'
        file_sd_configs:
        - files:
          - 'targets/envmsc1.d/*.yml'
          - 'targets/envmsc1.d/*.yaml'

Additionally, unlike the other platforms, no warning was emitted on startup
about not being able to install the watch if the directory didn't exist.  Now it
is logged.

Signed-off-by: Matt Harbison <mharbison@atto.com>
2023-07-04 15:01:01 +00:00
Jesus Vazquez 0e2d08f4a8 Release 2.45.0 (#12486)
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
2023-07-04 15:01:01 +00:00
Jesus Vazquez c5a88748ab Fix PR typo in 2.45.0-rc.1 CHANGELOG (#12479)
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
2023-07-04 15:01:01 +00:00
Jesus Vazquez e7f9683097 Create 2.45.0-rc.1 (#12478)
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
2023-07-04 15:01:01 +00:00
Julien Pivotto 57036cfd39 Revert "Improving Performance on the API Gzip Handler (#12363)"
This reverts commit dfae954dc1.

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2023-07-04 15:01:01 +00:00
Bryan Boreham 7defd025cb Placate lint
I think the version using scoping was better, but I'm out of energy to fight the linter.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2023-07-04 15:01:01 +00:00
Bryan Boreham cfbbd2ce2a promql: include parsing in active-query tracking
So that the max-concurrency limit is applied.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2023-07-04 15:01:01 +00:00
Bryan Boreham 1706264cef promql: refactor: create query object before parsing
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2023-07-04 15:01:01 +00:00
Bryan Boreham 621d29795d promql: refactor: extract fn to wait on concurrency limit
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2023-07-04 15:01:01 +00:00
dependabot[bot] 21c605a264 build(deps): bump github.com/prometheus/prometheus
Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.43.0 to 0.44.0.
- [Release notes](https://github.com/prometheus/prometheus/releases)
- [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/prometheus/compare/v0.43.0...v0.44.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-04 15:01:01 +00:00
Julien Pivotto 71b5a9f79f Add support for inline TLS certificates
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
2023-07-04 15:01:01 +00:00
Jesus Vazquez 18f3c26ce0 Bump UI version (#12440)
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
2023-07-04 15:01:01 +00:00
Jesus Vazquez 3961006613 Create release candidate 2.45.0-rc.0 (#12435)
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
2023-07-04 15:01:01 +00:00
Bartol Deak 21d015a2c2 rewrite which with command -v
Signed-off-by: Bartol Deak <b@bdeak.net>
2023-07-04 15:01:01 +00:00
Bartol Deak 796842d8a8 Hide which stderr output
Signed-off-by: Bartol Deak <b@bdeak.net>
2023-07-04 15:01:01 +00:00