Skip to content

Remove OpenSCAP policies installation and configuration block#5061

Merged
vikman90 merged 4 commits into3.13from
3.13-remove-oscap-conf
May 20, 2020
Merged

Remove OpenSCAP policies installation and configuration block#5061
vikman90 merged 4 commits into3.13from
3.13-remove-oscap-conf

Conversation

@BraulioV
Copy link
Copy Markdown
Contributor

@BraulioV BraulioV commented May 18, 2020 •
edited
Loading

Related issue
wazuh/wazuh-packages#426

Description

Hi team,

This PR removes the installation of OpenSCAP policies and the configuration block from the ossec.conf. To do so, basically, all the WriteOpenSCAP lines have been removed from the inst-functions.sh script.

Configuration options

NA

Logs/Alerts example

NA

Tests

  • Compilation without warnings in every supported platform
    • Linux
    • Windows
    • MAC OS X
  • Source installation
  • Package installation
  • Source upgrade
  • Package upgrade
  • Review logs syntax and correct language

@BraulioV BraulioV marked this pull request as ready for review May 19, 2020 16:03
@BraulioV BraulioV requested review from okynos and vikman90 May 19, 2020 16:03
@BraulioV BraulioV added module/openscap type/enhancement New feature or request module/install Issue related to the installation process module/upgrade Issue related to the upgrade process labels May 19, 2020
@wazuhci
Copy link
Copy Markdown
Contributor

wazuhci commented May 19, 2020

Analysis_dynamic_valgrind logcollector analysis:

Commit: 49ea5da
Parameters: track-origins="yes" leak-check="full" keep-stacktraces="alloc-and-free" track-fds="yes" num-callers="20" show-leak-kinds="definite,indirect"
Agent config: ossec.conf
Agent logs: ossec.log
Coverage:

Lines executed:31.41% of 1859

Coverage report detail: coverage-report-summary
Valgrind result: Analysis_dynamic_valgrind-v3.13.0-B1953.log

@wazuhci
Copy link
Copy Markdown
Contributor

wazuhci commented May 19, 2020

Analysis_dynamic_valgrind syscheckd analysis:

Commit: 49ea5da
Parameters: track-origins="yes" leak-check="full" keep-stacktraces="alloc-and-free" track-fds="yes" num-callers="20" show-leak-kinds="definite,indirect"
Agent config: ossec.conf
Agent logs: ossec.log
Coverage:

Lines executed:26.73% of 3187

Coverage report detail: coverage-report-summary
Valgrind result: Analysis_dynamic_valgrind-v3.13.0-B1954.log

@wazuhci
Copy link
Copy Markdown
Contributor

wazuhci commented May 20, 2020

Analysis_dynamic_valgrind logcollector analysis:

Commit: dd511c7
Parameters: track-origins="yes" leak-check="full" keep-stacktraces="alloc-and-free" track-fds="yes" num-callers="20" show-leak-kinds="definite,indirect"
Agent config: ossec.conf
Agent logs: ossec.log
Coverage:

Lines executed:31.41% of 1859

Coverage report detail: coverage-report-summary
Valgrind result: Analysis_dynamic_valgrind-v3.13.0-B1987.log

@wazuhci
Copy link
Copy Markdown
Contributor

wazuhci commented May 20, 2020

Analysis_dynamic_valgrind syscheckd analysis:

Commit: dd511c7
Parameters: track-origins="yes" leak-check="full" keep-stacktraces="alloc-and-free" track-fds="yes" num-callers="20" show-leak-kinds="definite,indirect"
Agent config: ossec.conf
Agent logs: ossec.log
Coverage:

Lines executed:26.73% of 3187

Coverage report detail: coverage-report-summary
Valgrind result: Analysis_dynamic_valgrind-v3.13.0-B1988.log

vikman90
vikman90 approved these changes May 20, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@vikman90 vikman90 left a comment

Choose a reason for hiding this comment

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

LGTM!

@wazuhci
Copy link
Copy Markdown
Contributor

wazuhci commented May 20, 2020

Analysis_dynamic_valgrind logcollector analysis:

Commit: b7b16ec
Parameters: track-origins="yes" leak-check="full" keep-stacktraces="alloc-and-free" track-fds="yes" num-callers="20" show-leak-kinds="definite,indirect"
Agent config: ossec.conf
Agent logs: ossec.log
Coverage:

Lines executed:31.41% of 1859

Coverage report detail: coverage-report-summary
Valgrind result: Analysis_dynamic_valgrind-v3.13.0-B2006.log

@wazuhci
Copy link
Copy Markdown
Contributor

wazuhci commented May 20, 2020

Analysis_dynamic_valgrind syscheckd analysis:

Commit: b7b16ec
Parameters: track-origins="yes" leak-check="full" keep-stacktraces="alloc-and-free" track-fds="yes" num-callers="20" show-leak-kinds="definite,indirect"
Agent config: ossec.conf
Agent logs: ossec.log
Coverage:

Lines executed:26.73% of 3187

Coverage report detail: coverage-report-summary
Valgrind result: Analysis_dynamic_valgrind-v3.13.0-B2007.log

@vikman90 vikman90 self-assigned this May 20, 2020
@vikman90 vikman90 merged commit 6ccd234 into 3.13 May 20, 2020
@vikman90 vikman90 deleted the 3.13-remove-oscap-conf branch May 20, 2020 15:10
@BraulioV BraulioV mentioned this pull request May 20, 2020
Closed
7 tasks
@BraulioV BraulioV mentioned this pull request Jun 3, 2020
Merged
7 tasks
@alberpilot alberpilot mentioned this pull request Jan 29, 2021
Closed
30 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vikman90 vikman90 vikman90 approved these changes

@okynos okynos Awaiting requested review from okynos

Assignees

@vikman90 vikman90

Labels

module/install Issue related to the installation process module/openscap module/upgrade Issue related to the upgrade process type/enhancement New feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@BraulioV @wazuhci @vikman90
⚡