update cluster cve report schema

Author: Mark Dalton Gray

articles/operator-nexus/howto-baremetal-run-data-extract.md

@@ -192,7 +192,6 @@ The current list of supported commands are
 - [Collect Helm Releases](#collect-helm-releases)\
   Command Name: `collect-helm-releases`\
   Arguments: None
-  
 - [Collect `systemctl status` Output](#collect-systemctl-status-output)\
   Command Name: `platform-services-status`\
   Arguments: None
@@ -501,6 +500,10 @@ https://cmkfjft8twwpst.blob.core.windows.net/bmm-run-command-output/20b217b5-ea3
           "type": "string",
           "description": "The name of the resource."
         },
+        "clusterId": {
+          "type": "string",
+          "description": "The resource ID of the cluster."
+        },
         "runtimeVersion": {
           "type": "string",
           "description": "The version of the runtime."
@@ -512,35 +515,41 @@ https://cmkfjft8twwpst.blob.core.windows.net/bmm-run-command-output/20b217b5-ea3
         "vulnerabilitySummary": {
           "type": "object",
           "properties": {
-            "criticalCount": {
-              "type": "integer",
-              "description": "Number of critical vulnerabilities."
-            },
-            "highCount": {
-              "type": "integer",
-              "description": "Number of high severity vulnerabilities."
-            },
-            "mediumCount": {
-              "type": "integer",
-              "description": "Number of medium severity vulnerabilities."
-            },
-            "lowCount": {
-              "type": "integer",
-              "description": "Number of low severity vulnerabilities."
-            },
-            "noneCount": {
-              "type": "integer",
-              "description": "Number of vulnerabilities with no severity."
+            "uniqueVulnerabilities": {
+              "type": "object",
+              "properties": {
+                "critical": { "type": "integer" },
+                "high": { "type": "integer" },
+                "medium": { "type": "integer" },
+                "low": { "type": "integer" },
+                "unknown": { "type": "integer" }
+              },
+              "required": ["critical", "high", "medium", "low", "unknown"]
             },
-            "unknownCount": {
-              "type": "integer",
-              "description": "Number of vulnerabilities with unknown severity."
+            "totalVulnerabilities": {
+              "type": "object",
+              "properties": {
+                "critical": { "type": "integer" },
+                "high": { "type": "integer" },
+                "medium": { "type": "integer" },
+                "low": { "type": "integer" },
+                "unknown": { "type": "integer" }
+              },
+              "required": ["critical", "high", "medium", "low", "unknown"]
             }
           },
-          "required": ["criticalCount", "highCount", "mediumCount", "lowCount", "noneCount", "unknownCount"]
+          "required": ["uniqueVulnerabilities", "totalVulnerabilities"]
         }
       },
-      "required": ["dateRetrieved", "platform", "resource", "runtimeVersion", "managementVersion", "vulnerabilitySummary"]
+      "required": [
+        "dateRetrieved",
+        "platform",
+        "resource",
+        "clusterId",
+        "runtimeVersion",
+        "managementVersion",
+        "vulnerabilitySummary"
+      ]
     },
     "containers": {
       "type": "object",
@@ -550,13 +559,18 @@ https://cmkfjft8twwpst.blob.core.windows.net/bmm-run-command-output/20b217b5-ea3
           "type": "object",
           "properties": {
             "namespace": {
-              "type": "string",
-              "description": "The namespace of the container."
+              "type": "array",
+              "description": "The namespaces where the container image is in-use.",
+              "items": { "type": "string" }
             },
             "digest": {
               "type": "string",
               "description": "The digest of the container image."
             },
+            "observedCount": {
+              "type": "integer",
+              "description": "The number of times the container image has been observed."
+            },
             "os": {
               "type": "object",
               "properties": {
@@ -567,97 +581,46 @@ https://cmkfjft8twwpst.blob.core.windows.net/bmm-run-command-output/20b217b5-ea3
               },
               "required": ["family"]
             },
-            "summary": {
-              "type": "object",
-              "properties": {
-                "criticalCount": {
-                  "type": "integer",
-                  "description": "Number of critical vulnerabilities in this container."
-                },
-                "highCount": {
-                  "type": "integer",
-                  "description": "Number of high severity vulnerabilities in this container."
-                },
-                "lowCount": {
-                  "type": "integer",
-                  "description": "Number of low severity vulnerabilities in this container."
-                },
-                "mediumCount": {
-                  "type": "integer",
-                  "description": "Number of medium severity vulnerabilities in this container."
-                },
-                "noneCount": {
-                  "type": "integer",
-                  "description": "Number of vulnerabilities with no severity in this container."
-                },
-                "unknownCount": {
-                  "type": "integer",
-                  "description": "Number of vulnerabilities with unknown severity in this container."
-                }
-              },
-              "required": ["criticalCount", "highCount", "lowCount", "mediumCount", "noneCount", "unknownCount"]
-            },
             "vulnerabilities": {
               "type": "array",
               "items": {
                 "type": "object",
                 "properties": {
-                  "title": {
-                    "type": "string",
-                    "description": "Title of the vulnerability."
-                  },
-                  "vulnerabilityID": {
-                    "type": "string",
-                    "description": "Identifier of the vulnerability."
-                  },
-                  "fixedVersion": {
-                    "type": "string",
-                    "description": "The version in which the vulnerability is fixed."
-                  },
-                  "installedVersion": {
-                    "type": "string",
-                    "description": "The currently installed version."
-                  },
-                  "referenceLink": {
-                    "type": "string",
-                    "format": "uri",
-                    "description": "Link to the vulnerability details."
-                  },
-                  "publishedDate": {
-                    "type": "string",
-                    "format": "date-time",
-                    "description": "The date when the vulnerability was published."
-                  },
-                  "score": {
-                    "type": "number",
-                    "description": "The CVSS score of the vulnerability."
-                  },
-                  "severity": {
-                    "type": "string",
-                    "description": "The severity level of the vulnerability."
-                  },
-                  "resource": {
-                    "type": "string",
-                    "description": "The resource affected by the vulnerability."
-                  },
-                  "target": {
-                    "type": "string",
-                    "description": "The target of the vulnerability."
-                  },
-                  "packageType": {
-                    "type": "string",
-                    "description": "The type of the package."
-                  },
-                  "exploitAvailable": {
-                    "type": "boolean",
-                    "description": "Indicates if an exploit is available for the vulnerability."
-                  }
+                  "title": { "type": "string" },
+                  "vulnerabilityID": { "type": "string" },
+                  "fixedVersion": { "type": "string" },
+                  "installedVersion": { "type": "string" },
+                  "referenceLink": { "type": "string", "format": "uri" },
+                  "publishedDate": { "type": "string", "format": "date-time" },
+                  "dataSource": { "type": "string" },
+                  "score": { "type": "number" },
+                  "severity": { "type": "string" },
+                  "severitySource": { "type": "string" },
+                  "resource": { "type": "string" },
+                  "target": { "type": "string" },
+                  "packageType": { "type": "string" },
+                  "exploitAvailable": { "type": "boolean" }
                 },
-                "required": ["title", "vulnerabilityID", "fixedVersion", "installedVersion", "referenceLink", "publishedDate", "score", "severity", "resource", "target", "packageType", "exploitAvailable"]
+                "required": [
+                  "title",
+                  "vulnerabilityID",
+                  "fixedVersion",
+                  "installedVersion",
+                  "referenceLink",
+                  "publishedDate",
+                  "dataSource",
+                  "score",
+                  "severity",
+                  "severitySource",
+                  "resource",
+                  "target",
+                  "packageType",
+                  "exploitAvailable"
+                ]
               }
             }
           },
-          "required": ["namespace", "digest", "os", "summary", "vulnerabilities"]
+          "required": ["namespace", "digest", "os", "observedCount", "vulnerabilities"]
         }
       }
     }