grafana
diff --git a/‎.github/workflows/test-build-deploy.yml‎
Lines changed: 5 additions & 3 deletions b/‎.github/workflows/test-build-deploy.yml‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎Makefile‎
Lines changed: 35 additions & 2 deletions b/‎Makefile‎
Lines changed: 35 additions & 2 deletions
diff --git a/‎mimir-build-image/Dockerfile‎
Lines changed: 14 additions & 10 deletions b/‎mimir-build-image/Dockerfile‎
Lines changed: 14 additions & 10 deletions
diff --git a/‎operations/mimir-mixin/.gitignore‎
Lines changed: 3 additions & 0 deletions b/‎operations/mimir-mixin/.gitignore‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎operations/mimir-mixin/README.md‎
Lines changed: 18 additions & 0 deletions b/‎operations/mimir-mixin/README.md‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎operations/mimir-mixin/alerts.libsonnet‎
Lines changed: 13 additions & 0 deletions b/‎operations/mimir-mixin/alerts.libsonnet‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎operations/mimir-mixin/alerts/alertmanager.libsonnet‎
Lines changed: 98 additions & 0 deletions b/‎operations/mimir-mixin/alerts/alertmanager.libsonnet‎
Lines changed: 98 additions & 0 deletions
@@ -10,7 +10,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     container:
-      image: us.gcr.io/kubernetes-dev/mimir-build-image:add-prettier-08d2e2a61
+      image: us.gcr.io/kubernetes-dev/mimir-build-image:20211018_import-cortex-mixin-e7b4eab3c
       credentials:
         username: _json_key
         password: ${{ secrets.gcr_json_key }}
@@ -36,6 +36,8 @@ jobs:
         run: make BUILD_IN_CONTAINER=false check-protos
       - name: Check Generated Documentation
         run: make BUILD_IN_CONTAINER=false check-doc
+      - name: Check Mixin
+        run: make BUILD_IN_CONTAINER=false check-mixin
       - name: Check White Noise.
         run: make BUILD_IN_CONTAINER=false check-white-noise
       - name: Check License Header
@@ -44,7 +46,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     container:
-      image: us.gcr.io/kubernetes-dev/mimir-build-image:add-prettier-08d2e2a61
+      image: us.gcr.io/kubernetes-dev/mimir-build-image:20211018_import-cortex-mixin-e7b4eab3c
       credentials:
         username: _json_key
         password: ${{ secrets.gcr_json_key }}
@@ -68,7 +70,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: us.gcr.io/kubernetes-dev/mimir-build-image:add-prettier-08d2e2a61
+      image: us.gcr.io/kubernetes-dev/mimir-build-image:20211018_import-cortex-mixin-e7b4eab3c
       credentials:
         username: _json_key
         password: ${{ secrets.gcr_json_key }}
 
@@ -2,7 +2,7 @@
 # WARNING: do not commit to a repository!
 -include Makefile.local
 
-.PHONY: all test integration-tests cover clean images protos exes dist doc clean-doc check-doc push-multiarch-build-image license check-license format
+.PHONY: all test integration-tests cover clean images protos exes dist doc clean-doc check-doc push-multiarch-build-image license check-license format check-mixin check-mixin-jb check-mixin-mixtool checkin-mixin-playbook build-mixin format-mixin
 .DEFAULT_GOAL := all
 
 # Version number
@@ -25,6 +25,12 @@ GIT_REVISION := $(shell git rev-parse --short HEAD)
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 UPTODATE := .uptodate
 
+# path to jsonnetfmt
+JSONNET_FMT := jsonnetfmt
+
+# path to the mimir/mixin
+MIXIN_PATH := operations/mimir-mixin
+
 .PHONY: image-tag
 image-tag:
 	@echo $(IMAGE_TAG)
@@ -120,7 +126,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 ?= add-prettier-08d2e2a61
+LATEST_BUILD_IMAGE_TAG ?= 20211018_import-cortex-mixin-e7b4eab3c
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden
@@ -314,6 +320,33 @@ clean-white-noise:
 check-white-noise: clean-white-noise
 	@git diff --exit-code --quiet -- '*.md' || (echo "Please remove trailing whitespaces running 'make clean-white-noise'" && false)
 
