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.5 into master #2226

Merged
merged 42 commits into from
Jun 9, 2023
Merged

Merge 4.5 into master #2226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
718b4f3
Added Amazon Linux 2023 SCA
davidcr01 Mar 31, 2023
59b99ad
Fixed typo
davidcr01 Mar 31, 2023
0bd2895
Merge pull request #2149 from wazuh/2136-specs-sca-amazon-linux-2023
teddytpc1 May 3, 2023
1f5f35f
Revert "Added Amazon Linux 2023 SCA"
teddytpc1 May 3, 2023
2e884db
Merge pull request #2192 from wazuh/revert-2149-2136-specs-sca-amazon…
teddytpc1 May 3, 2023
957c6e4
Change name of MacOS service from launcher.sh to Wazuh
verdx May 19, 2023
7014715
Remove darwin-init.sh to allow for changes(all it does is repeated on…
verdx May 19, 2023
e4893b1
Only run register_configure_agent on upgrade
DFolchA May 19, 2023
a7adc07
Update version to 4.4.3
DFolchA May 22, 2023
47ac4c2
Update version to 4.4.3
DFolchA May 22, 2023
dce63e6
Fixed missing square brackets
rauldpm May 22, 2023
676d685
Remove creation of service, already done by install.sh->init.sh->darw…
verdx May 22, 2023
e48957f
Add service files to the package specs
verdx May 22, 2023
c47a9b5
Merge pull request #2208 from wazuh/2204-deployment-variable
teddytpc1 May 22, 2023
43645bd
Merge branch '4.4.3' into 2199-rename-macos-login-item
verdx May 22, 2023
e02ec0d
Update postinstall.sh
verdx May 22, 2023
90d4027
Removed references to ossecr and ossecm users
rauldpm May 22, 2023
b7c2eac
Merge 4.4 into 4.5 (#2215)
DFolchA May 23, 2023
d5f6794
Copy all StartupItems files so they can be notarized and included in …
verdx May 23, 2023
897c386
Copy entire StartupItems/WAZUH file
verdx May 23, 2023
0c3aab5
Small fixes to facilitate debugging
verdx May 23, 2023
16cd90b
Copy the StartupItem to the destination of the package so it is found
verdx May 23, 2023
3f6fcb5
Fix uninstall script for macos
verdx May 23, 2023
fdd482f
Added debug
c-bordon May 23, 2023
8a3c775
Change and copy Startup Item to the directory build.sh is run from
verdx May 23, 2023
ad7352c
Testing debug
c-bordon May 23, 2023
db776eb
Remove changes and install services on postinstall.sh
verdx May 23, 2023
387f07f
Remove unnecessary whitespaces
verdx May 23, 2023
d4181ee
Checking if backup file exists after configuration and removed
c-bordon May 23, 2023
82b42ed
Replace launchctl variables with temporary files
DFolchA May 23, 2023
13b952d
Changed rebase to 4.4.3
c-bordon May 24, 2023
925b2ff
Merge pull request #2217 from wazuh/2202-ossecconfre-file-found-in-et…
teddytpc1 May 24, 2023
57098f8
Merge pull request #2211 from wazuh/2210-fix-macOS-postinstall-4.4.3
teddytpc1 May 24, 2023
e568a16
Check if files exist before removing
DFolchA May 24, 2023
8c1d2fe
Merge pull request #2218 from wazuh/2205-remove-launchctl
teddytpc1 May 24, 2023
cc32d23
Merge pull request #2207 from wazuh/2199-rename-macos-login-item
DFolchA May 24, 2023
619a4b6
Update release date
DFolchA May 26, 2023
36f824c
Complete changelog links
DFolchA May 26, 2023
0db1d09
Merge pull request #2222 from wazuh/4.4.3
DFolchA May 26, 2023
f154678
Merge branch '4.5' of https://github.com/wazuh/wazuh-packages into 22…
DFolchA Jun 6, 2023
40f66a4
Merge pull request #2225 from wazuh/2221-merge-4.4-into-4.5
vikman90 Jun 6, 2023
5b8e180
Merge branch 'master' of https://github.com/wazuh/wazuh-packages into…
DFolchA Jun 6, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ All notable changes to this project will be documented in this file.

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.0

## [v4.4.3]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.3

## [v4.4.2]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.2
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ The following table shows the references for the versions of each component.
|-----------------|-----------------------|
| 4.3.x | 1.2.0 |
| 4.4.0 | 2.4.1 |
| 4.4.1 - 4.4.2 | 2.6.0 |
| 4.4.1 - 4.4.3 | 2.6.0 |

### Wazuh indexer

| Wazuh indexer | Opensearch |
|-----------------|-----------------------|
| 4.3.x | 1.2.4 |
| 4.4.0 | 2.4.1 |
| 4.4.1 - 4.4.2 | 2.6.0 |
| 4.4.1 - 4.4.3 | 2.6.0 |

## Contribute

Expand Down
158 changes: 80 additions & 78 deletions aix/SPECS/wazuh-agent-aix.spec
View file
Open in desktop

Large diffs are not rendered by default.

Loading