diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f481f07..a6889791 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +# 2.6.1 +* Update Policy Reporter UI to v1.3.2 + * Support access over Subpaths, e.g. Rancher Reverse Proxy +* Update Policy Reporter Monitoring to v2.1.0 + * Fix Failing ClusterPolicyRules Columns of the PolicyReports Dashboard + * Add Filter to the PolicyReports Dashboard + # 2.6.0 * Add seccomp profile support [[#120](https://github.com/kyverno/policy-reporter/pull/120) by [eddycharly](https://github.com/eddycharly)] diff --git a/charts/policy-reporter/Chart.lock b/charts/policy-reporter/Chart.lock index 5df23ef6..66dcfe01 100644 --- a/charts/policy-reporter/Chart.lock +++ b/charts/policy-reporter/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: monitoring repository: "" - version: 2.0.1 + version: 2.1.0 - name: ui repository: "" - version: 2.3.1 + version: 2.3.2 - name: kyvernoPlugin repository: "" version: 1.2.0 -digest: sha256:4faed9ebd9668dd0cffd783e8ed94c832a356933a8afb1f687d1acfd8c8e5731 -generated: "2022-02-27T16:53:48.829393+01:00" +digest: sha256:bb751835db85334bd7b379680227a488c80769646f916a1367e207e7909d557a +generated: "2022-03-10T12:33:30.918735+01:00" diff --git a/charts/policy-reporter/Chart.yaml b/charts/policy-reporter/Chart.yaml index b6287176..3822f7ec 100644 --- a/charts/policy-reporter/Chart.yaml +++ b/charts/policy-reporter/Chart.yaml @@ -5,7 +5,7 @@ description: | It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord type: application -version: 2.6.0 +version: 2.6.1 appVersion: 2.3.0 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png @@ -18,10 +18,10 @@ maintainers: dependencies: - name: monitoring condition: monitoring.enabled - version: "2.0.1" + version: "2.1.0" - name: ui condition: ui.enabled - version: "2.3.1" + version: "2.3.2" - name: kyvernoPlugin condition: kyvernoPlugin.enabled version: "1.2.0" diff --git a/charts/policy-reporter/charts/monitoring/Chart.yaml b/charts/policy-reporter/charts/monitoring/Chart.yaml index 555da1b1..d8c8343b 100644 --- a/charts/policy-reporter/charts/monitoring/Chart.yaml +++ b/charts/policy-reporter/charts/monitoring/Chart.yaml @@ -3,5 +3,5 @@ name: monitoring description: Policy Reporter Monitoring with predefined ServiceMonitor and Grafana Dashboards type: application -version: 2.0.1 +version: 2.1.0 appVersion: 0.0.0 diff --git a/charts/policy-reporter/charts/monitoring/templates/overview.dashboard.yaml b/charts/policy-reporter/charts/monitoring/templates/overview.dashboard.yaml index 800545d6..2aecb9ca 100644 --- a/charts/policy-reporter/charts/monitoring/templates/overview.dashboard.yaml +++ b/charts/policy-reporter/charts/monitoring/templates/overview.dashboard.yaml @@ -108,7 +108,7 @@ data: "pluginVersion": "7.1.5", "targets": [ { - "expr": "sum(policy_report_summary{status=\"Fail\"} > 0) by (exported_namespace)", + "expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=~\"fail|error\"} > 0) by (exported_namespace)", "instant": true, "interval": "", "legendFormat": "{{`{{ exported_namespace }}`}}", @@ -169,7 +169,7 @@ data: "pluginVersion": "7.1.5", "targets": [ { - "expr": "sum(cluster_policy_report_summary{status=~\"Fail|Error\"} > 0) by (status)", + "expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", kind=~\"$kind\", status=~\"fail|error\"} > 0) by (status)", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -231,13 +231,13 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum(cluster_policy_report_result{status=~\"fail|error\"} > 0) by (policy)", + "expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", kind=~\"$kind\", status=~\"fail|error\"} > 0) by (policy)", "interval": "", "legendFormat": "{{`{{ policy }}`}}", "refId": "A" }, { - "expr": "sum(policy_report_result{status=~\"fail|error\"} > 0) by (policy)", + "expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=~\"fail|error\"} > 0) by (policy)", "interval": "", "legendFormat": "{{`{{ policy }}`}}", "refId": "B" @@ -322,7 +322,7 @@ data: "pluginVersion": "7.1.5", "targets": [ { - "expr": "sum(policy_report_result{status=~\"fail|error\"}) by (exported_namespace,policy,rule,kind,name,status)", + "expr": "sum(policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", kind=~\"$kind\", exported_namespace=~\"$namespace\", status=~\"fail|error\"}) by (exported_namespace,policy,rule,kind,name,status,category,severity)", "format": "table", "instant": true, "interval": "", @@ -342,13 +342,13 @@ data: "Value": true }, "indexByName": { - "Time": 0, - "Value": 6, - "exported_namespace": 1, - "kind": 2, - "name": 3, - "policy": 4, - "rule": 5, + "category": 0, + "severity": 1, + "exported_namespace": 2, + "kind": 3, + "name": 4, + "policy": 5, + "rule": 6, "status": 7 }, "renameByName": { @@ -396,7 +396,7 @@ data: "pluginVersion": "7.1.5", "targets": [ { - "expr": "cluster_policy_report_result > 0", + "expr": "sum(cluster_policy_report_result{policy=~\"$policy\", category=~\"$category\", severity=~\"$severity\", kind=~\"$kind\", status=~\"fail|error\"}) by (policy,rule,kind,name,status,category,severity)", "format": "table", "instant": true, "interval": "", @@ -421,28 +421,19 @@ data: "namespace": true, "pod": true, "report": true, - "service": true + "service": true, + "container": true }, "indexByName": { - "Time": 0, - "Value": 14, - "__name__": 1, - "endpoint": 2, - "instance": 3, - "job": 4, - "kind": 9, - "name": 10, - "namespace": 5, - "pod": 6, - "policy": 11, - "report": 7, - "rule": 12, - "service": 8, - "status": 13 + "category": 0, + "severity": 1, + "kind": 2, + "name": 3, + "policy": 4, + "rule": 5, + "status": 6 }, - "renameByName": { - "__name__": "" - } + "renameByName": {} } } ], @@ -455,7 +446,108 @@ data: "Policy Reporter" ], "templating": { - "list": [] + "list": [ + { + "allValue": ".*", + "definition": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\"}, policy)", + "hide": 0, + "includeAll": true, + "label": "Policy", + "multi": true, + "name": "policy", + "options": [], + "query": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\"}, policy)", + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "definition": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\"}, category)", + "hide": 0, + "includeAll": true, + "label": "Category", + "multi": true, + "name": "category", + "options": [], + "query": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\"}, category)", + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "definition": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\"}, severity)", + "hide": 0, + "includeAll": true, + "label": "Severity", + "multi": true, + "name": "severity", + "options": [], + "query": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\"}, severity)", + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "definition": "label_values(policy_report_result, exported_namespace)", + "hide": 0, + "includeAll": true, + "label": "Namespace", + "multi": true, + "name": "namespace", + "options": [], + "query": "label_values(policy_report_result, exported_namespace)", + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "definition": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\"}, kind)", + "hide": 0, + "includeAll": true, + "label": "Kind", + "multi": true, + "name": "kind", + "options": [], + "query": "label_values({__name__=~ \"policy_report_result|cluster_policy_report_result\"}, kind)", + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + } + ] }, "time": { "from": "now-30m", diff --git a/charts/policy-reporter/charts/ui/Chart.yaml b/charts/policy-reporter/charts/ui/Chart.yaml index c31502bf..05d23e0c 100644 --- a/charts/policy-reporter/charts/ui/Chart.yaml +++ b/charts/policy-reporter/charts/ui/Chart.yaml @@ -3,5 +3,5 @@ name: ui description: Policy Reporter UI type: application -version: 2.3.1 -appVersion: 1.3.1 +version: 2.3.2 +appVersion: 1.3.2 diff --git a/charts/policy-reporter/charts/ui/values.yaml b/charts/policy-reporter/charts/ui/values.yaml index 76368052..e65ca2aa 100644 --- a/charts/policy-reporter/charts/ui/values.yaml +++ b/charts/policy-reporter/charts/ui/values.yaml @@ -14,7 +14,7 @@ image: registry: ghcr.io repository: kyverno/policy-reporter-ui pullPolicy: IfNotPresent - tag: 1.3.1 + tag: 1.3.2 imagePullSecrets: []