Merge pull request #4 from adinhodovic/refactor

style: Add linting and fix builds
adinhodovic · Feb 15, 2024 · 3733302 · 3733302
2 parents 990172d + f78c12f
commit 3733302
Show file tree

Hide file tree

Showing 12 changed files with 726 additions and 156 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,3 @@
----
 name: ci
 on:
   push:
@@ -8,7 +7,7 @@ on:
     branches:
       - main
 env:
-  golang-version: '1.17'
+  golang-version: "1.21"
 jobs:
   generate:
     runs-on: ubuntu-latest

diff --git a/.lint b/.lint
@@ -1,5 +1,13 @@
+---
 exclusions:
- template-job-rule:
- panel-job-instance-rule:
- target-rate-interval-rule:
- panel-datasource-rule:
+  template-job-rule:
+    reason: Jobs are set to multi in our case.
+  target-job-rule:
+    reason: Jobs are set to multi in our case.
+  template-instance-rule:
+    reason: We don't use instances.
+  panel-datasource-rule:
+    reason: Using a datasource for each panel.
+  panel-title-description-rule:
+    reason: TODO(adinhodovic)
+  target-instance-rule:
diff --git a/Makefile b/Makefile
@@ -55,9 +55,7 @@ $(OUT_DIR)/.lint: $(OUT_DIR)
 
 .PHONY: dashboards-lint
 dashboards-lint: $(GRAFANA_DASHBOARD_LINTER_BIN) $(OUT_DIR)/.lint
