yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Merge pull request #962 from wazuh/merge-4.6.0-into-4.7.0

Browse Source 
Merge 4.6.0 into 4.7.0
This commit is contained in:
Gonzalo Acuña
2023-08-24 13:14:32 -03:00
committed by GitHub
parent 17ed766228 760fc8ccbf
commit 2de4a28098
3 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multi-node/config/wazuh_cluster/wazuh_manager.conf
+14 -1
View File
@@ -108,13 +108,13 @@
<os>xenial</os> <os>xenial</os>
<os>bionic</os> <os>bionic</os>
<os>focal</os> <os>focal</os>
<os>jammy</os>
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
</provider> </provider>
<!-- Debian OS vulnerabilities --> <!-- Debian OS vulnerabilities -->
<provider name="debian"> <provider name="debian">
<enabled>no</enabled> <enabled>no</enabled>
<os>stretch</os>
<os>buster</os> <os>buster</os>
<os>bullseye</os> <os>bullseye</os>
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
@@ -127,6 +127,7 @@
<os>6</os> <os>6</os>
<os>7</os> <os>7</os>
<os>8</os> <os>8</os>
<os>9</os>
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
</provider> </provider>
@@ -138,6 +139,18 @@
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
</provider> </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 --> <!-- Arch OS vulnerabilities -->
<provider name="arch"> <provider name="arch">
<enabled>no</enabled> <enabled>no</enabled>
multi-node/config/wazuh_cluster/wazuh_worker.conf
+14 -1
View File
@@ -108,13 +108,13 @@
<os>xenial</os> <os>xenial</os>
<os>bionic</os> <os>bionic</os>
<os>focal</os> <os>focal</os>
<os>jammy</os>
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
</provider> </provider>
<!-- Debian OS vulnerabilities --> <!-- Debian OS vulnerabilities -->
<provider name="debian"> <provider name="debian">
<enabled>no</enabled> <enabled>no</enabled>
<os>stretch</os>
<os>buster</os> <os>buster</os>
<os>bullseye</os> <os>bullseye</os>
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
@@ -127,6 +127,7 @@
<os>6</os> <os>6</os>
<os>7</os> <os>7</os>
<os>8</os> <os>8</os>
<os>9</os>
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
</provider> </provider>
@@ -138,6 +139,18 @@
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
</provider> </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 --> <!-- Arch OS vulnerabilities -->
<provider name="arch"> <provider name="arch">
<enabled>no</enabled> <enabled>no</enabled>
single-node/config/wazuh_cluster/wazuh_manager.conf
+14 -1
View File
@@ -108,13 +108,13 @@
<os>xenial</os> <os>xenial</os>
<os>bionic</os> <os>bionic</os>
<os>focal</os> <os>focal</os>
<os>jammy</os>
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
</provider> </provider>
<!-- Debian OS vulnerabilities --> <!-- Debian OS vulnerabilities -->
<provider name="debian"> <provider name="debian">
<enabled>no</enabled> <enabled>no</enabled>
<os>stretch</os>
<os>buster</os> <os>buster</os>
<os>bullseye</os> <os>bullseye</os>
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
@@ -127,6 +127,7 @@
<os>6</os> <os>6</os>
<os>7</os> <os>7</os>
<os>8</os> <os>8</os>
<os>9</os>
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
</provider> </provider>
@@ -138,6 +139,18 @@
<update_interval>1h</update_interval> <update_interval>1h</update_interval>
</provider> </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 --> <!-- Arch OS vulnerabilities -->
<provider name="arch"> <provider name="arch">
<enabled>no</enabled> <enabled>no</enabled>