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

Merge main into dimitar/store-gateway-async-series #3642

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5e8ca1a
Remove "Inflight requests" from object store panels (#3521)
pracucci Nov 28, 2022
e352ecb
Improve networking panels to work with read write deployment mode (#3…
pracucci Nov 28, 2022
62370a6
Refactoring: simplified dashboards resources and networking panels ut…
pracucci Nov 28, 2022
54344f2
Hide TSDB block ranges period config from doc and mark it experimenta…
pracucci Nov 28, 2022
3744cb5
[otlp] Fix panic in dropped count (again!) (#3538)
gouthamve Nov 28, 2022
e9c3745
update screenshots (#3553)
replay Nov 29, 2022
db0622c
add missing entries and release section to changelog in preparation f…
replay Nov 29, 2022
b1b50cd
Revert "add missing entries and release section to changelog in prepa…
replay Nov 29, 2022
23659dd
Revert "update screenshots (#3553)"
replay Nov 29, 2022
4fcf6fd
Revert "[otlp] Fix panic in dropped count (again!) (#3538)"
replay Nov 29, 2022
135f8d3
Revert "Hide TSDB block ranges period config from doc and mark it exp…
replay Nov 29, 2022
0f46d0d
Revert "Refactoring: simplified dashboards resources and networking p…
replay Nov 29, 2022
41186e8
Revert "Improve networking panels to work with read write deployment …
replay Nov 29, 2022
1558669
Revert "Remove "Inflight requests" from object store panels (#3521)"
replay Nov 29, 2022
45a033c
Remove "Inflight requests" from object store panels (#3521) (#3573)
grafanabot Nov 29, 2022
1ca7d50
[release-2.5] Improve networking panels to work with read write deplo…
grafanabot Nov 29, 2022
1c8fffc
Refactoring: simplified dashboards resources and networking panels ut…
grafanabot Nov 29, 2022
e675af1
Hide TSDB block ranges period config from doc and mark it experimenta…
grafanabot Nov 29, 2022
d672e4a
[otlp] Fix panic in dropped count (again!) (#3538) (#3576)
grafanabot Nov 29, 2022
ec92698
[release-2.5] Update dashboard screenshots in docs (#3577)
grafanabot Nov 29, 2022
fa68bd7
[release-2.5] add missing entries and release section to changelog in…
replay Nov 29, 2022
cbb8a54
[release 2.5] mark version in changelog as rc (#3581)
replay Nov 29, 2022
2d7e6fb
Publish release 2.5.0-rc.0 (#3583)
replay Nov 29, 2022
67639ae
Merge release-2.5 branch to main
replay Dec 1, 2022
7576f30
Merge pull request #3607 from grafana/merge-release-2.5-to-main
replay Dec 1, 2022
70d133c
Switch linter from golint to revive and clean up newly found issues (…
56quarters Dec 1, 2022
6fd7ca6
Fix "unsupported value type" logged when calling /ready and some serv…
charleskorn Dec 2, 2022
569f24f
store-gateway: Fix documentation comments on proto implementations. (…
aknuds1 Dec 2, 2022
82b38ca
Ingester: Simplify code a bit (#3610)
aknuds1 Dec 2, 2022
2dde45d
store-gateway: add iterators for seriesChunks and seriesChunkRefs (#3…
dimitarvdimitrov Dec 2, 2022
c08efd3
Update rollout-operator to v0.2.0 (#3624)
andyasp Dec 5, 2022
cc85ddf
Refactoring: remove mutex from bucketChunkReader (#3606)
pracucci Dec 5, 2022
a611b66
alerts: Fix MimirCompactorSkippedBlocksWithOutOfOrderChunks (#3628)
jhesketh Dec 5, 2022
753225f
Remove Mimir implementations of "Fingerprint" functions. (#3638)
bboreham Dec 5, 2022
a697fa6
Distributor validation: stop checking series have sorted labels (#3640)
bboreham Dec 5, 2022
92ef571
Merge branch 'main' into dimitar/store-gateway-async-series-merge-main
dimitarvdimitrov Dec 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ output:
linters:
enable:
- goimports
- golint
- revive
- gofmt
- misspell
- errorlint
Expand Down
18 changes: 17 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
# Changelog

## Grafana Mimir - main / unreleased
## main / unreleased

### Grafana Mimir

* [ENHANCEMENT] Ruler: Added `-ruler.alertmanager-client.tls-enabled` configuration for alertmanager client. #3432 #3597
* [ENHANCEMENT] Activity tracker logs now have `component=activity-tracker` label. #3556
* [BUGFIX] Log the names of services that are not yet running rather than `unsupported value type` when calling `/ready` and some services are not running. #3625

### Mixin
* [BUGFIX] Alerts: Fixed `MimirCompactorSkippedBlocksWithOutOfOrderChunks` matching on non-existent label. #3628

### Jsonnet

* [ENHANCEMENT] Update `rollout-operator` to `v0.2.0`. #3624

### Mimirtool

### Documentation

### Tools

## 2.5.0-rc.0

Expand Down
2 changes: 1 addition & 1 deletion integration/ruler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func TestRulerEvaluationDelay(t *testing.T) {
now := time.Now()

// Generate series that includes stale nans
var samplesToSend int = 10
var samplesToSend = 10
series := prompb.TimeSeries{
Labels: []prompb.Label{
{Name: "__name__", Value: "a_sometimes_stale_nan_series"},
Expand Down
2 changes: 1 addition & 1 deletion mimir-build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN GO111MODULE=on \
go install github.com/mikefarah/yq/v4@v4.13.4 && \
go install github.com/google/go-jsonnet/cmd/jsonnetfmt@v0.17.0 && \
go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.8.1 && \
go install github.com/open-policy-agent/conftest@v0.33.2 && \
go install github.com/open-policy-agent/conftest@v0.33.2 && \
rm -rf /go/pkg /go/src /root/.cache

COPY --from=helm /usr/bin/helm /usr/bin/helm
Expand Down
4 changes: 4 additions & 0 deletions operations/helm/charts/mimir-distributed/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ Entries should include a reference to the Pull Request that introduced the chang

## main / unreleased

* [ENHANCEMENT] Update the `rollout-operator` subchart to `0.2.0`. #3624

## 4.0.0

* [FEATURE] Support deploying NGINX via the `gateway` section. The `nginx` section will be removed in `7.0.0`. See
[Migrate to using the unified proxy deployment for NGINX and GEM gateway](https://grafana.com/docs/mimir/latest/operators-guide/deploying-grafana-mimir/migrate-to-unified-gateway-deployment/)
* [CHANGE] **breaking change** **Data loss without action.** Enables [zone-aware replication](https://grafana.com/docs/mimir/latest/operators-guide/configure/configure-zone-aware-replication/) for ingesters and store-gateways by default. #2778
Expand Down
6 changes: 3 additions & 3 deletions operations/helm/charts/mimir-distributed/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ dependencies:
version: 0.2.8
- name: rollout-operator
repository: https://grafana.github.io/helm-charts
version: 0.1.2
digest: sha256:bd2afb79872f86127981317d755ecee315670ffb5a314e3f388a9d4f69779e91
generated: "2022-11-07T13:06:40.663397+01:00"
version: 0.2.0
digest: sha256:7722b6a707f7990e41c6724bfdaa102e2a590d0f32faa1e3751f268e417ed4a1
generated: "2022-12-01T17:11:57.722504-05:00"
2 changes: 1 addition & 1 deletion operations/helm/charts/mimir-distributed/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ dependencies:
- name: rollout-operator
alias: rollout_operator
repository: https://grafana.github.io/helm-charts
version: 0.1.2
version: 0.2.0
condition: rollout_operator.enabled
2 changes: 1 addition & 1 deletion operations/helm/charts/mimir-distributed/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Kubernetes: `^1.20.0-0`
|------------|------|---------|
| https://charts.min.io/ | minio(minio) | 5.0.0 |
| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.2.8 |
| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.1.2 |
| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.2.0 |

## Dependencies

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: gateway-enterprise-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: gateway-enterprise-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -34,7 +34,7 @@ spec:
- name: rollout-operator
securityContext:
{}
image: "grafana/rollout-operator:v0.1.1"
image: "grafana/rollout-operator:v0.2.0"
imagePullPolicy: IfNotPresent
args:
- -kubernetes.namespace=citestns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: gateway-enterprise-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: gateway-enterprise-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: gateway-nginx-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: gateway-nginx-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -34,7 +34,7 @@ spec:
- name: rollout-operator
securityContext:
{}
image: "grafana/rollout-operator:v0.1.1"
image: "grafana/rollout-operator:v0.2.0"
imagePullPolicy: IfNotPresent
args:
- -kubernetes.namespace=citestns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: gateway-nginx-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: gateway-nginx-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: large-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: large-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -34,7 +34,7 @@ spec:
- name: rollout-operator
securityContext:
{}
image: "grafana/rollout-operator:v0.1.1"
image: "grafana/rollout-operator:v0.2.0"
imagePullPolicy: IfNotPresent
args:
- -kubernetes.namespace=citestns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: large-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: large-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: scheduler-name-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: scheduler-name-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -34,7 +34,7 @@ spec:
- name: rollout-operator
securityContext:
{}
image: "grafana/rollout-operator:v0.1.1"
image: "grafana/rollout-operator:v0.2.0"
imagePullPolicy: IfNotPresent
args:
- -kubernetes.namespace=citestns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: scheduler-name-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: scheduler-name-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: small-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: small-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -34,7 +34,7 @@ spec:
- name: rollout-operator
securityContext:
{}
image: "grafana/rollout-operator:v0.1.1"
image: "grafana/rollout-operator:v0.2.0"
imagePullPolicy: IfNotPresent
args:
- -kubernetes.namespace=citestns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: small-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: small-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: test-enterprise-k8s-1.25-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: test-enterprise-k8s-1.25-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -34,7 +34,7 @@ spec:
- name: rollout-operator
securityContext:
{}
image: "grafana/rollout-operator:v0.1.1"
image: "grafana/rollout-operator:v0.2.0"
imagePullPolicy: IfNotPresent
args:
- -kubernetes.namespace=citestns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: test-enterprise-k8s-1.25-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: test-enterprise-k8s-1.25-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: test-enterprise-legacy-label-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: test-enterprise-legacy-label-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -34,7 +34,7 @@ spec:
- name: rollout-operator
securityContext:
{}
image: "grafana/rollout-operator:v0.1.1"
image: "grafana/rollout-operator:v0.2.0"
imagePullPolicy: IfNotPresent
args:
- -kubernetes.namespace=citestns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: test-enterprise-legacy-label-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: test-enterprise-legacy-label-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: test-enterprise-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: test-enterprise-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -34,7 +34,7 @@ spec:
- name: rollout-operator
securityContext:
{}
image: "grafana/rollout-operator:v0.1.1"
image: "grafana/rollout-operator:v0.2.0"
imagePullPolicy: IfNotPresent
args:
- -kubernetes.namespace=citestns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: test-enterprise-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: test-enterprise-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: test-oss-k8s-1.25-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: test-oss-k8s-1.25-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -34,7 +34,7 @@ spec:
- name: rollout-operator
securityContext:
{}
image: "grafana/rollout-operator:v0.1.1"
image: "grafana/rollout-operator:v0.2.0"
imagePullPolicy: IfNotPresent
args:
- -kubernetes.namespace=citestns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: test-oss-k8s-1.25-values-rollout-operator
labels:
helm.sh/chart: rollout-operator-0.1.2
helm.sh/chart: rollout-operator-0.2.0
app.kubernetes.io/name: rollout-operator
app.kubernetes.io/instance: test-oss-k8s-1.25-values
app.kubernetes.io/version: "v0.1.1"
app.kubernetes.io/version: "v0.2.0"
app.kubernetes.io/managed-by: Helm
Loading