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

Sync with upstream Prometheus #453

Merged
merged 32 commits into from Mar 13, 2023
Merged

Sync with upstream Prometheus #453

merged 32 commits into from Mar 13, 2023

Commits on Feb 10, 2023

  1. Protect NewOOOCompactionHead from an unitialized wbl

    Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
    jesusvazquez committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    f269077 View commit details
    Browse the repository at this point in the history
  2. Add unit test and also protect truncateOOO

    Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
    jesusvazquez committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    5c3f058 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. scrape: add benchmark for TargetsFromGroup

    `loadConfiguration` is made more general.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    95fc032 View commit details
    Browse the repository at this point in the history
  2. model/labels: add Get and Range to Builder

    This lets relabelling work on a `Builder` rather than converting to and
    from `Labels` on every rule.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    d740abf View commit details
    Browse the repository at this point in the history
  3. relabel: keep intermediate results in labels.Builder

    Save work converting between Builder and Labels.
    
    Also expose ProcessBuilder, so callers can supply a Builder.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    11d019e View commit details
    Browse the repository at this point in the history
  4. scrape: make PopulateLabels work with Builder not Labels

    Save work converting to and fro.
    
    Uses the recently-added relabel.ProcessBuilder variant.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    c1dbc7b View commit details
    Browse the repository at this point in the history
  5. scrape: make TargetsFromGroup work with Builder not []Label

    Save work converting to `Labels` then to `Builder`.
    `PopulateLabels()` now takes as Builder as input.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    5cfe759 View commit details
    Browse the repository at this point in the history
  6. scrape: re-use memory in TargetsFromGroup

    Common service discovery mechanisms such as Kubernetes can generate a
    lot of target groups, so this function was allocating a lot of memory
    which then immediately became garbage. Re-using the structures across
    an entire Sync saves effort.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    f4fd9b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Remove unnecessary sort

    Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
    damnever committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    36fc115 View commit details
    Browse the repository at this point in the history
  2. Update our own dependencies, support proxy from env

    Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
    roidelapluie committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    0c56e5d View commit details
    Browse the repository at this point in the history
  3. Bump Otel and dependencies from 1.11.2 to 1.14.0

    Direct imports:
    	go.opentelemetry.io/otel v1.14.0
    	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0
    	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0
    	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0
    	go.opentelemetry.io/otel/sdk v1.14.0
    	go.opentelemetry.io/otel/trace v1.14.0
    
    These seem to correspond:
    	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0
    
    Other direct dependencies required to update by Otel:
    	github.com/stretchr/testify v1.8.2
    	google.golang.org/grpc v1.53.0
    
    Indirect dependencies required to update by Otel:
    	cloud.google.com/go/compute v1.15.1
    	github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b
    	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0
    	go.opentelemetry.io/otel/metric v0.36.0
    
    Also the import of go.opentelemetry.io/otel/semconv had to be updated
    to v1.17.0 to match https://github.com/open-telemetry/opentelemetry-go/blob/60f7d42d1eedae6381f1d6524374b57a274e1639/sdk/resource/process.go#L25
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    57d8037 View commit details
    Browse the repository at this point in the history
  4. Avoid unnecessary allocations in recording rule evaluation (#11812)

    Re-use the Builder each time round the loop.
    charleskorn committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    3db98d7 View commit details
    Browse the repository at this point in the history
  5. promql: disable some slow cases in TestConcurrentRangeQueries

    TestConcurrentRangeQueries runs many queries, up to 4 at the same time,
    to try to expose any race conditions.
    This change stops four of them from running with a thousand or more steps:
    
      `holt_winters(a_X[1d], 0.3, 0.3)`
      `changes(a_X[1d])`
      `rate(a_X[1d])`
      `absent_over_time(a_X[1d])`
    
    Particularly when the test runs with `-race` in CI, this reduces the
    time and resources required.
    
    Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
    bboreham committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    be4a9c2 View commit details
    Browse the repository at this point in the history
  6. Update tests

    Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
    roidelapluie committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    1fd5979 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #12098 from roidelapluie/update-our-deps

    Update our own dependencies, support proxy from env
    roidelapluie committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    f2e3c9f View commit details
    Browse the repository at this point in the history
  8. Merge pull request #12100 from prometheus/bump-otel-1-14

    Bump Otel and dependencies from 1.11.2 to 1.14.0
    roidelapluie committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    9afbb23 View commit details
    Browse the repository at this point in the history
  9. remote: Convert to RecoverableError using errors.As (#12103)

    In storage/remote, try converting to RecoverableError using errors.As,
    instead of through direct casting.
    
    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    aknuds1 committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    435b500 View commit details
    Browse the repository at this point in the history
  10. Update go dependencies

    Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
    roidelapluie committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    5f3a02f View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Merge pull request #12106 from roidelapluie/deps243

    Update go dependencies
    roidelapluie committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    479fde5 View commit details
    Browse the repository at this point in the history
  2. remote: Improve some comments (#12102)

    Improve some comments in storage/remote/queue_manager.go, wrt. general
    language and a typo.
    
    Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
    aknuds1 committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    bc9a82f View commit details
    Browse the repository at this point in the history
  3. Merge pull request #12101 from bboreham/disable-slow-promql-tests

    promql: disable some slow cases in TestConcurrentRangeQueries
    bboreham committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    d21229b View commit details
    Browse the repository at this point in the history
  4. Merge pull request #12048 from bboreham/faster-targets

    Scraping targets are synced by creating the full set, then adding/removing any which have changed.
    This PR speeds up the process of creating the full set.
    
    I added a benchmark for `TargetsFromGroup`; it uses configuration from a typical Kubernetes SD.
    
    The crux of the change is to do relabeling inside labels.Builder instead of converting to labels.Labels and back again for every rule. The change is broken into several commits for easier review.
    
    This is a breaking change to `scrape.PopulateLabels()`, but `relabel.Process` is left as-is, with a new `relabel.ProcessBuilder` option.
    bboreham committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    b96b89e View commit details
    Browse the repository at this point in the history
  5. Merge pull request #12095 from damnever/unnecessary-sort

    Remove unnecessary sort
    roidelapluie committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    5583c77 View commit details
    Browse the repository at this point in the history
  6. Release 2.43.0-rc.0

    Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
    roidelapluie committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    b6d91e8 View commit details
    Browse the repository at this point in the history
  7. Address feedback

    Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
    roidelapluie committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    031fc2d View commit details
    Browse the repository at this point in the history
  8. Merge pull request #12114 from roidelapluie/new-release

    Release 2.43.0-rc.0
    roidelapluie committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    001ee26 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2023

  1. build(deps): bump github.com/prometheus/prometheus from 0.37.0 to 0.4…

    …2.0 in /documentation/examples/remote_storage
    
    Signed-off-by: junya koyama <arukiidou@yahoo.co.jp>
    arukiidou committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    bde3a04 View commit details
    Browse the repository at this point in the history
  2. docs: Add signal information to getting started

    Closes prometheus/docs#167
    
    Signed-off-by: Harold Dost <h.dost@criteo.com>
    hdost committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    3125e16 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2023

  1. Merge pull request #10704 from hdost/feat/167-prometheus-docs

    docs: Add signal information to getting started
    bwplotka committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    742979a View commit details
    Browse the repository at this point in the history
  2. Merge pull request #12122 from arukiidou/chore/prometheus-example-bump

    build(deps): bump prometheus/prometheus from 0.37.0 to 0.42.0 in examples
    roidelapluie committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    865f474 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. Merge pull request #11962 from jesusvazquez/jvp/protect-new-compactio…

    …n-head-from-uninitialized-wbl
    
    TSDB: Protect NewOOOCompactionHead from an uninitialized wbl
    codesome committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    6c008ec View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'upstream/main' into sync-prom

    Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
    codesome committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    7e74f73 View commit details
    Browse the repository at this point in the history