Merge pull request #1322 from grafana/cherry-pick-prs-to-cut-2.0.0-rc.1

Cherry pick PRs and prepare to cut 2.0.0-rc.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,23 +6,24 @@ labels: ""
 assignees: ""
 ---
 
-## Describe the bug
+#### Describe the bug
 A clear and concise description of what the bug is.
 
-## To Reproduce
+#### To Reproduce
 Steps to reproduce the behavior:
 
 1. Start Mimir (SHA or version)
 2. Perform Operations(Read/Write/Others)
 
-## Expected behavior
+#### Expected behavior
+
 A clear and concise description of what you expected to happen.
 
-## Environment
+#### Environment
 
 - Infrastructure: [e.g., Kubernetes, bare-metal, laptop]
 - Deployment tool: [e.g., helm, jsonnet]
 
-## Additional Context
+#### Additional Context
 
 <!--  Additional relevant info which can help us debug this issue easily like Logs, Configuration etc. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,14 +6,18 @@ labels: ""
 assignees: ""
 ---
 
-## Is your feature request related to a problem? Please describe.
+#### Is your feature request related to a problem? Please describe.
+
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-## Describe the solution you'd like
+#### Describe the solution you'd like
+
 A clear and concise description of what you want to happen.
 
-## Describe alternatives you've considered
+#### Describe alternatives you've considered
+
 A clear and concise description of any alternative solutions or features you've considered.
 
-## Additional context
+#### Additional context
+
 Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

@@ -4,15 +4,15 @@
 2. Rebase your PR if it gets out of sync with main
 -->
 
-## What this PR does
+#### What this PR does
 
-## Which issue(s) this PR fixes
+#### Which issue(s) this PR fixes or relates to
 
 <!-- Please make sure you don't reference cortex issues here, as the references can be publicly seen under certain conditions -->
 
 Fixes #<issue number>
 
-## Checklist
+#### Checklist
 
 - [ ] Tests updated
 - [ ] Documentation added

.github/workflows/test-build-deploy.yml

@@ -108,7 +108,7 @@ jobs:
         uses: actions/checkout@v1
       - name: Build Website
         run: |
-          docker run -v ${PWD}/docs/sources:/hugo/content/docs/mimir/latest --rm grafana/docs-base:latest /bin/bash -c 'mkdir -p content/docs/grafana/latest/ && touch content/docs/grafana/latest/menu.yaml && make prod'
+          docker run -v ${PWD}/docs/sources:/hugo/content/docs/mimir/latest -e HUGO_REFLINKSERRORLEVEL=ERROR --rm grafana/docs-base:latest /bin/bash -c 'mkdir -p content/docs/grafana/latest/ && touch content/docs/grafana/latest/menu.yaml && make prod'
 
   build-mimir:
     runs-on: ubuntu-20.04

ADOPTERS.md

