Merge pull request #201 from stackrox/master

sync: master to stage

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[**/*.json]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitattributes

@@ -1,4 +1,5 @@
 resources/mixins/kubernetes/generated/** linguist-generated=true
+resources/grafana/generated/** linguist-generated=true
 resources/grafana/mixins/** linguist-generated=true
 resources/prometheus/kubernetes-mixin-alerts.yaml linguist-generated=true
 resources/prometheus/kubernetes-mixin-rules.yaml linguist-generated=true

.github/workflows/main.yml

@@ -19,4 +19,4 @@ jobs:
           tar -zxf /tmp/promtool --strip-components=1 --directory /usr/local/bin &> /dev/null
       - name: Patch PATH to include GOBIN
         run: echo "PATH=$(echo $PATH):/home/runner/go/bin" >> $GITHUB_ENV
-      - uses: pre-commit/action@v3.0.0
+      - uses: pre-commit/action@v3.0.1

.pre-commit-config.yaml

@@ -10,6 +10,11 @@ repos:
       - id: check-json
         files: resources/index.json
       - id: end-of-file-fixer
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.1.0
+    hooks:
+      - id: prettier
+        types_or: [json]
   - repo: local
     hooks:
       - id: make-generate

.prettierignore

@@ -0,0 +1,5 @@
+resources/mixins/kubernetes/generated/**
+resources/grafana/generated/**
+resources/grafana/mixins/**
+resources/prometheus/kubernetes-mixin-alerts.yaml
+resources/prometheus/kubernetes-mixin-rules.yaml