diff --git a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/components/ReportParametersDetails.tsx b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/components/ReportParametersDetails.tsx
index d56573ce59ce1..cdcc723bcc76a 100644
--- a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/components/ReportParametersDetails.tsx
+++ b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/components/ReportParametersDetails.tsx
@@ -123,22 +123,35 @@ function ReportParametersDetails({
{getCVEsDiscoveredSinceText(formValues.reportParameters)}
+
+ Non-optional columns
+ Cluster
+ Namespace
+ Deployment
+ Image
+ Component
+ CVE
+ Fixable
+ CVE Fixed In
+ Severity
+ CVSS
+ Discovered At
+ Reference
+
{(hasIncludeNvdCvss || hasIncludeEpssProbability || hasIncludeAdvisory) && (
Optional columns
{hasIncludeNvdCvss && (
-
- Include NVD CVSS
-
+ NVDCVSS
)}
{hasIncludeEpssProbability && (
- Include EPSS probability
+ EPSS Probability Percentage
)}
{hasIncludeAdvisory && (
- Include advisory
+ Advisory Name and Advisory Link
)}
diff --git a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/exampleReportsCSVData.ts b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/exampleReportsCSVData.ts
deleted file mode 100644
index 136530bcac81f..0000000000000
--- a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/exampleReportsCSVData.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { VulnerabilitySeverity } from 'types/cve.proto';
-
-export type ExampleReportCSVData = {
- cluster: string;
- namespace: string;
- deployment: string;
- image: string;
- component: string;
- cve: string;
- fixable: string;
- componentUpgrade: string;
- severity: VulnerabilitySeverity;
- cvss: number;
- discoveredAt: string;
- reference: string;
-};
-
-const exampleReportsCSVData: ExampleReportCSVData[] = [
- {
- cluster: 'production',
- namespace: 'openshift-config-operator',
- deployment: 'openshift-config-operator',
- image: 'quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a93ae9f08c38eb25ccd70aa44c08624199fe3f2d38efcb5d6627e83c8d165088',
- component: 'bzip2-libs',
- cve: 'CVE-2019-12900',
- fixable: 'false',
- componentUpgrade: '',
- severity: 'LOW_VULNERABILITY_SEVERITY',
- cvss: 3.3,
- discoveredAt: 'January 26, 2022',
- reference: 'https://access.redhat.com/security/cve/CVE-2019-12900',
- },
- {
- cluster: 'production',
- namespace: 'openshift-config-operator',
- deployment: 'openshift-config-operator',
- image: 'quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a93ae9f08c38eb25ccd70aa44c08624199fe3f2d38efcb5d6627e83c8d165088',
- component: 'cryptsetup-libs',
- cve: 'CVE-2021-4122',
- fixable: 'false',
- componentUpgrade: '',
- severity: 'MODERATE_VULNERABILITY_SEVERITY',
- cvss: 5.5,
- discoveredAt: 'January 26, 2022',
- reference: 'https://access.redhat.com/security/cve/CVE-2021-4122',
- },
- {
- cluster: 'production',
- namespace: 'openshift-config-operator',
- deployment: 'openshift-config-operator',
- image: 'quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a93ae9f08c38eb25ccd70aa44c08624199fe3f2d38efcb5d6627e83c8d165088',
- component: 'curl',
- cve: 'RHSA-2021:4511',
- fixable: 'true',
- componentUpgrade: '0:7.61.1-22.el8',
- severity: 'MODERATE_VULNERABILITY_SEVERITY',
- cvss: 5.8,
- discoveredAt: 'January 26, 2022',
- reference: 'https://access.redhat.com/errata/RHSA-2021:4511',
- },
-];
-
-export default exampleReportsCSVData;
diff --git a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportParametersForm.tsx b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportParametersForm.tsx
index 46ad505fab6bc..702d0c7f85f81 100644
--- a/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportParametersForm.tsx
+++ b/ui/apps/platform/src/Containers/Vulnerabilities/VulnerablityReporting/forms/ReportParametersForm.tsx
@@ -318,7 +318,7 @@ function ReportParametersForm({ title, formik }: ReportParametersFormParams): Re
)}
{isIncludeAdvisoryEnabled && (
-
-
- CVE report format
-
-
-
- A sample preview to illustrate the selected parameters in a format
- of CSV with nonactual data.
-
-
- Sara-reporting.csv
-
-
- The data available in the preview is limited by the access scope of
- your role
-
-
-
-
-
-
- | Cluster |
- Namespace |
- Deployment |
- Image |
- Component |
- CVE |
- Fixable |
- Component Upgrade |
- Severity |
- CVSS |
- Discovered At |
- Reference |
-
-
-
- {exampleReportsCSVData.map(
- ({
- cluster,
- namespace,
- deployment,
- image,
- component,
- cve,
- fixable,
- componentUpgrade,
- severity,
- cvss,
- discoveredAt,
- reference,
- }) => {
- return (
-
- | {cluster} |
- {namespace} |
- {deployment} |
- {image} |
- {component} |
- {cve} |
- {fixable} |
-
- {componentUpgrade}
- |
-
-
- |
- {cvss} |
-
- {discoveredAt}
- |
- {reference} |
-
- );
- }
- )}
-
-
-
-
-
>
);