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

JSON output support for archives.log and agent_control #1596

Merged
merged 2 commits into from
Dec 17, 2018

Conversation

atomicturtle
Copy link
Member

Merge from Pedro S pedro@wazuh.com

agent_control changes:
Adds the -j output modifier to agent_control for simple json format

archives.log changes:

<jsonout_output>yes</jsonout_output>

will also modify archives.log output to format in json. Note: finer
tuned configuration setting for this is planned in another pull request.

Merge from Pedro S pedro@wazuh.com

Signed-off-by: Scott R. Shinn scott@atomicorp.com

Merge from Pedro S <pedro@wazuh.com>

agent_control changes:
Adds the -j output modifier to agent_control for simple json format

archives.log changes:

<jsonout_output>yes</jsonout_output>

will also modify archives.log output to format in json. Note: finer
tuned configuration setting for this is planned in another pull request.

Signed-off-by: Scott R. Shinn <scott@atomicorp.com>
@@ -23,9 +23,11 @@ int OS_GetLogLocation(const Eventinfo *lf);

/* Global declarations */
extern FILE *_eflog;
extern FILE *_ejflog;
Copy link
Member

Choose a reason for hiding this comment

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

This is defined twice.

@ddpbsd ddpbsd merged commit 20438ca into ossec:master Dec 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants