Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed Details output in json-timeline output to original rule order #1265

Merged

Conversation

hitenkoku
Copy link
Collaborator

What Changed

  • Changed the Details output in json-timeline command from alphabetical order to the original order.

I would appreciate it if you could review when you have time.

@hitenkoku hitenkoku added the invalid This doesn't seem right label Feb 3, 2024
@hitenkoku hitenkoku self-assigned this Feb 3, 2024
@hitenkoku hitenkoku linked an issue Feb 3, 2024 that may be closed by this pull request
@hitenkoku hitenkoku changed the title 1264 json output does not output in original order Changed Details output in json-timeline output to original rule order Feb 3, 2024
Copy link

codecov bot commented Feb 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8c2a859) 82.17% compared to head (5678989) 82.18%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1265   +/-   ##
=======================================
  Coverage   82.17%   82.18%           
=======================================
  Files          27       27           
  Lines       24260    24269    +9     
=======================================
+ Hits        19936    19945    +9     
  Misses       4324     4324           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@hitenkoku
Copy link
Collaborator Author

Evidence

  • previous version

Please check #1264 description.

  • This PR

I used rule in #1264 description (rest.yml in following command).

>  .\1264.exe json-timeline -d ../hayabusa-sample-evtx -r .\test.yml -w -o 1264.json -C
> cat 1264.json
{
    "Timestamp": "2013-10-24 01:16:27.000 +09:00",
    "Computer": "37L4247D28-05",
    "Channel": "Sys",
    "EventID": 6009,
    "Level": "info",
    "RecordID": 3,
    "RuleTitle": "Computer Startup",
    "Details": {
        "First": "6.01.",
        "Second": 7600,
        "Third": "",
        "Forth": "Multiprocessor Free",
        "Fifth": 16385
    }
}
...       

Copy link
Collaborator

@fukusuket fukusuket left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirmed that both csv-timeline/json-timeline work :) LGTM!!🚀

Copy link
Collaborator

@YamatoSecurity YamatoSecurity left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hitenkoku LGTM! Thank you!

@YamatoSecurity YamatoSecurity merged commit 6eb5c73 into main Feb 4, 2024
7 checks passed
@hitenkoku hitenkoku deleted the 1264-json-output-does-not-output-in-original-order branch February 4, 2024 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
invalid This doesn't seem right
Projects
None yet
Development

Successfully merging this pull request may close these issues.

JSON output does not output in original order
3 participants