From 31988f2f08bb6e93d1ba62eddef682e64d34032f Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Fri, 9 Sep 2022 11:54:35 +0900 Subject: [PATCH 1/3] Add color to Saved alerts and events / Total events analyzed #690 --- src/afterfact.rs | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/src/afterfact.rs b/src/afterfact.rs index 4bf61ee6..42846970 100644 --- a/src/afterfact.rs +++ b/src/afterfact.rs @@ -385,17 +385,50 @@ fn emit_csv( }; write_color_buffer( &disp_wtr, - get_writable_color(None), + get_writable_color(Some(Color::Rgb(0, 255, 0))), + "Saved alerts and events", + false, + ) + .ok(); + write_color_buffer(&disp_wtr, get_writable_color(None), "/", false).ok(); + write_color_buffer( + &disp_wtr, + get_writable_color(Some(Color::Rgb(0, 255, 255))), + "Total events analyzed", + false, + ) + .ok(); + write_color_buffer(&disp_wtr, get_writable_color(None), ": ", false).ok(); + write_color_buffer( + &disp_wtr, + get_writable_color(Some(Color::Rgb(0, 255, 0))), + &(all_record_cnt - reducted_record_cnt).to_formatted_string(&Locale::en), + false, + ) + .ok(); + write_color_buffer(&disp_wtr, get_writable_color(None), "/", false).ok(); + + write_color_buffer( + &disp_wtr, + get_writable_color(Some(Color::Rgb(0, 255, 255))), + &all_record_cnt.to_formatted_string(&Locale::en), + false, + ) + .ok(); + write_color_buffer(&disp_wtr, get_writable_color(None), "(", false).ok(); + write_color_buffer( + &disp_wtr, + get_writable_color(Some(Color::Rgb(255, 255, 0))), &format!( - "Saved alerts and events / Total events analyzed: {} / {} (Data reduction: {} events ({:.2}%))", - (all_record_cnt - reducted_record_cnt).to_formatted_string(&Locale::en), - all_record_cnt.to_formatted_string(&Locale::en), + "Data reduction: {} events ({:.2}%)", reducted_record_cnt.to_formatted_string(&Locale::en), reducted_percent ), - true, + false, ) .ok(); + + write_color_buffer(&disp_wtr, get_writable_color(None), ")", false).ok(); println!(); _print_unique_results( From 37238649bc38d4daee724404e141161decd36f22 Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Fri, 9 Sep 2022 11:56:54 +0900 Subject: [PATCH 2/3] updated changelog #690 --- CHANGELOG-Japanese.md | 1 + CHANGELOG.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG-Japanese.md b/CHANGELOG-Japanese.md index e9398d53..9cc9c02d 100644 --- a/CHANGELOG-Japanese.md +++ b/CHANGELOG-Japanese.md @@ -12,6 +12,7 @@ - 結果概要を出力しないようにするために `--no-summary` オプションを追加した。 (#672) (@hitenkoku) - 結果概要の表示を短縮させた。 (#675 #678) (@hitenkoku) - channel_abbreviations.txtによるChannelフィールドのチェックを大文字小文字の区別をなくした。 (#685) (@hitenkoku) +- 結果概要の検知数と総イベント数の数に色付けを行い見やすくした。 (#690) (@hitenkoku) **バグ修正:** diff --git a/CHANGELOG.md b/CHANGELOG.md index cd145245..43550d70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added `--no-summary` option to not display the results summary. (#672) (@hitenkoku) - Made the results summary more compact. (#675 #678) (@hitenkoku) - Made Channel field in channel_abbreviations.txt case-insensitive. (#685) (@hitenkoku) +- Added color to Saved alerts and events / Total events analyzed. (#690) (@hitenkoku) **Bug Fixes:** From b2331058ce7987187bb493d6fb6501312aed7e52 Mon Sep 17 00:00:00 2001 From: Yamato Security <71482215+YamatoSecurity@users.noreply.github.com> Date: Fri, 9 Sep 2022 12:17:41 +0900 Subject: [PATCH 3/3] add space, change colors --- src/afterfact.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/afterfact.rs b/src/afterfact.rs index 42846970..68a2ef55 100644 --- a/src/afterfact.rs +++ b/src/afterfact.rs @@ -385,12 +385,12 @@ fn emit_csv( }; write_color_buffer( &disp_wtr, - get_writable_color(Some(Color::Rgb(0, 255, 0))), + get_writable_color(Some(Color::Rgb(255, 255, 0))), "Saved alerts and events", false, ) .ok(); - write_color_buffer(&disp_wtr, get_writable_color(None), "/", false).ok(); + write_color_buffer(&disp_wtr, get_writable_color(None), " / ", false).ok(); write_color_buffer( &disp_wtr, get_writable_color(Some(Color::Rgb(0, 255, 255))), @@ -401,12 +401,12 @@ fn emit_csv( write_color_buffer(&disp_wtr, get_writable_color(None), ": ", false).ok(); write_color_buffer( &disp_wtr, - get_writable_color(Some(Color::Rgb(0, 255, 0))), + get_writable_color(Some(Color::Rgb(255, 255, 0))), &(all_record_cnt - reducted_record_cnt).to_formatted_string(&Locale::en), false, ) .ok(); - write_color_buffer(&disp_wtr, get_writable_color(None), "/", false).ok(); + write_color_buffer(&disp_wtr, get_writable_color(None), " / ", false).ok(); write_color_buffer( &disp_wtr, @@ -415,10 +415,10 @@ fn emit_csv( false, ) .ok(); - write_color_buffer(&disp_wtr, get_writable_color(None), "(", false).ok(); + write_color_buffer(&disp_wtr, get_writable_color(None), " (", false).ok(); write_color_buffer( &disp_wtr, - get_writable_color(Some(Color::Rgb(255, 255, 0))), + get_writable_color(Some(Color::Rgb(0, 255, 0))), &format!( "Data reduction: {} events ({:.2}%)", reducted_record_cnt.to_formatted_string(&Locale::en), @@ -430,6 +430,7 @@ fn emit_csv( write_color_buffer(&disp_wtr, get_writable_color(None), ")", false).ok(); println!(); + println!(); _print_unique_results( total_detect_counts_by_level,