diff --git a/src/configauditreports/checks-list.tsx b/src/configauditreports/checks-list.tsx index 691c5d3..8051d0c 100644 --- a/src/configauditreports/checks-list.tsx +++ b/src/configauditreports/checks-list.tsx @@ -20,11 +20,8 @@ interface Props { const severityOrder = new Map([ ["CRITICAL", 0], ["HIGH", 1], - ["danger", 2], ["MEDIUM", 3], - ["warning", 4], ["LOW", 5], - ["UNKNOWN", 6], ]) const BySeverity = (v1: Check, v2: Check) => { diff --git a/src/configauditreports/details.scss b/src/configauditreports/details.scss index 9f9d8b8..a69c29e 100644 --- a/src/configauditreports/details.scss +++ b/src/configauditreports/details.scss @@ -1,18 +1,27 @@ .ConfigAuditReportDetails { .summary { .Badge { - - &.theme-danger { + &.theme-critical { color: white; background-color: #cc1814; } - &.theme-warning { + &.theme-high { color: white; background-color: #ffa500; } - &.theme-pass { + &.theme-medium { + color: white; + background-color: #f0c20c; + } + + &.theme-low { + color: white; + background-color: #096ab0; + } + + &.theme-negligible { color: white; background-color: #00b09b; } diff --git a/src/configauditreports/details.tsx b/src/configauditreports/details.tsx index 4693ec1..47be5d7 100644 --- a/src/configauditreports/details.tsx +++ b/src/configauditreports/details.tsx @@ -33,15 +33,18 @@ export class ClusterConfigAuditReportDetails extends React.Component} - - - + + + + @@ -77,15 +80,18 @@ export class ConfigAuditReportDetails extends React.Component} - - - + + + + diff --git a/src/configauditreports/page.tsx b/src/configauditreports/page.tsx index 6b6d282..ffbd6db 100644 --- a/src/configauditreports/page.tsx +++ b/src/configauditreports/page.tsx @@ -13,9 +13,10 @@ const { enum sortBy { name = "name", namespace = "namespace", - pass = "pass", - danger = "danger", - warning = "warning", + critical = "critical", + high = "high", + medium = "medium", + low = "low", scanner = "scanner" } @@ -28,9 +29,10 @@ export class ClusterConfigAuditReportPage extends React.Component<{ extension: R className="ConfigAuditReports" store={clusterStore} sortingCallbacks={{ [sortBy.name]: (report: ClusterConfigAuditReport) => report.getName(), - [sortBy.danger]: (report: ClusterConfigAuditReport) => report.report.summary.dangerCount, - [sortBy.warning]: (report: ClusterConfigAuditReport) => report.report.summary.warningCount, - [sortBy.pass]: (report: ClusterConfigAuditReport) => report.report.summary.passCount, + [sortBy.critical]: (report: ClusterConfigAuditReport) => report.report.summary.criticalCount, + [sortBy.high]: (report: ClusterConfigAuditReport) => report.report.summary.highCount, + [sortBy.medium]: (report: ClusterConfigAuditReport) => report.report.summary.mediumCount, + [sortBy.low]: (report: ClusterConfigAuditReport) => report.report.summary.lowCount, [sortBy.scanner]: (report: ClusterConfigAuditReport) => report.report.scanner.name + " " + report.report.scanner.version, }} searchFilters={[ @@ -39,17 +41,19 @@ export class ClusterConfigAuditReportPage extends React.Component<{ extension: R renderHeaderTitle="ClusterConfigAuditReports" renderTableHeader={[ {title: "Name", sortBy: sortBy.name}, - {title: "Danger", sortBy: sortBy.danger}, - {title: "Warning", sortBy: sortBy.warning}, - {title: "Pass", sortBy: sortBy.pass}, + {title: "Critical", sortBy: sortBy.critical}, + {title: "High", sortBy: sortBy.high}, + {title: "Medium", sortBy: sortBy.medium}, + {title: "Low", sortBy: sortBy.low}, {title: "Scanner", sortBy: sortBy.scanner}, ]} renderTableContents={(report: ClusterConfigAuditReport) => [ , - report.report.summary.dangerCount, - report.report.summary.warningCount, - report.report.summary.passCount, + report.report.summary.criticalCount, + report.report.summary.highCount, + report.report.summary.mediumCount, + report.report.summary.lowCount, report.report.scanner.name + " " + report.report.scanner.version, ]} /> @@ -67,9 +71,10 @@ export class ConfigAuditReportPage extends React.Component<{ extension: Renderer sortingCallbacks={{ [sortBy.name]: (report: ConfigAuditReport) => report.getName(), [sortBy.namespace]: (report: ConfigAuditReport) => report.metadata.namespace, - [sortBy.danger]: (report: ConfigAuditReport) => report.report.summary.dangerCount, - [sortBy.warning]: (report: ConfigAuditReport) => report.report.summary.warningCount, - [sortBy.pass]: (report: ConfigAuditReport) => report.report.summary.passCount, + [sortBy.critical]: (report: ConfigAuditReport) => report.report.summary.criticalCount, + [sortBy.high]: (report: ConfigAuditReport) => report.report.summary.highCount, + [sortBy.medium]: (report: ConfigAuditReport) => report.report.summary.mediumCount, + [sortBy.low]: (report: ConfigAuditReport) => report.report.summary.lowCount, [sortBy.scanner]: (report: ClusterConfigAuditReport) => report.report.scanner.name + " " + report.report.scanner.version, }} searchFilters={[ @@ -79,9 +84,10 @@ export class ConfigAuditReportPage extends React.Component<{ extension: Renderer renderTableHeader={[ {title: "Name", sortBy: sortBy.name}, {title: "Namespace", sortBy: sortBy.namespace}, - {title: "Danger", sortBy: sortBy.danger}, - {title: "Warning", sortBy: sortBy.warning}, - {title: "Pass", sortBy: sortBy.pass}, + {title: "Critical", sortBy: sortBy.critical}, + {title: "High", sortBy: sortBy.high}, + {title: "Medium", sortBy: sortBy.medium}, + {title: "Low", sortBy: sortBy.low}, {title: "Scanner", sortBy: sortBy.scanner}, ]} @@ -89,9 +95,10 @@ export class ConfigAuditReportPage extends React.Component<{ extension: Renderer , report.metadata.namespace, - report.report.summary.dangerCount, - report.report.summary.warningCount, - report.report.summary.passCount, + report.report.summary.criticalCount, + report.report.summary.highCount, + report.report.summary.mediumCount, + report.report.summary.lowCount, report.report.scanner.name + " " + report.report.scanner.version, ]} /> diff --git a/src/configauditreports/types.ts b/src/configauditreports/types.ts index 086d2fd..9998b59 100644 --- a/src/configauditreports/types.ts +++ b/src/configauditreports/types.ts @@ -2,9 +2,10 @@ import {Renderer} from "@k8slens/extensions"; import {Scanner} from "../trivy_operator/types"; export type Summary = { - passCount?: number; - dangerCount: number; - warningCount: number; + criticalCount: number; + highCount: number; + mediumCount: number; + lowCount: number; } export class Check {