Merge pull request #691 from Yamato-Security/690-add-color-to-saved-alerts-and-events-total-events-analyzed

Added color to saved alerts and events total events analyzed

CHANGELOG-Japanese.md

@@ -12,6 +12,7 @@
 - 結果概要を出力しないようにするために `--no-summary` オプションを追加した。 (#672) (@hitenkoku)
 - 結果概要の表示を短縮させた。 (#675 #678) (@hitenkoku)
 - channel_abbreviations.txtによるChannelフィールドのチェックを大文字小文字の区別をなくした。 (#685) (@hitenkoku)
+- 結果概要の検知数と総イベント数の数に色付けを行い見やすくした。 (#690) (@hitenkoku)
 
 **バグ修正:**
 

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:**
 

src/afterfact.rs

@@ -385,17 +385,51 @@ fn emit_csv<W: std::io::Write>(
         };
         write_color_buffer(
             &disp_wtr,
-            get_writable_color(None),
+            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(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(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(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(0, 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!();
         println!();
 
         _print_unique_results(