More formatting fixes

sydneydf · Feb 25, 2021 · b134156 · b134156
1 parent 8b0bdb0
commit b134156
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/cost-analyzer/templates/grafana-datasource-template.yaml b/cost-analyzer/templates/grafana-datasource-template.yaml
@@ -10,7 +10,7 @@ metadata:
   namespace: {{ $.Values.grafana.namespace_datasources }}
   {{- end }}
   labels:
-    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- include "cost-analyzer.commonLabels" . | nindent 4 }}
     {{- if $.Values.grafana.sidecar.datasources.label }}
     {{ $.Values.grafana.sidecar.datasources.label }}: "1"
     {{- else }}
@@ -24,30 +24,30 @@ data:
   {{ default "datasource.yaml" .Values.grafana.sidecar.datasources.dataSourceFilename }}: |-
     apiVersion: 1
     datasources:
-      - access: proxy
-        name: "default-kubecost"
-        type: prometheus
+    - access: proxy
+      name: default-kubecost
+      type: prometheus
 {{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled }}
-        isDefault: true
+      isDefault: true
 {{- else }}
-        isDefault: false
+      isDefault: false
 {{- end }}
 {{- if .Values.global.thanos }}
 {{- if .Values.global.thanos.enabled }}
 {{- if .Values.global.prometheus.enabled }}
-        url: http://{{ .Release.Name }}-thanos-query-http.{{ .Release.Namespace }}:{{ .Values.thanos.query.http.port }}
-{{ else }}
-        url: {{ .Values.global.thanos.queryService }}
+      url: http://{{ .Release.Name }}-thanos-query-http.{{ .Release.Namespace }}:{{ .Values.thanos.query.http.port }}
+{{- else }}
+      url: {{ .Values.global.thanos.queryService }}
 {{- end }}
-      - access: proxy
-        name: {{ default "Prometheus" .Values.grafana.sidecar.datasources.dataSourceName }}
-        isDefault: false
-        type: prometheus
+    - access: proxy
+      name: {{ default "Prometheus" .Values.grafana.sidecar.datasources.dataSourceName}}
+      isDefault: false
+      type: prometheus
 {{- end }}
 {{- if .Values.global.prometheus.enabled }}
-        url: http://{{ template "cost-analyzer.prometheus.server.name" . }}.{{ .Release.Namespace  }}
+      url: http://{{ template "cost-analyzer.prometheus.server.name" . }}.{{ .Release.Namespace  }}
 {{- else }}
-        url: {{ .Values.global.prometheus.fqdn }}
+      url: {{ .Values.global.prometheus.fqdn }}
 {{- end }}
 {{- end }}
 {{- end -}}

diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml
@@ -514,8 +514,7 @@ grafana:
     datasources:
       # dataSourceFilename: foo.yml # If you need to change the name of the datasource file
       enabled: true
-      defaultDatasourceEnabled: false
-      dataSourceName: Prometheus
+      dataSourceName: prometheus-kubecost
       # label that the configmaps with datasources are marked with
       label: kubecost_grafana_datasource
 #  For grafana to be accessible, add the path to root_url. For example, if you run kubecost at www.foo.com:9090/kubecost