diff --git a/charts/victoria-metrics-k8s-stack/CHANGELOG.md b/charts/victoria-metrics-k8s-stack/CHANGELOG.md index 5d0ce1a74..62138ba70 100644 --- a/charts/victoria-metrics-k8s-stack/CHANGELOG.md +++ b/charts/victoria-metrics-k8s-stack/CHANGELOG.md @@ -1,6 +1,6 @@ ## Next release -- TODO +- Set higher priority for `defaultDashboards.dashboards..enabled` flag comparing to default dashboard conditions to allow install or ignore dashboards regardless of whether component it's for is installed or monitored. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1851). ## 0.30.2 diff --git a/charts/victoria-metrics-k8s-stack/templates/grafana/dashboard.yaml b/charts/victoria-metrics-k8s-stack/templates/grafana/dashboard.yaml index 5f54875cf..1ce9d3a87 100644 --- a/charts/victoria-metrics-k8s-stack/templates/grafana/dashboard.yaml +++ b/charts/victoria-metrics-k8s-stack/templates/grafana/dashboard.yaml @@ -24,7 +24,10 @@ Get dashboard data from file {{- /* Save condition for a dashboard from file */}} -{{- $dashboardCondition := or $dashboardData.condition (dig $dashboardName "enabled" false $.Values.defaultDashboards.dashboards) -}} +{{- $dashboardCondition := $dashboardData.condition }} +{{- if hasKey (index ((($.Values).defaultDashboards).dashboards) $dashboardName) "enabled" }} + {{- $dashboardCondition = index $.Values.defaultDashboards.dashboards $dashboardName "enabled" }} +{{- end }} {{- /* Delete condition from dashboard