Skip to content

Commit

Permalink
Further docs rename to new org; Improved docker login. (thanos-io#1344)
Browse files Browse the repository at this point in the history
Signed-off-by: Bartek Plotka <[email protected]>
  • Loading branch information
bwplotka authored and brancz committed Jul 19, 2019
1 parent 1b523e0 commit 546fdcd
Show file tree
Hide file tree
Showing 18 changed files with 138 additions and 138 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# require credentials. Env variables that sets up these tests will work only for these kind of PRs.
command: |
if ! [ -z ${GCP_PROJECT} ]; then
echo $GOOGLE_APPLICATION_CREDENTIALS_CONTENT > /go/src/github.com/thanos-io/thanos/circleci-gcs-creds.json
echo $GOOGLE_APPLICATION_CREDENTIALS_CONTENT > $GOOGLE_APPLICATION_CREDENTIALS
echo "Awesome! GCS integration tests are enabled."
fi
- run: make check-go-mod
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- run: ln -s .build/linux-amd64/thanos thanos
- run: make docker
- run: docker run thanos --help
- run: docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io
- run: echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" quay.io --password-stdin
- run: make docker-push

publish_release:
Expand All @@ -98,7 +98,7 @@ jobs:
- run: ln -s .build/linux-amd64/thanos thanos
- run: make docker
- run: docker run thanos --help
- run: docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io
- run: echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" quay.io --password-stdin
- run: make docker-push DOCKER_IMAGE_TAG=$CIRCLE_TAG

workflows:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ about what components it touches e.g "query:" or ".*:"
-->

<!--
In case of issues related to exact bucket implementation, please ping corresponded maintainer from list here: https://github.com/improbable-eng/thanos/blob/master/docs/storage.md
In case of issues related to exact bucket implementation, please ping corresponded maintainer from list here: https://github.com/thanos-io/thanos/blob/master/docs/storage.md
-->

**Thanos, Prometheus and Golang version used**
Expand Down
206 changes: 103 additions & 103 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ Adding large new features and components to Thanos should be done by first creat

1. Read [getting started docs](docs/getting-started.md) and prepare Thanos.
2. Familiarize yourself with [Makefile](Makefile) commands like `format`, `build`, `proto` and `test`.
3. Fork improbable-eng/thanos.git and start development from your own fork. Here are sample steps to setup your development environment:
3. Fork thanos-io/thanos.git and start development from your own fork. Here are sample steps to setup your development environment:
```console
$ mkdir -p $GOPATH/src/github.com/improbable-eng
$ cd $GOPATH/src/github.com/improbable-eng
$ mkdir -p $GOPATH/src/github.com/thanos-io
$ cd $GOPATH/src/github.com/thanos-io
$ git clone https://github.com/<your_github_id>/thanos.git
$ cd thanos
$ git remote add upstream https://github.com/thanos-io/thanos.git
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Please reach any of the maintainer on slack or email if you want to help as well

### Triage labels

To improve navigating through issues and PRs we introduce various [labels](https://github.com/improbable-eng/thanos/issues/labels). Part of triaging process for Triage and Maintainers
To improve navigating through issues and PRs we introduce various [labels](https://github.com/thanos-io/thanos/issues/labels). Part of triaging process for Triage and Maintainers
is to adjust those labels if needed manual. The `Prow` system can automate a portion of this in future.

The main labels are:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center"><img src="docs/img/Thanos-logo_fullmedium.png" alt="Thanos Logo"></p>

[![CircleCI](https://circleci.com/gh/improbable-eng/thanos.svg?style=svg)](https://circleci.com/gh/improbable-eng/thanos)
[![CircleCI](https://circleci.com/gh/thanos-io/thanos.svg?style=svg)](https://circleci.com/gh/thanos-io/thanos)
[![Go Report Card](https://goreportcard.com/badge/github.com/thanos-io/thanos)](https://goreportcard.com/report/github.com/thanos-io/thanos)
[![GoDoc](https://godoc.org/github.com/thanos-io/thanos?status.svg)](https://godoc.org/github.com/thanos-io/thanos)
[![Slack](https://img.shields.io/badge/join%20slack-%23thanos-brightgreen.svg)](https://slack.cncf.io/)
Expand Down Expand Up @@ -33,7 +33,7 @@ Concretely the aims of the project are:
* [Design](https://thanos.io/design.md/)
* [Prom Meetup Slides](https://www.slideshare.net/BartomiejPotka/thanos-global-durable-prometheus-monitoring)
* [Introduction blog post](https://improbable.io/games/blog/thanos-prometheus-at-scale)
* [Benchmarks](https://github.com/improbable-eng/thanos/tree/master/benchmark)
* [Benchmarks](https://github.com/thanos-io/thanos/tree/master/benchmark)
* [Proposals](docs/proposals)
* [Integrations](docs/integrations.md)

Expand Down
4 changes: 2 additions & 2 deletions benchmark/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Thanosbench
A series of benchmarking/stress test tools for [thanos](https://github.com/improbable-eng/thanos).
A series of benchmarking/stress test tools for [thanos](https://github.com/thanos-io/thanos).

## Installation
1. Fetch thanosbench `go get github.com/improbable-eng/thanosbench`
1. Fetch thanosbench `go get github.com/thanos-io/thanosbench`
1. Install thanosbench with `make`
1. Create cloud resources for the load test k8s cluster.
* `cd terraform`
Expand Down
2 changes: 1 addition & 1 deletion docs/components/rule.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ In case of Ruler in HA you need to make sure you have the following labelling se
* Labels that need to be dropped just before sending to alermanager in order for alertmanager to deduplicate alerts e.g
`--alert.label-drop="replica"`.

Full relabelling is planned to be done in future and is tracked here: https://github.com/improbable-eng/thanos/issues/660
Full relabelling is planned to be done in future and is tracked here: https://github.com/thanos-io/thanos/issues/660

## Flags

Expand Down
6 changes: 3 additions & 3 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ Thanos will work in cloud native environments as well as more traditional ones.

## Get Thanos!

You can find the latest Thanos release [here](https://github.com/improbable-eng/thanos/releases).
You can find the latest Thanos release [here](https://github.com/thanos-io/thanos/releases).


If you want to build Thanos from source you would need a working installation of the Go [toolchain](https://github.com/golang/tools) (`GOPATH`, `PATH=${GOPATH}/bin:${PATH}`).

Thanos can be downloaded and built by running:

```bash
go get -d github.com/improbable-eng/thanos/...
cd ${GOPATH}/src/github.com/improbable-eng/thanos
go get -d github.com/thanos-io/thanos/...
cd ${GOPATH}/src/github.com/thanos-io/thanos
make
```

Expand Down
2 changes: 1 addition & 1 deletion docs/integrations.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ slug: /integrations.md

## StoreAPI

[StoreAPI](https://github.com/improbable-eng/thanos/blob/master/pkg/store/storepb/rpc.proto) is a common proto interface for gRPC component that can connect to [Querier](components/query.md) in order to fetch the metric series. Natively Thanos implements [Sidecar](components/sidecar.md) (local Prometheus data), [Ruler](components/rule.md) and [Store gateway](components/store.md). This solves fetching series from Prometheus or Prometheus TSDB format, however same interface can be used to fetch metrics from other storages.
[StoreAPI](https://github.com/thanos-io/thanos/blob/master/pkg/store/storepb/rpc.proto) is a common proto interface for gRPC component that can connect to [Querier](components/query.md) in order to fetch the metric series. Natively Thanos implements [Sidecar](components/sidecar.md) (local Prometheus data), [Ruler](components/rule.md) and [Store gateway](components/store.md). This solves fetching series from Prometheus or Prometheus TSDB format, however same interface can be used to fetch metrics from other storages.

Below you can find some public integrations with other systems through StoreAPI:

Expand Down
10 changes: 5 additions & 5 deletions docs/proposals/approved/201901-read-write-operations-bucket.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ owner: bwplotka

### Tickets:

* https://github.com/improbable-eng/thanos/issues/298 (eventual consistency)
* https://github.com/improbable-eng/thanos/issues/377 (eventual consistency & partial upload)
* https://github.com/improbable-eng/thanos/issues/564 (retention vs store gateway)
* https://github.com/improbable-eng/thanos/issues/271 (adapt for removals faster)
* https://github.com/thanos-io/thanos/issues/298 (eventual consistency)
* https://github.com/thanos-io/thanos/issues/377 (eventual consistency & partial upload)
* https://github.com/thanos-io/thanos/issues/564 (retention vs store gateway)
* https://github.com/thanos-io/thanos/issues/271 (adapt for removals faster)

## Summary

Expand All @@ -36,7 +36,7 @@ in Thanos system, like:
* Thanos compactor uploads compacted block and deletes source blocks. After next sync iteration it does not see a new block (read after write eventual consistency). It sees gap, wrongly plans next compaction and causes non-resolvable overlap.
* Thanos compactor uploads compacted block and deletes source blocks. Thanos Store Gateway syncs every 3m so it missed that fact. Next query that hits store gateway tries to fetch deleted source blocks and fails.

Currently, we have only basic safeguards against those in form of [`syncDelay`](https://github.com/improbable-eng/thanos/blob/bc088285a1b4bf464fdf2539e4b365b805874eed/pkg/compact/compact.go#L187).
Currently, we have only basic safeguards against those in form of [`syncDelay`](https://github.com/thanos-io/thanos/blob/bc088285a1b4bf464fdf2539e4b365b805874eed/pkg/compact/compact.go#L187).
That helps with operations between sidecar and compactor but does not fix inter-compactor logic in case of eventual consistent storage or partial upload failures.

We also partially assumed strong consistency for object storage, because [GCS has strong consistency](https://cloud.google.com/storage/docs/consistency) and S3 has it as well,
Expand Down
14 changes: 7 additions & 7 deletions docs/proposals/completed/201809_gossip-removal.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ status: completed
owner: bwplotka
---

### Ticket: https://github.com/improbable-eng/thanos/issues/484
### Ticket: https://github.com/thanos-io/thanos/issues/484
## Summary

It is becoming clear that we need to remove gossip protocol as our main way of communication between Thanos Querier and
other components. Static configuration seems to be well enough for our simple use cases. To give users more flexibility
(similar to gossip auto-join logic), we already wanted to introduce a [File SD](https://github.com/improbable-eng/thanos/issues/492)
(similar to gossip auto-join logic), we already wanted to introduce a [File SD](https://github.com/thanos-io/thanos/issues/492)
that allows changing `StoreAPI`s on-the-fly.

## Motivation
Expand Down Expand Up @@ -40,24 +40,24 @@ custom app level protocol. This is a no-go if you use L7 loadbalancers and proxi
we needed to implement health check and metadata propagation anyway. In fact, `StoreAPI.Info` was already there all the time.
* Gossip operates per `peer` level and there is no way you can abstract multiple peers behind loadbalancer. This hides easy
solutions from our eyes, e.g how to make Store Gateway HA. Without gossip, you can just use Kubernetes HA Service or any other loadbalancer.
To support Store Gateway HA for gossip we would end up implementing LB logic in Thanos Querier (like proposed [here](https://github.com/improbable-eng/thanos/pull/404))
To support Store Gateway HA for gossip we would end up implementing LB logic in Thanos Querier (like proposed [here](https://github.com/thanos-io/thanos/pull/404))
* At some point we want to be flexible and allow other discovery mechanisms. Gossip does not work for everyone and static flags
are too.. static. (: We need [File SD](https://github.com/improbable-eng/thanos/issues/492) for flexibility anyway.
are too.. static. (: We need [File SD](https://github.com/thanos-io/thanos/issues/492) for flexibility anyway.
* One thing less to maintain.

## Goals

* Remove gossip support from code (Decision after initial feedback)
* We are still RC, so technically there are no API guarantees yet.
* Leave --store flags
* Make sure [File SD](https://github.com/improbable-eng/thanos/issues/492) is in place and documented before removal.
* Make sure [File SD](https://github.com/thanos-io/thanos/issues/492) is in place and documented before removal.

## Proposal: Steps

* Add File Service Discovery (SD): https://github.com/improbable-eng/thanos/issues/492
* Add File Service Discovery (SD): https://github.com/thanos-io/thanos/issues/492
* Remove gossip from the documentation, be clear what talks with what (!)
* Deprecate gossip in code.
* Remove gossip code and flags AFTER [File SD](https://github.com/improbable-eng/thanos/issues/492) is done and stable.
* Remove gossip code and flags AFTER [File SD](https://github.com/thanos-io/thanos/issues/492) is done and stable.

### Backwards compatibility

Expand Down
2 changes: 1 addition & 1 deletion docs/proposals/rejected/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The proposal of creating a central configuration component within Thanos has bee

Cluster configuration for targets will be implemented in a separate repository and we may look at open sourcing in the future if there are others that have the same needs.

Please see [Issue 387](https://github.com/improbable-eng/thanos/pull/387) and [Prometheus/Prometheus - Issue 4309](https://github.com/prometheus/prometheus/issues/4309) for more information.
Please see [Issue 387](https://github.com/thanos-io/thanos/pull/387) and [Prometheus/Prometheus - Issue 4309](https://github.com/prometheus/prometheus/issues/4309) for more information.

## Motivation

Expand Down
2 changes: 1 addition & 1 deletion pkg/block/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ type ignoreFnType func(mint, maxt int64, prev *chunks.Meta, curr *chunks.Meta) (
// - all "complete" outsiders (they will not accessed anyway)
// - removes all near "complete" outside chunks introduced by https://github.com/prometheus/tsdb/issues/347.
// Fixable inconsistencies are resolved in the new block.
// TODO(bplotka): https://github.com/improbable-eng/thanos/issues/378
// TODO(bplotka): https://github.com/thanos-io/thanos/issues/378
func Repair(logger log.Logger, dir string, id ulid.ULID, source metadata.SourceType, ignoreChkFns ...ignoreFnType) (resid ulid.ULID, err error) {
if len(ignoreChkFns) == 0 {
return resid, errors.New("no ignore chunk function specified")
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/templates/bucket.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<!--
TODO(jaseemabid): The legend is only a small temporary workaround till we have better ways of showing the labels.
See https://github.com/improbable-eng/thanos/issues/1246#issuecomment-506681398 for context.
See https://github.com/thanos-io/thanos/issues/1246#issuecomment-506681398 for context.
-->

<div id="legend" class="container-fluid" style="display: none; padding-top: 50px;">
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/templates/bucket_menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div id="nav-content" class="navbar-collapse collapse">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="https://github.com/improbable-eng/thanos" target="_blank">Help</a>
<a class="nav-link" href="https://github.com/thanos-io/thanos" target="_blank">Help</a>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/templates/query_menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="https://github.com/improbable-eng/thanos" target="_blank">Help</a>
<a class="nav-link" href="https://github.com/thanos-io/thanos" target="_blank">Help</a>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/templates/rule_menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/alerts">Alerts</a></li>
<li class="nav-item"><a class="nav-link" href="{{ pathPrefix }}/rules">Rules</a></li>
<li class="nav-item">
<a class="nav-link" href="https://github.com/improbable-eng/thanos" target="_blank">Help</a>
<a class="nav-link" href="https://github.com/thanos-io/thanos" target="_blank">Help</a>
</li>
</ul>
</div>
Expand Down

0 comments on commit 546fdcd

Please sign in to comment.