Skip to content

Commit

Permalink
Update mixtool in mimir-build-image (#8032)
Browse files Browse the repository at this point in the history
* Configure linter exclusions

Signed-off-by: Marco Pracucci <[email protected]>

* Update build image version to pr8032-d6540935d8

* Trigger CI

Signed-off-by: Marco Pracucci <[email protected]>

* Updated Helm

Signed-off-by: Marco Pracucci <[email protected]>

---------

Signed-off-by: Marco Pracucci <[email protected]>
Co-authored-by: pracucci <[email protected]>
  • Loading branch information
pracucci and pracucci authored May 3, 2024
1 parent 3bcc9e8 commit 04f1447
Show file tree
Hide file tree
Showing 9 changed files with 4,362 additions and 4,654 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/*
# All the boiler plate for building golang follows:
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
BUILD_IN_CONTAINER ?= true
LATEST_BUILD_IMAGE_TAG ?= pr8030-cf783bf13c
LATEST_BUILD_IMAGE_TAG ?= pr8032-d6540935d8

# TTY is parameterized to allow Google Cloud Builder to run builds,
# as it currently disallows TTY devices. This value needs to be overridden
Expand Down
2 changes: 1 addition & 1 deletion mimir-build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN GO111MODULE=on \
go install github.com/fatih/[email protected] && \
go install github.com/campoy/[email protected] && \
go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected] && \
go install github.com/monitoring-mixins/mixtool/cmd/mixtool@bca3066 && \
go install github.com/monitoring-mixins/mixtool/cmd/mixtool@779c8b3 && \
go install github.com/mikefarah/yq/[email protected] && \
go install github.com/google/go-jsonnet/cmd/[email protected] && \
go install github.com/google/go-jsonnet/cmd/[email protected] && \
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2,049 changes: 999 additions & 1,050 deletions operations/mimir-mixin-compiled-baremetal/alerts.yaml

Large diffs are not rendered by default.

816 changes: 378 additions & 438 deletions operations/mimir-mixin-compiled-baremetal/rules.yaml

Large diffs are not rendered by default.

2,074 changes: 1,012 additions & 1,062 deletions operations/mimir-mixin-compiled/alerts.yaml

Large diffs are not rendered by default.

980 changes: 460 additions & 520 deletions operations/mimir-mixin-compiled/rules.yaml

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions operations/mimir-mixin/.lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
exclusions:
template-instance-rule:
reason: We don't use "instance" dashboard template variable.
target-instance-rule:
reason: We don't want to enforce "instance" selector in every query.
template-job-rule:
reason: We don't want to make "job" selector a dashboard template variable.
target-job-rule:
reason: We don't want to make "job" selector to be "$job" but we want to explicitly set the actual label matcher regexp.
target-rate-interval-rule:
reason: Some panels intentionally use an explicit time window instead of $__rate_interval.
entries:
- dashboard: Mimir / Top tenants
panel: Top $limit users by received samples rate in last 5m
- dashboard: Mimir / Top tenants
panel: Top $limit users by discarded samples rate in last 5m
- dashboard: Mimir / Top tenants
panel: Top $limit users by received exemplars rate in last 5m
target-promql-rule:
reason: Skipping in dashboards where the linter parses a Loki query as Prometheus one.
entries:
- dashboard: Mimir / Slow queries
template-datasource-rule:
reason: We prefer to keep calling "datasource" the Prometheus datasource to keep consistency between dashboards.
entries:
- dashboard: Mimir / Slow queries
panel-title-description-rule:
reason: We have many panels without description. This exclusion can be removed once we'll have added a description for each panel (if we'll ever do it).
template-on-time-change-reload-rule:
reason: We don't want to refresh "cluster" and "namespace" each time the time range changes, given we don't expect it to change frequently.
entries:
- variable: cluster
- variable: namespace
alert-summary-missing-rule:
reason: We don't set the summary on alerts.
alert-description-missing-rule:
reason: We don't set the description on alerts.
panel-units-rule:
reason: We have many panels without an unit defined. We should fix it but it's low priority.

0 comments on commit 04f1447

Please sign in to comment.