Skip to content

Commit e8c0d9b

Browse files
authored
fix(dashboards): add release in file name to avoid duplicates (#138)
* chore(charts): format grafana-dashboard.yaml template * fix(charts): add release in file name to avoid duplicates * docs(terraform-docs): generate docs and write to README.adoc --------- Co-authored-by: lconsuegra <[email protected]>
1 parent a7e498f commit e8c0d9b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ Description: Override of target revision of the application chart.
310310

311311
Type: `string`
312312

313-
Default: `"v7.0.0"`
313+
Default: `"v7.1.0"`
314314

315315
==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
316316

@@ -753,7 +753,7 @@ Description: Map of extra accounts that were created and their tokens.
753753
|[[input_target_revision]] <<input_target_revision,target_revision>>
754754
|Override of target revision of the application chart.
755755
|`string`
756-
|`"v7.0.0"`
756+
|`"v7.1.0"`
757757
|no
758758
759759
|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

bootstrap/README.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ The following requirements are needed by this module:
7979

8080
The following providers are used by this module:
8181

82+
- [[provider_random]] <<provider_random,random>> (>= 3)
83+
8284
- [[provider_jwt]] <<provider_jwt,jwt>> (>= 1.1)
8385

8486
- [[provider_time]] <<provider_time,time>> (>= 0.9)
8587

86-
- [[provider_random]] <<provider_random,random>> (>= 3)
87-
8888
- [[provider_helm]] <<provider_helm,helm>> (>= 2)
8989

9090
- [[provider_argocd]] <<provider_argocd,argocd>> (>= 6)

charts/argocd/templates/grafana-dashboard.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if or (index .Values "argo-cd" "controller" "metrics" "serviceMonitor" "enabled")
1+
{{- if or (index .Values "argo-cd" "controller" "metrics" "serviceMonitor" "enabled")
22
(or (index .Values "argo-cd" "repoServer" "metrics" "serviceMonitor" "enabled")
33
(index .Values "argo-cd" "server" "metrics" "serviceMonitor" "enabled")
44
)
@@ -17,7 +17,7 @@ items:
1717
labels:
1818
grafana_dashboard: '1'
1919
data:
20-
{{ $dashboardName }}.json: {{ $.Files.Get $path | toJson }}
20+
{{ $.Release.Name }}-{{ $dashboardName }}.json: {{ $.Files.Get $path | toJson }}
2121
{{- end }}
2222
{{- end }}
2323
{{- end }}

0 commit comments

Comments
 (0)