fix process monitor formatting #175
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CharityKathure
requested review from
profnandaa,
TinaMor,
iankingori,
bobsira,
billywr and
danielGithinji
TinaMor
approved these changes
May 27, 2024
billywr
approved these changes
May 27, 2024
profnandaa
reviewed
May 27, 2024
profnandaa
approved these changes
May 27, 2024
|
As for the PR base, reason we're going for |
|
@profnandaa main has only the JSON formatting option (there is no log formatting option in config). release/2.2 branch has the This issue will only be noted in rc2.1.0. |
Got it. I think after the merge we can discuss switching the branches so that the code currently shipping can be in |
CharityKathure
added a commit
that referenced
this pull request
Jul 24, 2024
* feat: adding support for legacy XML log output (#119) * Custom Log Format (#124) * Make JSON the default log format --------- Co-authored-by: Charity Kathure <ckathure@microsoft.com> * Custom JSON Log Sanitization (#128) --------- Co-authored-by: Charity Kathure <ckathure@microsoft.com> * Formatting for scalar integer property values using TdhFormatProperty (#129) --------- Co-authored-by: Bob Sira <bosira@microsoft.com> * docs: configurable / custom log format (#136) --------- Co-authored-by: Charity Kathure <ckathure@microsoft.com> * fix process monitor formatting (#175) --------- Co-authored-by: Charity Kathure <ckathure@microsoft.com> * Process Monitor Custom Logging (#176) Signed-off-by: Charity Kathure <ckathure@microsoft.com> --------- Signed-off-by: Charity Kathure <ckathure@microsoft.com> Co-authored-by: Charity Kathure <ckathure@microsoft.com> * Resolve build error and lint issues, and add process monitor details into the docs Signed-off-by: Charity Kathure <ckathure@microsoft.com> --------- Signed-off-by: Charity Kathure <ckathure@microsoft.com> Co-authored-by: Charity Kathure <ckathure@microsoft.com> Co-authored-by: Bob Sira <sbobfitz2@gmail.com> Co-authored-by: Bob Sira <bosira@microsoft.com> Co-authored-by: Ian King'ori <kingorim.ian@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addressing issue: #171
Issue Description:
Log Monitor allows users to specify the log format (Custom, JSON, or XML) for ETW, Event logs, and File logs through the respective sections in the config.json file.
However, in the case of process monitor logs, whose specifications are not captured in the config file, the logs should default to JSON unless the user specifies XML as the desired log format.
In the current implementation (in rc2.1.0), the default log format is XML unless JSON is specified. This is why when rc2.1.0 users specify
"logFormat": "custom"the process monitor logs default to XML format.For example:
This change ensures that the default log format is
JSON