mirror of
https://github.com/kyverno/policy-reporter.git
synced 2024-12-14 11:57:32 +00:00
Fix behavior of monitoring.namespace in HelmChart Values
Signed-off-by: Frank Jogeleit <fj@move-elevator.de>
This commit is contained in:
parent
2107907a3a
commit
c424980f50
9 changed files with 26 additions and 11 deletions
CHANGELOG.md
charts/policy-reporter
|
@ -1,5 +1,12 @@
|
|||
# Changelog
|
||||
|
||||
# 18.9
|
||||
* Ensure Backward Compatibility for `monitoring.namespace` configuration
|
||||
|
||||
# 1.8.8
|
||||
* Optional Namespace Configuration for Monitoring ServiceMonitor
|
||||
* Separat Namespace Configuration for Monitoring ConfigMaps with `monitoring.grafana.namespace`
|
||||
|
||||
# 1.8.7
|
||||
* Update Policy Reporter UI to 0.14.0
|
||||
* Colored Diagrams
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
dependencies:
|
||||
- name: monitoring
|
||||
repository: ""
|
||||
version: 1.4.2
|
||||
version: 1.4.3
|
||||
- name: ui
|
||||
repository: ""
|
||||
version: 1.8.5
|
||||
- name: kyvernoPlugin
|
||||
repository: ""
|
||||
version: 0.5.2
|
||||
digest: sha256:45f5be3cc338b330f888fed0d004a87fb4b74cb4e95ec7e37f70034297fe7fa2
|
||||
generated: "2021-08-20T11:26:42.675672+02:00"
|
||||
digest: sha256:aa5a48b7998f791fd06a5ac4cf4127f4f197fa8ca24da01cd384e509faccc4dd
|
||||
generated: "2021-08-30T15:13:36.03159+02:00"
|
||||
|
|
|
@ -5,14 +5,14 @@ description: |
|
|||
It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord
|
||||
|
||||
type: application
|
||||
version: 1.8.8
|
||||
version: 1.8.9
|
||||
appVersion: 1.8.5
|
||||
|
||||
dependencies:
|
||||
- name: monitoring
|
||||
condition: monitoring.enabled
|
||||
repository: ""
|
||||
version: "1.4.2"
|
||||
version: "1.4.3"
|
||||
- name: ui
|
||||
condition: ui.enabled
|
||||
repository: ""
|
||||
|
|
|
@ -3,5 +3,5 @@ name: monitoring
|
|||
description: Policy Reporter Monitoring with predefined ServiceMonitor and Grafana Dashboards
|
||||
|
||||
type: application
|
||||
version: 1.4.2
|
||||
version: 1.4.3
|
||||
appVersion: 0.0.0
|
||||
|
|
|
@ -39,4 +39,12 @@ app.kubernetes.io/instance: {{ .Release.Name }}
|
|||
|
||||
{{- define "monitoring.name" -}}
|
||||
{{- "monitoring" }}
|
||||
{{- end }}
|
||||
|
||||
{{- define "monitoring.namespace" -}}
|
||||
{{- if .Values.grafana.namespace -}}
|
||||
{{- .Values.grafana.namespace -}}
|
||||
{{- else -}}
|
||||
{{- .Values.namespace -}}
|
||||
{{- end }}
|
||||
{{- end }}
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ include "monitoring.fullname" . }}-clusterpolicy-details-dashboard
|
||||
namespace: {{ .Values.grafana.namespace }}
|
||||
namespace: {{ include "monitoring.namespace" . }}
|
||||
annotations:
|
||||
{{ .Values.grafana.folder.annotation }}: {{ .Values.grafana.folder.name }}
|
||||
labels:
|
||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ include "monitoring.fullname" . }}-overview-dashboard
|
||||
namespace: {{ .Values.grafana.namespace }}
|
||||
namespace: {{ include "monitoring.namespace" . }}
|
||||
annotations:
|
||||
{{ .Values.grafana.folder.annotation }}: {{ .Values.grafana.folder.name }}
|
||||
labels:
|
||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
|||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ include "monitoring.fullname" . }}-policy-details-dashboard
|
||||
namespace: {{ .Values.grafana.namespace }}
|
||||
namespace: {{ include "monitoring.namespace" . }}
|
||||
annotations:
|
||||
{{ .Values.grafana.folder.annotation }}: {{ .Values.grafana.folder.name }}
|
||||
labels:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# allow to override the namespace for serviceMonitor
|
||||
namespace:
|
||||
namespace: cattle-dashboards
|
||||
|
||||
plugins:
|
||||
kyverno: false
|
||||
|
@ -10,7 +10,7 @@ serviceMonitor:
|
|||
|
||||
grafana:
|
||||
# namespace for configMap of grafana dashboards
|
||||
namespace: cattle-dashboards
|
||||
namespace:
|
||||
dashboards:
|
||||
# Label to find dashboards using the k8s sidecar
|
||||
label: grafana_dashboard
|
||||
|
|
Loading…
Reference in a new issue