+check-mixin: format-mixin check-mixin-jb check-mixin-mixtool check-mixin-playbook
+	@git diff --exit-code --quiet -- $(MIXIN_PATH) || (echo "Please format mixin by running 'make format-mixin'" && false)
+
+	@cd $(MIXIN_PATH) && \
+	jb install && \
+	mixtool lint mixin.libsonnet
+
+check-mixin-jb:
+	@cd $(MIXIN_PATH) && \
+	jb install
+
+check-mixin-mixtool: check-mixin-jb
+	@cd $(MIXIN_PATH) && \
+	mixtool lint mixin.libsonnet
+
+check-mixin-playbook: build-mixin
+	@$(MIXIN_PATH)/scripts/lint-playbooks.sh
+
+build-mixin: check-mixin-jb
+	@rm -rf $(MIXIN_PATH)/out && mkdir $(MIXIN_PATH)/out
+	@cd $(MIXIN_PATH) && \
+	mixtool generate all --output-alerts out/alerts.yaml --output-rules out/rules.yaml --directory out/dashboards mixin.libsonnet && \
+	zip -q -r mimir-mixin.zip out
+
+format-mixin:
+	@find $(MIXIN_PATH) -type f -name '*.libsonnet' -print -o -name '*.jsonnet' -print | xargs jsonnetfmt -i
+
 web-serve:
 	cd website && hugo --config config.toml --minify -v server
 
 
@@ -6,7 +6,7 @@
 FROM golang:1.16.6-buster
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
-RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev shellcheck && \
+RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq zip unzip protobuf-compiler libprotobuf-dev shellcheck && \
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN go get -u golang.org/x/tools/cmd/goimports@3fce476f0a782aeb5034d592c189e63be4ba6c9e
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
@@ -36,15 +36,19 @@ RUN GOARCH=$(go env GOARCH) && \
 
 RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.27.0
 
-RUN GO111MODULE=on go get \
-		github.com/client9/misspell/cmd/[email protected] \
-		github.com/golang/protobuf/[email protected] \
-		github.com/gogo/protobuf/[email protected] \
-		github.com/gogo/protobuf/[email protected] \
-		github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 \
-		github.com/fatih/[email protected] \
-		github.com/campoy/[email protected] \
-	&& rm -rf /go/pkg /go/src /root/.cache
+RUN GO111MODULE=on \
+	go get github.com/client9/misspell/cmd/[email protected] && \
+	go get github.com/golang/protobuf/[email protected] && \
+	go get github.com/gogo/protobuf/[email protected] && \
+	go get github.com/gogo/protobuf/[email protected] && \
+	go get github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 && \
+	go get github.com/fatih/[email protected] && \
+	go get github.com/campoy/[email protected] && \
+	go get github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected] && \
+	go get github.com/monitoring-mixins/mixtool/cmd/mixtool@bca3066 && \
+	go get github.com/mikefarah/yq/[email protected] && \
+	go get github.com/google/go-jsonnet/cmd/[email protected] && \
+	rm -rf /go/pkg /go/src /root/.cache
 
 ENV NODE_PATH=/usr/lib/node_modules
 COPY build.sh /
 
