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.

Sign up for GitHub

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

Merge 4.7.0 into master #963

Merged
merged 14 commits into from
Aug 24, 2023
Merged

Merge 4.7.0 into master #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fbe0736
add suse vd options
vcerenu Aug 10, 2023
57c7eaa
remove stretch and add rhel 9 into VD
vcerenu Aug 10, 2023
f1001c2
add jammy version into VD
vcerenu Aug 11, 2023
cb7d878
Merge pull request #930 from wazuh/926-update-the-vulnerability-detec…
teddytpc1 Aug 14, 2023
c56952e
Revision update
teddytpc1 Aug 17, 2023
865f762
Merge pull request #945 from wazuh/944-bump-revision
teddytpc1 Aug 17, 2023
67f34fb
Revision update
teddytpc1 Aug 17, 2023
41267d4
Merge pull request #946 from wazuh/944-bump-revision-2
teddytpc1 Aug 17, 2023
d531b8d
Resolving conflicts
vcerenu Aug 24, 2023
0826f2c
change revision
vcerenu Aug 24, 2023
c0d9789
Merge pull request #960 from wazuh/merge-4.5.1-into-4.5.2
teddytpc1 Aug 24, 2023
44303d3
resolving conflicts
vcerenu Aug 24, 2023
760fc8c
Merge pull request #961 from wazuh/merge-4.5.2-into-4.6.0
teddytpc1 Aug 24, 2023
2de4a28
Merge pull request #962 from wazuh/merge-4.6.0-into-4.7.0
teddytpc1 Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion multi-node/config/wazuh_cluster/wazuh_manager.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@
<os>xenial</os>
<os>bionic</os>
<os>focal</os>
<os>jammy</os>
<update_interval>1h</update_interval>
</provider>

<!-- Debian OS vulnerabilities -->
<provider name="debian">
<enabled>no</enabled>
<os>stretch</os>
<os>buster</os>
<os>bullseye</os>
<update_interval>1h</update_interval>
Expand All @@ -127,6 +127,7 @@
<os>6</os>
<os>7</os>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>

Expand All @@ -138,6 +139,18 @@
<update_interval>1h</update_interval>
</provider>

<!-- SUSE Linux Enterprise OS vulnerabilities -->
<provider name="suse">
<enabled>no</enabled>
<os>11-server</os>
<os>11-desktop</os>
<os>12-server</os>
<os>12-desktop</os>
<os>15-server</os>
<os>15-desktop</os>
<update_interval>1h</update_interval>
</provider>

<!-- Arch OS vulnerabilities -->
<provider name="arch">
<enabled>no</enabled>
Expand Down
15 changes: 14 additions & 1 deletion multi-node/config/wazuh_cluster/wazuh_worker.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@
<os>xenial</os>
<os>bionic</os>
<os>focal</os>
<os>jammy</os>
<update_interval>1h</update_interval>
</provider>

<!-- Debian OS vulnerabilities -->
<provider name="debian">
<enabled>no</enabled>
<os>stretch</os>
<os>buster</os>
<os>bullseye</os>
<update_interval>1h</update_interval>
Expand All @@ -127,6 +127,7 @@
<os>6</os>
<os>7</os>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>

Expand All @@ -138,6 +139,18 @@
<update_interval>1h</update_interval>
</provider>

<!-- SUSE Linux Enterprise OS vulnerabilities -->
<provider name="suse">
<enabled>no</enabled>
<os>11-server</os>
<os>11-desktop</os>
<os>12-server</os>
<os>12-desktop</os>
<os>15-server</os>
<os>15-desktop</os>
<update_interval>1h</update_interval>
</provider>

<!-- Arch OS vulnerabilities -->
<provider name="arch">
<enabled>no</enabled>
Expand Down
15 changes: 14 additions & 1 deletion single-node/config/wazuh_cluster/wazuh_manager.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@
<os>xenial</os>
<os>bionic</os>
<os>focal</os>
<os>jammy</os>
<update_interval>1h</update_interval>
</provider>

<!-- Debian OS vulnerabilities -->
<provider name="debian">
<enabled>no</enabled>
<os>stretch</os>
<os>buster</os>
<os>bullseye</os>
<update_interval>1h</update_interval>
Expand All @@ -127,6 +127,7 @@
<os>6</os>
<os>7</os>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>

Expand All @@ -138,6 +139,18 @@
<update_interval>1h</update_interval>
</provider>

<!-- SUSE Linux Enterprise OS vulnerabilities -->
<provider name="suse">
<enabled>no</enabled>
<os>11-server</os>
<os>11-desktop</os>
<os>12-server</os>
<os>12-desktop</os>
<os>15-server</os>
<os>15-desktop</os>
<update_interval>1h</update_interval>
</provider>

<!-- Arch OS vulnerabilities -->
<provider name="arch">
<enabled>no</enabled>
Expand Down
Loading