From 72853947ffc511170f0416b682374efb892f91df Mon Sep 17 00:00:00 2001 From: gnmahanth Date: Fri, 24 Nov 2023 08:14:42 +0000 Subject: [PATCH 1/3] use check type while generating node_id --- scanner/scanner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanner/scanner.go b/scanner/scanner.go index a3282fd..7e9e739 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -134,7 +134,7 @@ func (c *ComplianceScanner) RunComplianceScan() error { Status: strings.ToLower(item.Level), RemediationScript: item.Remediation, RemediationPuppet: item.RemediationImpact, - NodeID: fmt.Sprintf("%x", md5.Sum([]byte(c.config.NodeID+c.config.ScanID+item.TestNum+item.TestCategory))), + NodeID: fmt.Sprintf("%x", md5.Sum([]byte(c.config.NodeID+c.config.ScanID+item.TestNum+item.TestCategory+complianceCheckType))), NodeType: "host", NodeName: c.config.NodeName, ComplianceCheckType: complianceCheckType, From 5dc64a3ba6cbb523592f2bd2dcc84b758ce81d02 Mon Sep 17 00:00:00 2001 From: gnmahanth Date: Fri, 24 Nov 2023 10:19:37 +0000 Subject: [PATCH 2/3] fix test number --- scanner/scanner.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/scanner/scanner.go b/scanner/scanner.go index 7e9e739..3ddc5e2 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -121,19 +121,20 @@ func (c *ComplianceScanner) RunComplianceScan() error { timestampStr := util.GetDatetimeNow() for _, item := range benchItems { compScan := util.ComplianceDoc{ - Type: util.ComplianceScanLogs, - TimeStamp: timestamp, - Timestamp: timestampStr, - Masked: false, - TestCategory: item.TestCategory, - TestNumber: item.TestNum, - TestInfo: item.Header, - TestRationale: "", - TestSeverity: "", - TestDesc: item.TestNum + " - " + item.Level, - Status: strings.ToLower(item.Level), - RemediationScript: item.Remediation, - RemediationPuppet: item.RemediationImpact, + Type: util.ComplianceScanLogs, + TimeStamp: timestamp, + Timestamp: timestampStr, + Masked: false, + TestCategory: item.TestCategory, + TestNumber: complianceCheckType + "_" + item.TestNum, + TestInfo: item.Header, + TestRationale: "", + TestSeverity: "", + TestDesc: item.TestNum + " - " + item.Level, + Status: strings.ToLower(item.Level), + RemediationScript: item.Remediation, + RemediationPuppet: item.RemediationImpact, + // NodeID: fmt.Sprintf("%x", md5.Sum([]byte(c.config.NodeID+c.config.ScanID+item.TestNum+item.TestCategory+complianceCheckType))), NodeID: fmt.Sprintf("%x", md5.Sum([]byte(c.config.NodeID+c.config.ScanID+item.TestNum+item.TestCategory+complianceCheckType))), NodeType: "host", NodeName: c.config.NodeName, From d2fbca647bd44f341210d5dd2eb0ce7b83beb53c Mon Sep 17 00:00:00 2001 From: gnmahanth Date: Fri, 24 Nov 2023 13:41:18 +0000 Subject: [PATCH 3/3] fix node id --- scanner/scanner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scanner/scanner.go b/scanner/scanner.go index 3ddc5e2..e141d52 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -134,8 +134,8 @@ func (c *ComplianceScanner) RunComplianceScan() error { Status: strings.ToLower(item.Level), RemediationScript: item.Remediation, RemediationPuppet: item.RemediationImpact, - // NodeID: fmt.Sprintf("%x", md5.Sum([]byte(c.config.NodeID+c.config.ScanID+item.TestNum+item.TestCategory+complianceCheckType))), - NodeID: fmt.Sprintf("%x", md5.Sum([]byte(c.config.NodeID+c.config.ScanID+item.TestNum+item.TestCategory+complianceCheckType))), + NodeID: fmt.Sprintf("%x", md5.Sum([]byte(c.config.NodeID+c.config.ScanID+ + item.TestNum+item.TestCategory+complianceCheckType))), NodeType: "host", NodeName: c.config.NodeName, ComplianceCheckType: complianceCheckType,