@@ -1,3 +1,3 @@
-If you're using Mimir, feel free to add yourself/your organization.
+If you’re using Grafana Mimir, feel free to add yourself or your organization.
 
 - [Grafana Labs](https://grafana.com)

CHANGELOG.md

@@ -2,8 +2,11 @@
 
 ## Grafana Mimir - main / unreleased
 
+### Mixin
+
+### Jsonnet
 
-## 2.0.0-rc.0
+## 2.0.0-rc.1
 
 ### Grafana Mimir
 
@@ -703,6 +706,8 @@ _Changes since `grafana/cortex-jsonnet` `1.9.0`._
 * [BUGFIX] Fixed "Instant queries / sec" in "Cortex / Reads" dashboard. #445
 * [BUGFIX] Fixed and added missing KV store panels in Writes, Reads, Ruler and Compactor dashboards. #448
 * [BUGFIX] Fixed Alertmanager dashboard when alertmanager is running as part of single binary. #1064
+* [BUGFIX] Fixed Ruler dashboard when ruler is running as part of single binary. #1260
+* [BUGFIX] Query-frontend: fixed bad querier status code mapping with query-sharding enabled. #1227
 
 ### Jsonnet
 
@@ -809,6 +814,7 @@ _Changes since `grafana/cortex-jsonnet` `1.9.0`._
 * [CHANGE] Gossip.libsonnet has been fixed to modify all ring configurations, not only the ingester ring config. Furthermore it now supports migration via multi KV store. #1057 #1099
 * [CHANGE] Changed the default of `bucket_index_enabled` to `true`. #924
 * [CHANGE] Remove the support for the test-exporter. #1133
+* [CHANGE] Removed `$.distributor_deployment_labels`, `$.ingester_deployment_labels` and `$.querier_deployment_labels` fields, that were used by gossip.libsonnet to inject additional label. Now the label is injected directly into pods of statefulsets and deployments. #1297
 * [FEATURE] Added query sharding support. It can be enabled setting `cortex_query_sharding_enabled: true` in the `_config` object. #653
 * [FEATURE] Added shuffle-sharding support. It can be enabled and configured using the following config: #902
    ```

LICENSING.md

@@ -4,15 +4,9 @@ License names used in this document are as per [SPDX License List](https://spdx.
 
 The default license for this project is [AGPL-3.0-only](LICENSE).
 
-## Apache-2.0
+## Vendored code
 
-The following folders and their subfolders are licensed under Apache-2.0:
-
-```
-<none as of today>
-```
-
-The following directories and their subdirectories are under the original upstream licenses:
+The following directories and their subdirectories are under the original upstream licenses, all of them ship the entire license text they are under.
 
 ```
 vendor/

Makefile

@@ -58,13 +58,12 @@ MIXIN_OUT_PATH := operations/mimir-mixin-compiled
 JSONNET_MANIFESTS_PATH := operations/mimir
 
 # Doc templates in use
-DOC_TEMPLATES := docs/sources/configuration/reference-configuration-parameters.template \
-	docs/sources/operating-grafana-mimir/encrypt-data-at-rest.template
+DOC_TEMPLATES := docs/sources/configuration/reference-configuration-parameters.template
 
 # Documents to run through embedding
 DOC_EMBED := docs/sources/configuration/using-the-query-frontend-with-prometheus.md \
 	docs/sources/operating-grafana-mimir/mirror-requests-to-a-second-cluster.md \
-	docs/sources/guides/overrides-exporter.md \
+	docs/sources/architecture/overrides-exporter.md \
 	docs/sources/getting-started/_index.md \
 	operations/mimir/README.md
 

VERSION

@@ -1 +1 @@
-2.0.0-rc.0
+2.0.0-rc.1

cmd/mimir/help-all.txt.tmpl

@@ -988,7 +988,7 @@ Usage of ./cmd/mimir/mimir:
   -querier.dns-lookup-period duration
     	How often to query DNS for query-frontend or query-scheduler address. (default 10s)
   -querier.frontend-address string
-    	Address of the query-frontend component, in host:port format. If -querier.scheduler-address is set as well, the querier will use scheduler instead. Only one of -querier.frontend-address or -querier.scheduler-address can be set. If neither is set, queries are only received via HTTP endpoint.
+    	Address of the query-frontend component, in host:port format. Only one of -querier.frontend-address or -querier.scheduler-address can be set. If neither is set, queries are only received via HTTP endpoint.
   -querier.frontend-client.backoff-max-period duration
     	Maximum delay when backing off. (default 10s)
   -querier.frontend-client.backoff-min-period duration
@@ -1052,7 +1052,7 @@ Usage of ./cmd/mimir/mimir:
   -querier.query-store-after duration
     	The time after which a metric should be queried from storage and not just ingesters. 0 means all queries are sent to store. If this option is enabled, the time range of the query sent to the store-gateway will be manipulated to ensure the query end is not more recent than 'now - query-store-after'.
   -querier.scheduler-address string
-    	Hostname (and port) of scheduler that querier will periodically resolve, connect to and receive queries from. Only one of -querier.frontend-address or -querier.scheduler-address can be set. If neither is set, queries are only received via HTTP endpoint.
+    	Address of the query-scheduler component, in host:port format. Only one of -querier.frontend-address or -querier.scheduler-address can be set. If neither is set, queries are only received via HTTP endpoint.
   -querier.shuffle-sharding-ingesters-lookback-period duration
     	When distributor's sharding strategy is shuffle-sharding and this setting is > 0, queriers fetch in-memory series from the minimum set of required ingesters, selecting only ingesters which may have received series since 'now - lookback period'. The lookback period should be greater or equal than the configured -querier.query-store-after and -querier.query-ingesters-within. If this setting is 0, queriers always query all ingesters (ingesters shuffle sharding on read path is disabled).
   -querier.store-gateway-client.tls-ca-path string
@@ -1596,7 +1596,7 @@ Usage of ./cmd/mimir/mimir:
   -tenant-federation.enabled
     	If enabled on all services, queries can be federated across multiple tenants. The tenant IDs involved need to be specified separated by a '|' character in the 'X-Scope-OrgID' header.
   -validation.create-grace-period value
-    	Duration which table will be created/deleted before/after it's needed; we won't accept sample from before this time. (default 10m)
+    	Controls how far into the future incoming samples are accepted compared to the wall clock. Any sample with timestamp `t` will be rejected if `t > (now + validation.create-grace-period)`. (default 10m)
   -validation.enforce-metadata-metric-name
     	Enforce every metadata has a metric name. (default true)
   -validation.max-label-names-per-series int

cmd/mimir/help.txt.tmpl

@@ -245,10 +245,6 @@ Usage of ./cmd/mimir/mimir:
     	Per-tenant ingestion rate limit in samples per second. (default 10000)
   -distributor.ingestion-tenant-shard-size int
     	The tenant's shard size used by shuffle-sharding. Must be set both on ingesters and distributors. 0 disables shuffle sharding.
-  -distributor.instance-limits.max-inflight-push-requests int
-    	Max inflight push requests that this distributor can handle. This limit is per-distributor, not per-tenant. Additional requests will be rejected. 0 = unlimited. (default 2000)
-  -distributor.instance-limits.max-ingestion-rate float
-    	Max ingestion rate (samples/sec) that this distributor will accept. This limit is per-distributor, not per-tenant. Additional push requests will be rejected. Current ingestion rate is computed as exponentially weighted moving average, updated every second. 0 = unlimited.
   -distributor.ring.consul.hostname string
     	Hostname and port of Consul. (default "localhost:8500")
   -distributor.ring.etcd.endpoints value
@@ -314,7 +310,7 @@ Usage of ./cmd/mimir/mimir:
   -querier.cardinality-analysis-enabled
     	Enables endpoints used for cardinality analysis.
   -querier.frontend-address string
-    	Address of the query-frontend component, in host:port format. If -querier.scheduler-address is set as well, the querier will use scheduler instead. Only one of -querier.frontend-address or -querier.scheduler-address can be set. If neither is set, queries are only received via HTTP endpoint.
+    	Address of the query-frontend component, in host:port format. Only one of -querier.frontend-address or -querier.scheduler-address can be set. If neither is set, queries are only received via HTTP endpoint.
   -querier.label-names-and-values-results-max-size-bytes int
     	Maximum size in bytes of distinct label names and values. When querier receives response from ingester, it merges the response with responses from other ingesters. This maximum size limit is applied to the merged(distinct) results. If the limit is reached, an error is returned. (default 419430400)
   -querier.label-values-max-cardinality-label-names-per-request int
@@ -338,7 +334,7 @@ Usage of ./cmd/mimir/mimir:
   -querier.query-store-after duration
     	The time after which a metric should be queried from storage and not just ingesters. 0 means all queries are sent to store. If this option is enabled, the time range of the query sent to the store-gateway will be manipulated to ensure the query end is not more recent than 'now - query-store-after'.
   -querier.scheduler-address string
-    	Hostname (and port) of scheduler that querier will periodically resolve, connect to and receive queries from. Only one of -querier.frontend-address or -querier.scheduler-address can be set. If neither is set, queries are only received via HTTP endpoint.
+    	Address of the query-scheduler component, in host:port format. Only one of -querier.frontend-address or -querier.scheduler-address can be set. If neither is set, queries are only received via HTTP endpoint.
   -querier.timeout duration
     	The timeout for a query. This config option should be set on query-frontend too when query sharding is enabled. (default 2m0s)
   -query-frontend.align-querier-with-step