From 6895c71a5faa9af1fdedf92b305f643a012f77a2 Mon Sep 17 00:00:00 2001 From: d4t4king Date: Wed, 2 Oct 2019 21:07:04 -0700 Subject: [PATCH] Tweakedwarning and suggestion tables to better match new function fields --- lynis-report-converter.pl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lynis-report-converter.pl b/lynis-report-converter.pl index e2fce09..48dae48 100755 --- a/lynis-report-converter.pl +++ b/lynis-report-converter.pl @@ -475,10 +475,10 @@ if ($json) { 'banded_columns' => 0, 'banded_rows' => 1, 'columns' => [ - { 'header' => 'Warning ID' }, + { 'header' => 'Test ID' }, { 'header' => 'Description' }, - { 'header' => 'Severity' }, - { 'header' => 'F4' }, + { 'header' => 'Details' }, + { 'header' => 'Solution' }, ] ); #print STDERR Dumper(\%params); @@ -509,10 +509,10 @@ if ($json) { 'banded_columns' => 0, 'banded_rows' => 1, 'columns' => [ - { 'header' => 'Suggestion ID' }, + { 'headet' => 'Test ID' }, { 'header' => 'Description' }, - { 'header' => 'Severity' }, - { 'header' => 'F4' }, + { 'header' => 'Details' }, + { 'header' => 'Solution' }, ] ); $last_row_number = $next_row + scalar(@table_data); @@ -1297,7 +1297,7 @@ END print OUT < - + END if (exists($lynis_report_data{'warning[]'})) { if (ref($lynis_report_data{'warning[]'}) eq 'ARRAY') { @@ -1333,7 +1333,7 @@ END print OUT <
Warning IDDescriptionSeverityF4
Test IDDescriptionDetailsSolution
- + END if ((ref($lynis_report_data{'suggestion[]'}) eq 'ARRAY') and (${$lynis_report_data{'suggestion[]'}}[0] =~ /\|/)) {
Suggestion IDDescriptionSeverityF4
Test IDDescriptionDetailsSolution