Merge pull request #1025 from wazuh/1022-merge-4.9.0-into-master

Merge 4.9.0 into master
wazuh · May 31, 2024 · a604de2 · a604de2
2 parents f4252b1 + e267021
commit a604de2
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 11 deletions.
diff --git a/.github/install_stack/action.yml b/.github/install_stack/action.yml
@@ -5,11 +5,46 @@ runs:
       shell: bash
       run: |
         hostname=$(sudo puppetserver ca list --all | awk '{if(NR>1)print $1;}'| sed 's/[.]$//')
-        sudo echo "127.0.0.1 "$hostname | sudo tee -a /etc/hosts > /dev/null
-        sudo echo "node "\"$hostname\"" {" | sudo tee -a /etc/puppetlabs/code/environments/production/manifests/stack.pp  > /dev/null
-        sudo echo "class {'wazuh::manager':} ->  class {'wazuh::indexer':} -> class {'wazuh::filebeat_oss':} -> class {'wazuh::dashboard':}" | sudo tee -a /etc/puppetlabs/code/environments/production/manifests/stack.pp > /dev/null
-        sudo echo "}" | sudo tee -a /etc/puppetlabs/code/environments/production/manifests/stack.pp > /dev/null
-        sudo cat /etc/puppetlabs/code/environments/production/manifests/stack.pp
+        sudo cat <<EOF | sudo tee -a /etc/puppetlabs/code/environments/production/manifests/stack.pp > /dev/null
+        \$discovery_type = 'single-node'
+        stage { 'certificates': }
+        stage { 'repo': }
+        stage { 'indexerdeploy': }
+        stage { 'securityadmin': }
+        stage { 'dashboard': }
+        stage { 'manager': }
+        Stage[certificates] -> Stage[repo] -> Stage[indexerdeploy] -> Stage[securityadmin] -> Stage[manager] -> Stage[dashboard]
+        Exec {
+            timeout => 0,
+        }
+        node "$hostname" {
+            class { 'wazuh::certificates':
+                indexer_certs => [['node-1','127.0.0.1']],
+                manager_certs => [['master','127.0.0.1']],
+                dashboard_certs => ['127.0.0.1'],
+                stage => certificates,
+            }
+            class { 'wazuh::repo':
+                stage => repo,
+            }
+            class { 'wazuh::indexer':
+                stage => indexerdeploy,
+            }
+            class { 'wazuh::securityadmin':
+                stage => securityadmin
+            }
+            class { 'wazuh::manager':
+                stage => manager,
+            }
+            class { 'wazuh::filebeat_oss':
+                stage => manager,
+            }
+            class { 'wazuh::dashboard':
+                stage => dashboard,
+            }
+        }
+        EOF
+
 
     - name: Install Wazuh Stack
       shell: bash

diff --git a/.github/tests/action.yml b/.github/tests/action.yml
@@ -51,7 +51,7 @@ runs:
       run: |
         qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:admin -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics" | wc -l`"
         templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:admin -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics"`"
-        if [[ $qty_templates -eq 3 ]]; then
+        if [[ $qty_templates -gt 3 ]]; then
           echo "wazuh templates:"
           echo "${templates}"
         else

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,12 @@ All notable changes to this project will be documented in this file.
 
 - Support to 4.8.0 Wazuh release.
 
+## Wazuh Puppet v4.7.5
+
+### Added
+
+- Support to 4.7.5 Wazuh release.
+
 ## Wazuh Puppet v4.7.4
 
 ### Added

diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp
@@ -357,11 +357,7 @@
           ]
           case $::operatingsystem {
             'Amazon': {
-              # Amazon is based on Centos-6 with some improvements
-              # taken from RHEL-7 but uses SysV-Init, not Systemd.
-              # Probably best to leave this undef until we can
-              # write/find a release-specific file.
-              $wodle_openscap_content = undef
+              $ossec_service_provider = 'systemd'
             }
             'CentOS': {