Skip to content

Commit

Permalink
bucket: Set state of status prober properly (thanos-io#2120)
Browse files Browse the repository at this point in the history
* Set state of status prober proberly

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Add bucket web to quickstart script

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Add changelog

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
  • Loading branch information
kakkoyun authored and vankop committed Feb 28, 2020
1 parent 0ac51e0 commit 04a5633
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel

- [#2015](https://github.com/thanos-io/thanos/pull/2015) Sidecar: Querier /api/v1/series bug fixed when time range was ignored inside sidecar.
The bug was noticeable for example when using Grafana template variables.
- [#2120](https://github.com/thanos-io/thanos/pull/2120) Bucket Web: Set state of status prober properly.

## [v0.10.0](https://github.com/thanos-io/thanos/releases/tag/v0.10.0) - 2020.01.13

Expand Down
2 changes: 2 additions & 0 deletions cmd/thanos/bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,8 @@ func registerBucketWeb(m map[string]setupFunc, root *kingpin.CmdClause, name str
}

g.Add(func() error {
statusProber.Ready()

return refresh(ctx, logger, bucketUI, *interval, *timeout, name, reg, objStoreConfig)
}, func(error) {
cancel()
Expand Down
11 changes: 11 additions & 0 deletions scripts/quickstart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,15 @@ for i in $(seq 0 1); do
${STORES} &
done

sleep 0.5

if [ -n "${GCS_BUCKET}" -o -n "${S3_ENDPOINT}" ]; then
${THANOS_EXECUTABLE} bucket web \
--debug.name bucket-web \
--log.level debug \
--http-address 0.0.0.0:10933 \
--http-grace-period 1s \
${OBJSTORECFG} &
fi

wait

0 comments on commit 04a5633

Please sign in to comment.