Merge pull request #152 from stackrox/master

sync: master to stage

README.md

@@ -41,6 +41,10 @@ To make changes to the rhacs dashboards:
 * Run `make generate` to generate the corresponding resources for the Grafana operator.
 
 To make changes to Kubernetes mixin resources:
+
+First, make sure you have `go-jsonnet` and `jsonnet-bundler` installed.
+
+Then:
 * Update `resources/mixins/kubernetes/mixin.libsonnet`.
 * Run `make generate` to generate the corresponding mixin resources.
 

resources/mixins/kubernetes/Makefile

@@ -1,5 +1,9 @@
 .PHONY: update
-update: update-jb generate
+update: install update-jb generate
+
+.PHONY: install
+install:
+	@jb install github.com/kubernetes-monitoring/kubernetes-mixin
 
 .PHONY: update-jb
 update-jb:
@@ -16,4 +20,4 @@ dashboards: templates/dashboards/*
 	@scripts/generate-dashboards.sh
 
 .PHONY: generate
-generate: alerts dashboards
+generate: install alerts dashboards