Skip to content

Conversation

@atomicturtle
Copy link
Member

Merge from Pedro S [email protected]

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 [email protected]

Signed-off-by: Scott R. Shinn [email protected]

Merge from Pedro S <[email protected]>

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 <[email protected]>

/* 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.

2 participants