Merge branch 'dashboards2' into 'master'

Dashboards2

See merge request platform-one/big-bang/apps/sandbox/podinfo!8

.helmdocsignore

-chart/deps/*
-bigbang/*
\ No newline at end of file

CHANGELOG.md

@@ -2,11 +2,17 @@
 
 > Format: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [6.0.0-bb.3] - 2021-12-02
+
+### Changed
+
+- Updated Grafana dashboard support to align with Big Bang docs
+
 ## [6.0.0-bb.2] - 2021-11-30
 
 ### Added
 
-- Added Grafana dashborad support
+- Added Grafana dashboard support
 
 ## [6.0.0-bb.1] - 2021-11-09
 

README.md

 # podinfo
 
-![Version: 6.0.0-bb.2](https://img.shields.io/badge/Version-6.0.0--bb.2-informational?style=flat-square) ![AppVersion: 6.0.0](https://img.shields.io/badge/AppVersion-6.0.0-informational?style=flat-square)
+![Version: 6.0.0-bb.3](https://img.shields.io/badge/Version-6.0.0--bb.3-informational?style=flat-square) ![AppVersion: 6.0.0](https://img.shields.io/badge/AppVersion-6.0.0-informational?style=flat-square)
 
 Podinfo Helm chart for Kubernetes
 
@@ -98,7 +98,7 @@ helm install podinfo chart/
 | serviceMonitor.enabled | bool | `false` |  |
 | serviceMonitor.interval | string | `"15s"` |  |
 | serviceMonitor.additionalLabels | object | `{}` |  |
-| serviceMonitor.namespace | string | `"monitoring"` |  |
+| serviceMonitor.dashboards.namespace | string | `""` |  |
 | serviceMonitor.dashboards.label | string | `"grafana_dashboard"` |  |
 | resources.limits | string | `nil` |  |
 | resources.requests.cpu | string | `"1m"` |  |

README.md.gotmpl

-{{ template "chart.header" . }}
-{{ template "chart.deprecationWarning" . }}
-
-{{ template "chart.badgesSection" . }}
-
-{{ template "chart.description" . }}
-
-{{ if or .Home .Sources }}
-## Upstream References
-{{- if .Home }}
-* <{{ template "chart.homepage" . }}>
-{{- end }}
-{{ template "chart.sourcesList" . }}
-{{ end }}
-
-## Learn More
-* [Application Overview](docs/overview.md)
-* [Other Documentation](docs/)
-
-## Pre-Requisites
-
-* Kubernetes Cluster deployed
-* Kubernetes config installed in `~/.kube/config`
-* Helm installed
-
-{{ template "chart.kubeVersionLine" . }}
-
-Install Helm
-
-https://helm.sh/docs/intro/install/
-
-## Deployment
-
-* Clone down the repository
-* cd into directory
-```bash
-helm install {{ template "chart.name" . }} chart/
-```
-
-{{ template "chart.valuesSection" . }}
-
-## Contributing
-
-Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in contributing.

bigbang/templates/podinfo/values.yaml

@@ -10,6 +10,9 @@ istio:
     - istio-system/{{ default "public" .Values.podinfo.ingress.gateway }}
 serviceMonitor:
   enabled: {{ .Values.monitoring.enabled }}
+  dashboards:
+    namespace: monitoring
+    label: {{ dig "values" "grafana" "sidecar" "dashboards" "label" "grafana_dashboard" .Values.monitoring }}
 {{- end }}
 
 {{- /* Create secret */ -}}

chart/Chart.yaml

 apiVersion: v1
-version: 6.0.0-bb.2
+version: 6.0.0-bb.3
 appVersion: 6.0.0
 name: podinfo
 engine: gotpl

chart/templates/bigbang/dashboards.yaml

@@ -10,7 +10,7 @@ items:
   kind: ConfigMap
   metadata:
     name: {{ printf "%s-%s" $pkg $dashboardName | trunc 63 | trimSuffix "-" }}
-    namespace: {{ $.Values.serviceMonitor.namespace }}
+    namespace: {{ default $.Release.Namespace $.Values.serviceMonitor.dashboards.namespace }}
     labels:
       {{- if $.Values.serviceMonitor.dashboards.label }}
       {{ $.Values.serviceMonitor.dashboards.label }}: "1"

chart/values.yaml

@@ -127,8 +127,10 @@ serviceMonitor:
   interval: 15s
   additionalLabels: {}
   ## Added by Big Bang
-  namespace: monitoring
   dashboards:
+    # Namespace to put .json ConfigMap so Grafana sidecar will find it
+    namespace: ""
+    # Label to apply to dashboard so Grafana sidecar will find it
     label: grafana_dashboard
 
 resources: