From 18b187a95b7d85f7e4639bbf6eb458d1c68a2253 Mon Sep 17 00:00:00 2001 From: Duologic Date: Fri, 16 Feb 2024 20:42:45 +0100 Subject: [PATCH] fix(ci): add exclusions in .lint file --- .lint | 4 ++++ Makefile | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.lint b/.lint index 4b011924c..483054309 100644 --- a/.lint +++ b/.lint @@ -1,3 +1,7 @@ exclusions: template-job-rule: panel-job-instance-rule: + template-datasource-rule: + reason: CI failing because label has different caps, this was changed in grafana-builder + panel-datasource-rule: + reason: The new Grafonnet promotes the use of datasources at the query level. This should probably end up in the linter as a valid option. diff --git a/Makefile b/Makefile index ddd4be366..f88facaa5 100644 --- a/Makefile +++ b/Makefile @@ -57,8 +57,6 @@ $(OUT_DIR)/.lint: $(OUT_DIR) dashboards-lint: $(GRAFANA_DASHBOARD_LINTER_BIN) $(OUT_DIR)/.lint # Replace $$interval:$$resolution var with $$__rate_interval to make dashboard-linter happy. @sed -i -e 's/$$interval:$$resolution/$$__rate_interval/g' $(OUT_DIR)/*.json - # Replace 'Data source' label with 'Data Source' to make dashboard-linter happy. - @sed -i -e 's/Data source/Data Source/g' $(OUT_DIR)/*.json @find $(OUT_DIR) -name '*.json' -print0 | xargs -n 1 -0 $(GRAFANA_DASHBOARD_LINTER_BIN) lint --strict