File tree 6 files changed +430
-415
lines changed
6 files changed +430
-415
lines changed Original file line number Diff line number Diff line change 24
24
run : make --always-make vale && git diff --exit-code
25
25
- name : Jsonnet linter
26
26
run : make --always-make jsonnet-lint
27
+ - name : YAML linter (Pint)
28
+ run : make --always-make pint-lint
27
29
- name : Unit tests
28
30
run : make --always-make test
29
31
Original file line number Diff line number Diff line change @@ -10,7 +10,8 @@ MD_FILES = $(shell find . \( -type d -name '.vale' -o -type d -name 'vendor' \)
10
10
MARKDOWNFMT_BIN =$(BIN_DIR ) /markdownfmt
11
11
VALE_BIN =$(BIN_DIR ) /vale
12
12
PROMTOOL_BIN =$(BIN_DIR ) /promtool
13
- TOOLING =$(JB_BIN ) $(JSONNETLINT_BIN ) $(JSONNET_BIN ) $(JSONNETFMT_BIN ) $(PROMTOOL_BIN ) $(GRAFANA_DASHBOARD_LINTER_BIN ) $(MARKDOWNFMT_BIN ) $(VALE_BIN )
13
+ PINT_BIN =$(BIN_DIR ) /pint
14
+ TOOLING =$(JB_BIN ) $(JSONNETLINT_BIN ) $(JSONNET_BIN ) $(JSONNETFMT_BIN ) $(PROMTOOL_BIN ) $(GRAFANA_DASHBOARD_LINTER_BIN ) $(MARKDOWNFMT_BIN ) $(VALE_BIN ) $(PINT_BIN )
14
15
JSONNETFMT_ARGS =-n 2 --max-blank-lines 2 --string-style s --comment-style s
15
16
SRC_DIR ?=dashboards
16
17
OUT_DIR ?=dashboards_out
@@ -44,7 +45,7 @@ $(OUT_DIR): $(JSONNET_BIN) $(JSONNET_VENDOR) mixin.libsonnet lib/dashboards.json
44
45
@$(JSONNET_BIN ) -J vendor -m $(OUT_DIR ) lib/dashboards.jsonnet
45
46
46
47
.PHONY : lint
47
- lint : jsonnet-lint alerts-lint dashboards-lint vale
48
+ lint : jsonnet-lint alerts-lint dashboards-lint vale pint-lint
48
49
49
50
.PHONY : jsonnet-lint
50
51
jsonnet-lint : $(JSONNETLINT_BIN ) $(JSONNET_VENDOR )
@@ -67,10 +68,18 @@ dashboards-lint: $(GRAFANA_DASHBOARD_LINTER_BIN) $(OUT_DIR)/.lint
67
68
68
69
.PHONY : vale
69
70
vale : $(VALE_BIN )
70
- @echo $(MD_FILES )
71
71
@$(VALE_BIN ) sync && \
72
72
$(VALE_BIN ) $(MD_FILES )
73
73
74
+ .PHONY : pint-lint
75
+ pint-lint : generate $(PINT_BIN )
76
+ @# Pint will not exit with a non-zero status code if there are linting issues.
77
+ @output=$$($(PINT_BIN ) -n -o -l WARN lint prometheus_alerts.yaml prometheus_rules.yaml 2>&1) ; \
78
+ if [ -n " $$ output" ]; then \
79
+ echo " \n$$ output" ; \
80
+ exit 1; \
81
+ fi
82
+
74
83
.PHONY : clean
75
84
clean :
76
85
# Remove all files and directories ignored by git.
Original file line number Diff line number Diff line change 143
143
{
144
144
expr: |||
145
145
(
146
- max without (revision ) (
146
+ max by(namespace, statefulset ) (
147
147
kube_statefulset_status_current_revision{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s}
148
148
unless
149
149
kube_statefulset_status_update_revision{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s}
You can’t perform that action at this time.
0 commit comments