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

Jump to bottom

Merge 4.6.0 into 4.7.0 #804

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Merge 4.6.0 into 4.7.0 #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfcfdc0
add path parameter add remove paths for commands
vcerenu Oct 12, 2023
80c106e
add path parameter add remove paths for commands
vcerenu Oct 12, 2023
3357672
Merge pull request #797 from wazuh/19607-alerts-not-displaying-on-waz…
teddytpc1 Oct 12, 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
3 changes: 2 additions & 1 deletion manifests/agent.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,9 @@
${agent_auth_option_manager} ${agent_auth_option_agent} ${agent_auth_option_password} ${agent_auth_option_address}"

exec { 'agent-auth-linux':
path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin'],
command => $agent_auth_command,
unless => "/bin/egrep -q '.' ${::wazuh::params_agent::keys_file}",
unless => "egrep -q '.' ${::wazuh::params_agent::keys_file}",
require => Concat['agent_ossec.conf'],
before => Service[$agent_service_name],
notify => Service[$agent_service_name],
Expand Down
8 changes: 5 additions & 3 deletions manifests/filebeat_oss.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
# Needed since GitHub can only ETAG and result in changes of the mtime everytime.
# TODO: Include file into the wazuh/wazuh-puppet project or use file { checksum => '..' } for this instead of the exec construct.
exec { 'cleanup /etc/filebeat/wazuh-template.json':
command => '/bin/rm -f /etc/filebeat/wazuh-template.json',
onlyif => '/bin/test -f /etc/filebeat/wazuh-template.json',
unless => "/bin/curl -s 'https://raw.githubusercontent.com/wazuh/wazuh/${wazuh_extensions_version}/extensions/elasticsearch/7.x/wazuh-template.json' | /bin/cmp -s '/etc/filebeat/wazuh-template.json'",
path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin'],
command => 'rm -f /etc/filebeat/wazuh-template.json',
onlyif => 'test -f /etc/filebeat/wazuh-template.json',
unless => "curl -s 'https://raw.githubusercontent.com/wazuh/wazuh/${wazuh_extensions_version}/extensions/elasticsearch/7.x/wazuh-template.json' | cmp -s '/etc/filebeat/wazuh-template.json'",
}

-> file { '/etc/filebeat/wazuh-template.json':
owner => 'root',
group => 'root',
Expand Down
Loading