From 2b3c10205183d29e2ba9ea9bba4ec123ce9fcade Mon Sep 17 00:00:00 2001 From: Yi Jin Date: Thu, 4 Apr 2024 13:40:03 -0700 Subject: [PATCH] cleanup unexpected diff from oss main Signed-off-by: Yi Jin --- CHANGELOG.md | 2 +- Dockerfile.multi-stage | 3 +-- MAINTAINERS.md | 2 +- VERSION | 2 +- docs/components/tools.md | 2 +- docs/getting-started.md | 11 +++++++++++ pkg/block/fetcher.go | 22 +++++++++++----------- 7 files changed, 27 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8804ccdcd6..68a4243753 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re ### Changed - [#7123](https://github.com/thanos-io/thanos/pull/7123) Rule: Change default Alertmanager API version to v2. -- [#7222](https://github.com/thanos-io/thanos/pull/7123) Automatic detection of memory limits and configure GOMEMLIMIT to match. +- [#7223](https://github.com/thanos-io/thanos/pull/7223) Automatic detection of memory limits and configure GOMEMLIMIT to match. ### Removed diff --git a/Dockerfile.multi-stage b/Dockerfile.multi-stage index 1888368034..a7b58f8bb2 100644 --- a/Dockerfile.multi-stage +++ b/Dockerfile.multi-stage @@ -15,9 +15,8 @@ COPY . $GOPATH/src/github.com/thanos-io/thanos RUN git update-index --refresh; make build # ----------------------------------------------------------------------------- -FROM alpine:3.15 -#FROM quay.io/prometheus/busybox@sha256:${BASE_DOCKER_SHA} +FROM quay.io/prometheus/busybox@sha256:${BASE_DOCKER_SHA} LABEL maintainer="The Thanos Authors" COPY --from=builder /go/bin/thanos /bin/thanos diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 9164f720a5..16d51e8552 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -5,7 +5,7 @@ | Bartłomiej Płotka | bwplotka@gmail.com | `@bwplotka` | [@bwplotka](https://github.com/bwplotka) | Google | | Frederic Branczyk | fbranczyk@gmail.com | `@brancz` | [@brancz](https://github.com/brancz) | Polar Signals | | Giedrius Statkevičius | giedriuswork@gmail.com | `@Giedrius Statkevičius` | [@GiedriusS](https://github.com/GiedriusS) | Vinted | -| Kemal Akkoyun | kakkoyun@gmail.com | `@kakkoyun` | [@kakkoyun](https://github.com/kakkoyun) | Polar Signals | +| Kemal Akkoyun | kakkoyun@gmail.com | `@kakkoyun` | [@kakkoyun](https://github.com/kakkoyun) | Fal | | Lucas Servén Marín | lserven@gmail.com | `@squat` | [@squat](https://github.com/squat) | Red Hat | | Prem Saraswat | prmsrswt@gmail.com | `@Prem Saraswat` | [@onprem](https://github.com/onprem) | Red Hat | | Matthias Loibl | mail@matthiasloibl.com | `@metalmatze` | [@metalmatze](https://github.com/metalmatze) | Polar Signals | diff --git a/VERSION b/VERSION index cd46610fe4..cd748687dc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.34.1 +0.35.0-dev diff --git a/docs/components/tools.md b/docs/components/tools.md index 50dadb09e4..a1f7f706ae 100644 --- a/docs/components/tools.md +++ b/docs/components/tools.md @@ -949,7 +949,7 @@ Flags: --rewrite.to-relabel-config-file= Path to YAML file that contains relabel configs that will be applied to blocks - --tmp.dir="/var/folders/7w/bk4g23r116j_srlrlf8_ys7r0000gp/T/thanos-rewrite" + --tmp.dir="/tmp/thanos-rewrite" Working directory for temporary files --tracing.config= Alternative to 'tracing.config-file' flag diff --git a/docs/getting-started.md b/docs/getting-started.md index b346fb5b2f..cffc38d155 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -88,6 +88,17 @@ See up to date [jsonnet mixins](https://github.com/thanos-io/thanos/tree/main/mi ## Talks +* 2024 + * [6 Learnings from Building Thanos Project](https://www.youtube.com/watch?v=ur8dDFaNEFg) + * [Monitoring the World: Scaling Thanos in Dynamic Prometheus Environments](https://www.youtube.com/watch?v=ofhvbG0iTjU) + * [Scaling Thanos at Reddit](https://www.youtube.com/watch?v=c18RGbAxCfI) + * [Thanos Project Updates](https://www.youtube.com/watch?v=wmNtCj5D4_A) + * [Connecting Thanos to the Outer Rim via Query API](https://www.youtube.com/watch?v=E8L8fuRj66o) + * [Multiverse of Thanos: Making Thanos Multi-Tenanted](https://www.youtube.com/watch?v=SAyPQ2d8v4Q) + * [Thanos Receiver Deep Dive](https://www.youtube.com/watch?v=jn_zIfBuUyE) + * [From UI to Storage: Unraveling the Magic of Thanos Query Processing](https://www.youtube.com/watch?v=ZGQIitaKoTM) + * [Thanos’ Infinity Stones and How You Can Operate Them!](https://www.youtube.com/watch?v=e8kvX6mRlyE) + * 2023 * [Planetscale monitoring: Handling billions of active series with Prometheus and Thanos](https://www.youtube.com/watch?v=Or8r46fSaOg) * [Taming the Tsunami: low latency ingestion of push-based metrics in Prometheus](https://www.youtube.com/watch?v=W81x1j765hc) diff --git a/pkg/block/fetcher.go b/pkg/block/fetcher.go index fe9fc6c244..62b52a8f16 100644 --- a/pkg/block/fetcher.go +++ b/pkg/block/fetcher.go @@ -79,7 +79,7 @@ func (s *FetcherMetrics) ResetTx() { } const ( - fetcherSubSys = "blocks_meta" + FetcherSubSys = "blocks_meta" CorruptedMeta = "corrupted-meta-json" NoMeta = "no-meta-json" @@ -109,17 +109,17 @@ func NewBaseFetcherMetrics(reg prometheus.Registerer) *BaseFetcherMetrics { var m BaseFetcherMetrics m.Syncs = promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "base_syncs_total", Help: "Total blocks metadata synchronization attempts by base Fetcher", }) m.CacheMemoryHit = promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "base_cache_memory_hits_total", Help: "Total blocks metadata from memory cache hits", }) m.CacheDiskHit = promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "base_cache_disk_hits_total", Help: "Total blocks metadata from disk cache hits", }) @@ -130,17 +130,17 @@ func NewFetcherMetrics(reg prometheus.Registerer, syncedExtraLabels, modifiedExt var m FetcherMetrics m.Syncs = promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "syncs_total", Help: "Total blocks metadata synchronization attempts", }) m.SyncFailures = promauto.With(reg).NewCounter(prometheus.CounterOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "sync_failures_total", Help: "Total blocks metadata synchronization failures", }) m.SyncDuration = promauto.With(reg).NewHistogram(prometheus.HistogramOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "sync_duration_seconds", Help: "Duration of the blocks metadata synchronization in seconds", Buckets: []float64{0.01, 1, 10, 100, 300, 600, 1000}, @@ -148,7 +148,7 @@ func NewFetcherMetrics(reg prometheus.Registerer, syncedExtraLabels, modifiedExt m.Synced = extprom.NewTxGaugeVec( reg, prometheus.GaugeOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "synced", Help: "Number of block metadata synced", }, @@ -158,7 +158,7 @@ func NewFetcherMetrics(reg prometheus.Registerer, syncedExtraLabels, modifiedExt m.Modified = extprom.NewTxGaugeVec( reg, prometheus.GaugeOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "modified", Help: "Number of blocks whose metadata changed", }, @@ -168,7 +168,7 @@ func NewFetcherMetrics(reg prometheus.Registerer, syncedExtraLabels, modifiedExt m.SyncedByTenant = extprom.NewTxGaugeVec( reg, prometheus.GaugeOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "synced_by_tenant", Help: "Number of metadata blocks synced broken down by tenant", }, @@ -178,7 +178,7 @@ func NewFetcherMetrics(reg prometheus.Registerer, syncedExtraLabels, modifiedExt m.Assigned = extprom.NewTxGaugeVec( reg, prometheus.GaugeOpts{ - Subsystem: fetcherSubSys, + Subsystem: FetcherSubSys, Name: "assigned", Help: "Number of metadata blocks assigned to this pod after all filters.", },