@@ -0,0 +1,3 @@
+/out/
+/vendor/
+/mimir-mixin.zip
@@ -0,0 +1,18 @@
+# Monitoring for Mimir
+
+To generate the Grafana dashboards and Prometheus alerts for Mimir:
+
+## Usage
+
+```console
+$ GO111MODULE=on go get github.com/monitoring-mixins/mixtool/cmd/mixtool
+$ GO111MODULE=on go get github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
+$ git clone https://github.com/grafana/mimir.git
+$ make build-mixin
+```
+
+This will leave all the alerts and dashboards in jsonnet/mimir-mixin/mimir-mixin.zip (or jsonnet/mimir-mixin/out).
+
+## Known Problems
+
+If you get an error like `cannot use cli.StringSliceFlag literal (type cli.StringSliceFlag) as type cli.Flag in slice literal` when installing [mixtool](https://github.com/monitoring-mixins/mixtool/issues/27), make sure you set `GO111MODULE=on` before `go get`.
@@ -0,0 +1,13 @@
+{
+  prometheusAlerts+::
+    (import 'alerts/alerts.libsonnet') +
+    (import 'alerts/alertmanager.libsonnet') +
+
+    (if std.member($._config.storage_engine, 'blocks')
+     then
+       (import 'alerts/blocks.libsonnet') +
+       (import 'alerts/compactor.libsonnet')
+     else {}) +
+
+    { _config:: $._config + $._group_config },
+}
@@ -0,0 +1,98 @@
+{
+  groups+: [
+    {
+      name: 'alertmanager_alerts',
+      rules: [
+        {
+          alert: 'CortexAlertmanagerSyncConfigsFailing',
+          expr: |||
+            rate(cortex_alertmanager_sync_configs_failed_total[5m]) > 0
+          |||,
+          'for': '30m',
+          labels: {
+            severity: 'critical',
+          },
+          annotations: {
+            message: |||
+              Cortex Alertmanager {{ $labels.job }}/{{ $labels.instance }} is failing to read tenant configurations from storage.
+            |||,
+          },
+        },
+        {
+          alert: 'CortexAlertmanagerRingCheckFailing',
+          expr: |||
+            rate(cortex_alertmanager_ring_check_errors_total[2m]) > 0
+          |||,
+          'for': '10m',
+          labels: {
+            severity: 'critical',
+          },
+          annotations: {
+            message: |||
+              Cortex Alertmanager {{ $labels.job }}/{{ $labels.instance }} is unable to check tenants ownership via the ring.
+            |||,
+          },
+        },
+        {
+          alert: 'CortexAlertmanagerPartialStateMergeFailing',
+          expr: |||
+            rate(cortex_alertmanager_partial_state_merges_failed_total[2m]) > 0
+          |||,
+          'for': '10m',
+          labels: {
+            severity: 'critical',
+          },
+          annotations: {
+            message: |||
+              Cortex Alertmanager {{ $labels.job }}/{{ $labels.instance }} is failing to merge partial state changes received from a replica.
+            |||,
+          },
+        },
+        {
+          alert: 'CortexAlertmanagerReplicationFailing',
+          expr: |||
+            rate(cortex_alertmanager_state_replication_failed_total[2m]) > 0
+          |||,
+          'for': '10m',
+          labels: {
+            severity: 'critical',
+          },
+          annotations: {
+            message: |||
+              Cortex Alertmanager {{ $labels.job }}/{{ $labels.instance }} is failing to replicating partial state to its replicas.
+            |||,
+          },
+        },
+        {
+          alert: 'CortexAlertmanagerPersistStateFailing',
+          expr: |||
+            rate(cortex_alertmanager_state_persist_failed_total[15m]) > 0
+          |||,
+          'for': '1h',
+          labels: {
+            severity: 'critical',
+          },
+          annotations: {
+            message: |||
+              Cortex Alertmanager {{ $labels.job }}/{{ $labels.instance }} is unable to persist full state snaphots to remote storage.
+            |||,
+          },
+        },
+        {
+          alert: 'CortexAlertmanagerInitialSyncFailed',
+          expr: |||
+            increase(cortex_alertmanager_state_initial_sync_completed_total{outcome="failed"}[1m]) > 0
+          |||,
+          labels: {
+            severity: 'critical',
+          },
+          annotations: {
+            message: |||
+              Cortex Alertmanager {{ $labels.job }}/{{ $labels.instance }} was unable to obtain some initial state when starting up.
+            |||,
+          },
+        },
+      ],
+    },
+  ],
+}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/out/`
	`2`	`+/vendor/`
	`3`	`+/mimir-mixin.zip`