UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 5d796286 authored by bigbang bot's avatar bigbang bot Committed by Ernest Chuang
Browse files

Update dependency registry1.dso.mil/ironbank/nirmata/policy-reporter/policy-reporter to v2.12.0

parent 4a96f798
No related branches found
No related tags found
1 merge request!21Update dependency registry1.dso.mil/ironbank/nirmata/policy-reporter/policy-reporter to v2.12.0
Hide whitespace changes
Inline Side-by-side
Showing
with 222 additions and 91 deletions
CHANGELOG.md
+ 6
− 1
View file @ 5d796286
......@@ -2,7 +2,12 @@
Format: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [2.13.5-bb.1] - 2022-01-17
## [2.6.2-bb.0] - 2023-02-01
### Changed
- Update application to 2.10.4 and chart to 2.12.0
## [2.13.5-bb.1] - 2023-01-17
### Changed
- Update gluon to new registry1 location + latest version (0.3.2)
......
chart/Chart.lock
+ 5
− 5
View file @ 5d796286
dependencies:
- name: monitoring
repository: ""
version: 2.5.0
version: 2.7.0
- name: ui
repository: ""
version: 2.6.5
version: 2.8.0
- name: kyvernoPlugin
repository: ""
version: 1.4.3
version: 1.5.1
- name: gluon
repository: oci://registry1.dso.mil/bigbang
version: 0.3.2
digest: sha256:d8451ea1288f7c708db17c516695ad90fc4e1c885ad269f40ca05aa15c932c51
generated: "2023-01-17T11:52:12.14762-07:00"
digest: sha256:532b5009881b9e3aa7fc403a109eefd0141af62b8227f38b935827c4d4afabbc
generated: "2023-02-01T10:50:50.194491-07:00"
chart/Chart.yaml
+ 6
− 6
View file @ 5d796286
......@@ -5,8 +5,8 @@ description: |
It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord
type: application
version: 2.13.5-bb.1
appVersion: 2.10.4
version: 2.16.0-bb.0
appVersion: 2.12.0
icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
home: https://kyverno.github.io/policy-reporter
......@@ -18,13 +18,13 @@ maintainers:
dependencies:
- name: monitoring
condition: monitoring.enabled
version: "2.5.0"
version: "2.7.0"
- name: ui
condition: ui.enabled
version: "2.6.5"
version: "2.8.0"
- name: kyvernoPlugin
condition: kyvernoPlugin.enabled
version: "1.4.3"
version: "1.5.1"
- name: gluon
version: 0.3.2
repository: oci://registry1.dso.mil/bigbang
......@@ -34,4 +34,4 @@ annotations:
- Kyverno Reporter: 2.10.4
helm.sh/images: |
- name: policy-reporter
image: registry1.dso.mil/ironbank/nirmata/policy-reporter/policy-reporter:2.10.4
image: registry1.dso.mil/ironbank/nirmata/policy-reporter/policy-reporter:2.12.0
chart/Kptfile
+ 2
− 2
View file @ 5d796286
......@@ -5,7 +5,7 @@ metadata:
upstream:
type: git
git:
commit: bc75ffb727e586769040862baa6972eda5686647
commit: 440d72bcacec54aaeed2ba7118ae8f6b8f85e4f1
repo: https://github.com/kyverno/policy-reporter
directory: /charts/policy-reporter
ref: policy-reporter-2.13.5
ref: policy-reporter-2.16.0
chart/charts/kyvernoPlugin/Chart.yaml
+ 2
− 2
View file @ 5d796286
......@@ -3,5 +3,5 @@ name: kyvernoPlugin
description: Policy Reporter Kyverno Plugin
type: application
version: 1.4.3
appVersion: 1.4.2
\ No newline at end of file
version: 1.5.1
appVersion: 1.5.0
\ No newline at end of file
chart/charts/kyvernoPlugin/templates/clusterrole.yaml
+ 10
− 0
View file @ 5d796286
......@@ -40,8 +40,18 @@ rules:
- clusterpolicyreports/status
verbs:
- get
- list
- create
- update
- delete
{{- else }}
- apiGroups:
- '*'
resources:
- policyreports
- clusterpolicyreports
verbs:
- get
- list
{{- end }}
{{- end -}}
chart/charts/kyvernoPlugin/templates/deployment.yaml
+ 4
− 0
View file @ 5d796286
......@@ -95,6 +95,10 @@ spec:
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
......
chart/charts/kyvernoPlugin/values.yaml
+ 6
− 3
View file @ 5d796286
......@@ -2,7 +2,7 @@ image:
registry: registry1.dso.mil
repository: ironbank/nirmata/policy-reporter/policy-reporter-kyverno-plugin
pullPolicy: IfNotPresent
tag: 1.4.2
tag: 1.5.0
imagePullSecrets: []
......@@ -87,16 +87,19 @@ tolerations: []
# Anti-affinity to disallow deploying client and master nodes on the same worker node
affinity: {}
# Topology Spread Constraints to better spread pods
topologySpreadConstraints: []
# livenessProbe for policy-reporter-kyverno-plugin
livenessProbe:
httpGet:
path: /ready
path: /healthz
port: rest
# readinessProbe for policy-reporter-kyverno-plugin
readinessProbe:
httpGet:
path: /healthz
path: /ready
port: rest
# REST API
......
chart/charts/monitoring/Chart.yaml
+ 1
− 1
View file @ 5d796286
......@@ -3,5 +3,5 @@ name: monitoring
description: Policy Reporter Monitoring with predefined ServiceMonitor and Grafana Dashboards
type: application
version: 2.5.0
version: 2.7.0
appVersion: 0.0.0
chart/charts/monitoring/templates/_helpers.tpl
+ 1
− 1
View file @ 5d796286
......@@ -4,7 +4,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
If release name contains chart name it will be used as a full name.
*/}}
{{- define "monitoring.fullname" -}}
{{- $name := .Chart.Name }}
{{- $name := default .Chart.Name .Values.nameOverride }}
{{- if .Values.global.fullnameOverride }}
{{- printf "%s-%s" .Values.global.fullnameOverride $name | trunc 63 | trimSuffix "-" }}
{{- else if contains $name .Release.Name }}
......
chart/charts/monitoring/templates/clusterpolicy-details.dashboard.yaml
+ 43
− 22
View file @ 5d796286
{{- if $.Values.grafana.dashboards.enabled }}
{{- if and $.Values.grafana.dashboards.enabled $.Values.grafana.dashboards.enable.clusterPolicyReportDetails }}
{{- $filters := .Values.grafana.dashboards.labelFilter }}
{{- if and .Values.grafana.dashboards.multicluster.enabled .Values.grafana.dashboards.multicluster.label }}
{{- $filters = append $filters .Values.grafana.dashboards.multicluster.label }}
{{- end }}
apiVersion: v1
kind: ConfigMap
metadata:
......@@ -17,12 +21,12 @@ data:
{
"__inputs": [
{
"name": "DS_PROMETHEUS",
"label": "Prometheus",
"description": "",
"type": "datasource",
"pluginId": "prometheus",
"pluginName": "Prometheus"
"name": "DS_PROMETHEUS",
"label": "{{ .Values.grafana.datasource.label }}",
"description": "",
"type": "datasource",
"pluginId": "{{ .Values.grafana.datasource.pluginId }}",
"pluginName": "{{ .Values.grafana.datasource.pluginName }}"
}
],
"__requires": [
......@@ -39,12 +43,6 @@ data:
"version": ""
},
{
"type": "datasource",
"id": "prometheus",
"name": "Prometheus",
"version": "1.0.0"
},
{
"type": "panel",
"id": "stat",
"name": "Stat",
......@@ -120,7 +118,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"pass\"})",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"pass\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} })",
"instant": true,
"interval": "",
"legendFormat": "",
......@@ -177,7 +175,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"warn\"})",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"warn\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} })",
"instant": true,
"interval": "",
"legendFormat": "",
......@@ -234,7 +232,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"fail\"})",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"fail\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} })",
"instant": true,
"interval": "",
"legendFormat": "",
......@@ -291,7 +289,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"error\"})",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"error\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} })",
"instant": true,
"interval": "",
"legendFormat": "",
......@@ -353,7 +351,7 @@ data:
"steppedLine": false,
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\"} > 0) by (status)",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (status)",
"interval": "",
"legendFormat": "{{`{{ status }}`}}",
"refId": "A"
......@@ -441,7 +439,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", kind=~\"$kind\", source=~\"$source\", status=\"pass\"}) by (policy,rule,kind,name,status,severity,category,source)",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", kind=~\"$kind\", source=~\"$source\", status=\"pass\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (policy,rule,kind,name,status,severity,category,source{{ range $filters }},{{.}}{{ end }})",
"format": "table",
"instant": true,
"interval": "",
......@@ -520,7 +518,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"fail\"}) by (policy,rule,kind,name,status,severity,category,source)",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"fail\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (policy,rule,kind,name,status,severity,category,source{{ range $filters }},{{.}}{{ end }})",
"format": "table",
"instant": true,
"interval": "",
......@@ -596,7 +594,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"warn\"}) by (policy,rule,kind,name,status,severity,category,source)",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"warn\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (policy,rule,kind,name,status,severity,category,source{{ range $filters }},{{.}}{{ end }} )",
"format": "table",
"instant": true,
"interval": "",
......@@ -672,7 +670,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"warn\"}) by (policy,rule,kind,name,status,severity,category,source)",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=\"warn\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (policy,rule,kind,name,status,severity,category,source{{ range $filters }},{{.}}{{ end }})",
"format": "table",
"instant": true,
"interval": "",
......@@ -837,6 +835,29 @@ data:
"type": "query",
"useTags": false
}
{{- range $filters }}
,{
"allValue": ".*",
"datasource": "${DS_PROMETHEUS}",
"definition": "label_values(cluster_policy_report_result, {{.}})",
"hide": 0,
"includeAll": true,
"label": "{{ . | title }}",
"multi": true,
"name": "{{.}}",
"options": [],
"query": "label_values(cluster_policy_report_result, {{.}})",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 5,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
}
{{- end }}
]
},
"time": {
......
chart/charts/monitoring/templates/overview.dashboard.yaml
+ 41
− 20
View file @ 5d796286
{{- if $.Values.grafana.dashboards.enabled }}
{{- if and $.Values.grafana.dashboards.enabled $.Values.grafana.dashboards.enable.overview }}
{{- $filters := .Values.grafana.dashboards.labelFilter }}
{{- if and .Values.grafana.dashboards.multicluster.enabled .Values.grafana.dashboards.multicluster.label }}
{{- $filters = append $filters .Values.grafana.dashboards.multicluster.label }}
{{- end }}
apiVersion: v1
kind: ConfigMap
metadata:
......@@ -20,12 +24,12 @@ data:
{
"__inputs": [
{
"name": "DS_PROMETHEUS",
"label": "prometheus",
"description": "",
"type": "datasource",
"pluginId": "prometheus",
"pluginName": "Prometheus"
"name": "DS_PROMETHEUS",
"label": "{{ .Values.grafana.datasource.label }}",
"description": "",
"type": "datasource",
"pluginId": "{{ .Values.grafana.datasource.pluginId }}",
"pluginName": "{{ .Values.grafana.datasource.pluginName }}"
}
],
"__requires": [
......@@ -34,13 +38,7 @@ data:
"id": "grafana",
"name": "Grafana",
"version": "7.1.5"
},
{
"type": "datasource",
"id": "prometheus",
"name": "Prometheus",
"version": "1.0.0"
}
}
],
"annotations": {
"list": [
......@@ -111,7 +109,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=~\"fail|error\"} > 0) by (exported_namespace)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=~\"fail|error\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (exported_namespace)",
"instant": true,
"interval": "",
"legendFormat": "{{`{{ exported_namespace }}`}}",
......@@ -172,7 +170,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=~\"fail|error\"} > 0) by (status)",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=~\"fail|error\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (status)",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
......@@ -234,13 +232,13 @@ data:
"steppedLine": false,
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=~\"fail|error\"} > 0) by (policy)",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=~\"fail|error\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (policy)",
"interval": "",
"legendFormat": "{{`{{ policy }}`}}",
"refId": "A"
},
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=~\"fail|error\"} > 0) by (policy)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=~\"fail|error\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (policy)",
"interval": "",
"legendFormat": "{{`{{ policy }}`}}",
"refId": "B"
......@@ -325,7 +323,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=~\"fail|error\"}) by (exported_namespace,policy,rule,kind,name,status,category,severity,source)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=~\"fail|error\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (exported_namespace,policy,rule,kind,name,status,category,severity,source{{ range $filters }},{{.}}{{ end }})",
"format": "table",
"instant": true,
"interval": "",
......@@ -400,7 +398,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=~\"fail|error\"}) by (policy,rule,kind,name,status,category,severity,source)",
"expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", status=~\"fail|error\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (policy,rule,kind,name,status,category,severity,source{{ range $filters }},{{.}}{{ end }})",
"format": "table",
"instant": true,
"interval": "",
......@@ -588,6 +586,29 @@ data:
"type": "query",
"useTags": false
}
{{- range $filters }}
,{
"allValue": ".*",
"datasource": "${DS_PROMETHEUS}",
"definition": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\", status=~\"fail|error\"}, {{.}})",
"hide": 0,
"includeAll": true,
"label": "{{ . | title }}",
"multi": true,
"name": "{{.}}",
"options": [],
"query": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\", status=~\"fail|error\"}, {{.}})",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 5,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
}
{{- end }}
]
},
"time": {
......
chart/charts/monitoring/templates/policy-details.dashboard.yaml
+ 43
− 22
View file @ 5d796286
{{- if $.Values.grafana.dashboards.enabled }}
{{- if and $.Values.grafana.dashboards.enabled $.Values.grafana.dashboards.enable.policyReportDetails }}
{{- $filters := .Values.grafana.dashboards.labelFilter }}
{{- if and .Values.grafana.dashboards.multicluster.enabled .Values.grafana.dashboards.multicluster.label }}
{{- $filters = append $filters .Values.grafana.dashboards.multicluster.label }}
{{- end }}
apiVersion: v1
kind: ConfigMap
metadata:
......@@ -20,12 +24,12 @@ data:
{
"__inputs": [
{
"name": "DS_PROMETHEUS",
"label": "Prometheus",
"description": "",
"type": "datasource",
"pluginId": "prometheus",
"pluginName": "Prometheus"
"name": "DS_PROMETHEUS",
"label": "{{ .Values.grafana.datasource.label }}",
"description": "",
"type": "datasource",
"pluginId": "{{ .Values.grafana.datasource.pluginId }}",
"pluginName": "{{ .Values.grafana.datasource.pluginName }}"
}
],
"__requires": [
......@@ -48,12 +52,6 @@ data:
"version": ""
},
{
"type": "datasource",
"id": "prometheus",
"name": "Prometheus",
"version": "1.0.0"
},
{
"type": "panel",
"id": "table",
"name": "Table",
......@@ -121,7 +119,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"pass\"} > 0) by (exported_namespace)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"pass\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (exported_namespace)",
"instant": true,
"interval": "",
"legendFormat": "{{`{{ exported_namespace }}`}}",
......@@ -176,7 +174,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"fail\"} > 0) by (exported_namespace)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"fail\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (exported_namespace)",
"instant": true,
"interval": "",
"legendFormat": "{{`{{ exported_namespace }}`}}",
......@@ -232,7 +230,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"warn\"} > 0) by (exported_namespace)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"warn\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (exported_namespace)",
"instant": true,
"interval": "",
"legendFormat": "{{`{{ exported_namespace }}`}}",
......@@ -287,7 +285,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"error\"} > 0) by (exported_namespace)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"error\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (exported_namespace)",
"instant": true,
"interval": "",
"legendFormat": "{{`{{ exported_namespace }}`}}",
......@@ -350,7 +348,7 @@ data:
"steppedLine": false,
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\"} > 0) by (status, exported_namespace)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} } > 0) by (status, exported_namespace)",
"interval": "",
"legendFormat": "{{`{{ exported_namespace }}`}} {{`{{ status }}`}}",
"refId": "A"
......@@ -438,7 +436,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"pass\"}) by (exported_namespace,category,policy,rule,kind,name,severity,status,source)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"pass\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (exported_namespace,category,policy,rule,kind,name,severity,status,source{{ range $filters }},{{.}}{{ end }} )",
"format": "table",
"instant": true,
"interval": "",
......@@ -518,7 +516,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"fail\"}) by (exported_namespace,category,policy,rule,kind,name,severity,status,source)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"fail\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (exported_namespace,category,policy,rule,kind,name,severity,status,source{{ range $filters }},{{.}}{{ end }})",
"format": "table",
"instant": true,
"interval": "",
......@@ -595,7 +593,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"warn\"}) by (exported_namespace,category,policy,rule,kind,name,severity,status,source)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"warn\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (exported_namespace,category,policy,rule,kind,name,severity,status,source{{ range $filters }},{{.}}{{ end }} )",
"format": "table",
"instant": true,
"interval": "",
......@@ -672,7 +670,7 @@ data:
"pluginVersion": "7.1.5",
"targets": [
{
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"error\"}) by (exported_namespace,category,policy,rule,kind,name,severity,status,source)",
"expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", source=~\"$source\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=\"error\"{{ range $filters }}, {{.}}=~\"${{.}}\"{{ end }} }) by (exported_namespace,category,policy,rule,kind,name,severity,status,source{{ range $filters }},{{.}}{{ end }} )",
"format": "table",
"instant": true,
"interval": "",
......@@ -857,6 +855,29 @@ data:
"type": "query",
"useTags": false
}
{{- range $filters }}
,{
"allValue": ".*",
"datasource": "${DS_PROMETHEUS}",
"definition": "label_values(policy_report_result, {{.}})",
"hide": 0,
"includeAll": true,
"label": "{{ . | title }}",
"multi": true,
"name": "{{.}}",
"options": [],
"query": "label_values(policy_report_result, {{.}})",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
"sort": 5,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
}
{{- end }}
]
},
"time": {
......
chart/charts/monitoring/values.yaml
+ 16
− 0
View file @ 5d796286
# Override the chart name used for all resources
nameOverride: ""
plugins:
kyverno: false
......@@ -51,11 +54,24 @@ grafana:
# Label to find dashboards using the k8s sidecar
label: grafana_dashboard
value: "1"
labelFilter: []
multicluster:
enabled: false
label: cluster
enable:
overview: true
policyReportDetails: true
clusterPolicyReportDetails: true
folder:
# Annotation to enable folder storage using the k8s sidecar
annotation: grafana_folder
# Grafana folder in which to store the dashboards
name: Policy Reporter
datasource:
label: Prometheus
pluginId: prometheus
pluginName: Prometheus
policyReportDetails:
firstStatusRow:
......
chart/charts/ui/Chart.yaml
+ 2
− 2
View file @ 5d796286
......@@ -3,5 +3,5 @@ name: ui
description: Policy Reporter UI
type: application
version: 2.6.5
appVersion: 1.6.7
version: 2.8.0
appVersion: 1.7.2
chart/charts/ui/templates/config.yaml
+ 4
− 0
View file @ 5d796286
......@@ -28,6 +28,10 @@ data:
clusters:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.labelFilter }}
labelFilter:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.redis }}
redis:
......
chart/charts/ui/templates/deployment.yaml
+ 5
− 1
View file @ 5d796286
......@@ -38,7 +38,7 @@ spec:
serviceAccountName: {{ include "ui.serviceAccountName" . }}
automountServiceAccountToken: true
containers:
- name: {{ .Chart.Name }}
- name: {{ default .Chart.Name .Values.nameOverride }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.securityContext }}
......@@ -81,6 +81,10 @@ spec:
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
......
chart/charts/ui/values.yaml
+ 23
− 1
View file @ 5d796286
enabled: false
# Override the chart name used for all resources
nameOverride: ""
image:
registry: ghcr.io
repository: kyverno/policy-reporter-ui
pullPolicy: IfNotPresent
tag: 1.6.7
tag: 1.7.2
# possible default displayModes: light/dark
displayMode: ""
......@@ -44,6 +47,22 @@ clusters: []
# api: https://policy-reporter.external.cluster # reachable external Policy Reporter REST API
# kyvernoApi: https://policy-reporter-kyverno-plugin.external.cluster # (optional) reachable external Policy Reporter Kyverno Plugin REST API
# define custom filter for policy report results based on (Cluster)PolicyReport labels
# exmaple - use a owner label on all reports belonging to a dedicated team and add the label as additional custom filter
#
# apiVersion: wgpolicyk8s.io/v1alpha2
# kind: PolicyReport
# metadata:
# labels:
# app.kubernetes.io/managed-by: kyverno
# owner: team-a
# name: cpol-disallow-capabilities
# namespace: default
# results: [...]
#
# labelFilter: ["owner"]
labelFilter: []
# use redis as external log storage instead of an in memory store
# recommended when using a HA setup with more then one replica
# to get all logs on each instance
......@@ -162,6 +181,9 @@ tolerations: []
# Anti-affinity to disallow deploying client and master nodes on the same worker node
affinity: {}
# Topology Spread Constraints to better spread pods
topologySpreadConstraints: []
# enable a NetworkPolicy for this chart. Useful on clusters where Network Policies are
# used and configured in a default-deny fashion.
networkPolicy:
......
chart/templates/_helpers.tpl
+ 1
− 1
View file @ 5d796286
......@@ -8,7 +8,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
If release name contains chart name it will be used as a full name.
*/}}
{{- define "policyreporter.fullname" -}}
{{- $name := .Chart.Name }}
{{- $name := default .Chart.Name .Values.nameOverride }}
{{- if .Values.global.fullnameOverride }}
{{- .Values.global.fullnameOverride }}
{{- else if contains $name .Release.Name }}
......
chart/templates/cronjob-summary-report.yaml
+ 1
− 1
View file @ 5d796286
......@@ -51,7 +51,7 @@ spec:
{{- end }}
restartPolicy: {{ .Values.emailReports.summary.restartPolicy }}
containers:
- name: {{ .Chart.Name }}
- name: {{ default .Chart.Name .Values.nameOverride }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.securityContext }}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED - NO CUI