-	# Replace rates var with $$__rate_interval to make dashboard-linter happy.
-	@sed -i -e 's/7d/$$__rate_interval/g' $(OUT_DIR)/*.json
-	@find $(OUT_DIR) -name '*.json' -print0 | xargs -n 1 -0 $(GRAFANA_DASHBOARD_LINTER_BIN) lint --strict
+	@find $(OUT_DIR) -name '*.json' -print0 | xargs -n 1 -0 $(GRAFANA_DASHBOARD_LINTER_BIN) lint --strict --config .lint
 
 
 .PHONY: clean
@@ -74,5 +72,5 @@ $(BIN_DIR):
 
 $(TOOLING): $(BIN_DIR)
 	@echo Installing tools from hack/tools.go
-	@cd scripts && go list -mod=mod -e -tags tools -f '{{ range .Imports }}{{ printf "%s\n" .}}{{end}}' ./ | xargs -tI % go build -mod=mod -o $(BIN_DIR) %
+	@cd scripts && go list -e -mod=mod -e -tags tools -f '{{ range .Imports }}{{ printf "%s\n" .}}{{end}}' ./ | xargs -tI % go build -mod=mod -o $(BIN_DIR) %
 
diff --git a/dashboards/argo-cd-applications.libsonnet b/dashboards/argo-cd-applications.libsonnet
@@ -37,7 +37,7 @@ local tbOverride = tbStandardOptions.override;
         'datasource',
         'prometheus',
       ) +
-      datasource.generalOptions.withLabel('Data Source'),
+      datasource.generalOptions.withLabel('Data source'),
 
     local namespaceVariable =
       query.new(
@@ -286,9 +286,11 @@ local tbOverride = tbStandardOptions.override;
       tablePanel.new(
         'Applications Unhealthy',
       ) +
+      tbStandardOptions.withUnit('short') +
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
+      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -331,7 +333,8 @@ local tbOverride = tbStandardOptions.override;
             tbPanelOptions.link.withTitle('Go To Application') +
             tbPanelOptions.link.withUrl(
               $._config.argoCdUrl + '/applications/${__data.fields.Project}/${__value.raw}'
-            )
+            ) +
+            tbPanelOptions.link.withTargetBlank(true)
           )
         ),
         tbOverride.byName.new('health_status') +
@@ -355,9 +358,11 @@ local tbOverride = tbStandardOptions.override;
       tablePanel.new(
         'Applications Out Of Sync',
       ) +
+      tbStandardOptions.withUnit('short') +
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
+      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -400,7 +405,8 @@ local tbOverride = tbStandardOptions.override;
             tbPanelOptions.link.withTitle('Go To Application') +
             tbPanelOptions.link.withUrl(
               $._config.argoCdUrl + '/applications/${__data.fields.Project}/${__value.raw}'
-            )
+            ) +
+            tbPanelOptions.link.withTargetBlank(true)
           )
         ),
         tbOverride.byName.new('sync_status') +
@@ -428,9 +434,11 @@ local tbOverride = tbStandardOptions.override;
       tablePanel.new(
         'Applications That Failed to Sync[7d]',
       ) +
+      tbStandardOptions.withUnit('short') +
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
+      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -473,7 +481,8 @@ local tbOverride = tbStandardOptions.override;
             tbPanelOptions.link.withTitle('Go To Application') +
             tbPanelOptions.link.withUrl(
               $._config.argoCdUrl + '/applications/${__data.fields.Project}/${__value.raw}'
-            )
+            ) +
+            tbPanelOptions.link.withTargetBlank(true)
           )
         ),
         tbOverride.byName.new('Value') +
@@ -497,9 +506,11 @@ local tbOverride = tbStandardOptions.override;
       tablePanel.new(
         'Applications With Auto Sync Disabled',
       ) +
+      tbStandardOptions.withUnit('short') +
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
+      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -542,7 +553,8 @@ local tbOverride = tbStandardOptions.override;
             tbPanelOptions.link.withTitle('Go To Application') +
             tbPanelOptions.link.withUrl(
               $._config.argoCdUrl + '/applications/${__data.fields.Project}/${__value.raw}'
-            )
+            ) +
+            tbPanelOptions.link.withTargetBlank(true)
           )
         ),
         tbOverride.byName.new('autosync_enabled') +

diff --git a/dashboards/argo-cd-notifications.libsonnet b/dashboards/argo-cd-notifications.libsonnet
@@ -26,7 +26,7 @@ local tsLegend = tsOptions.legend;
         'datasource',
         'prometheus',
       ) +
-      datasource.generalOptions.withLabel('Data Source'),
+      datasource.generalOptions.withLabel('Data source'),
 
     local namespaceVariable =
       query.new(

diff --git a/dashboards/argo-cd-operational.libsonnet b/dashboards/argo-cd-operational.libsonnet
@@ -32,12 +32,12 @@ local tsLegend = tsOptions.legend;
 local tbOptions = tablePanel.options;
 local tbStandardOptions = tablePanel.standardOptions;
 local tbQueryOptions = tablePanel.queryOptions;
+local tbPanelOptions = tablePanel.panelOptions;
+local tbOverride = tbStandardOptions.override;
 
 // HeatmapPanel
 local hmStandardOptions = heatmapPanel.standardOptions;
-local tbPanelOptions = tablePanel.panelOptions;
 local hmQueryOptions = heatmapPanel.queryOptions;
-local tbOverride = tbStandardOptions.override;
 
 {
   grafanaDashboards+:: {
@@ -47,7 +47,7 @@ local tbOverride = tbStandardOptions.override;
         'datasource',
         'prometheus',
       ) +
-      datasource.generalOptions.withLabel('Data Source'),
+      datasource.generalOptions.withLabel('Data source'),
 
     local namespaceVariable =
       query.new(
@@ -130,6 +130,7 @@ local tbOverride = tbStandardOptions.override;
       statPanel.new(
         'Clusters',
       ) +
+      statPanel.standardOptions.withUnit('short') +
       statPanel.queryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -153,6 +154,7 @@ local tbOverride = tbStandardOptions.override;
       statPanel.new(
         'Repositories',
       ) +
+      statPanel.standardOptions.withUnit('short') +
       statPanel.queryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -172,6 +174,7 @@ local tbOverride = tbStandardOptions.override;
       statPanel.new(
         'Applications',
       ) +
+      statPanel.standardOptions.withUnit('short') +
       statPanel.queryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -283,9 +286,11 @@ local tbOverride = tbStandardOptions.override;
       tablePanel.new(
         'Applications',
       ) +
+      tbStandardOptions.withUnit('short') +
       tbOptions.withSortBy(
         tbOptions.sortBy.withDisplayName('Application')
       ) +
+      tbOptions.footer.TableFooterOptions.withEnablePagination(true) +
       tbQueryOptions.withTargets(
         prometheus.new(
           '$datasource',
@@ -331,7 +336,8 @@ local tbOverride = tbStandardOptions.override;
             tbPanelOptions.link.withType('dashboard') +
             tbPanelOptions.link.withUrl(
               '/d/%s/argocd-notifications-overview?&var-project=${__data.fields.Project}&var-application=${__value.raw}' % $._config.applicationOverviewDashboardUid
-            )
+            ) +
+            tbPanelOptions.link.withTargetBlank(true)
           )
         ),
       ]),