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.

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.3 into master #762

Open
wants to merge 157 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
6358c4b
Add gnupg to list of installed applications
Nov 18, 2021
e5c4c4a
Ensure group "wazuh" exists
Nov 18, 2021
a38c64a
Merge pull request #670 from Tinyblargon/master
alberpilot Nov 25, 2021
30743cc
Expect tag deleted
teddytpc1 Dec 2, 2021
64a621c
Fixes to include 4.2 changes
teddytpc1 Dec 2, 2021
3562fee
Merge pull request #683 from wazuh/680-expect-fix-4.3
alberpilot Dec 3, 2021
589fbeb
Api configuration options updated
teddytpc1 Dec 3, 2021
fd5054c
Merge pull request #686 from wazuh/706-api-config
alberpilot Dec 9, 2021
c6be0b2
Disable log4j java option added
teddytpc1 Dec 14, 2021
9c5a465
Log4j fix added
teddytpc1 Dec 15, 2021
12cd628
Log4j fix removed from jvm.options
teddytpc1 Dec 15, 2021
c9dcd76
disabledlog4j.options permissions update
teddytpc1 Dec 15, 2021
2763bb8
Merge pull request #688 from wazuh/684-log4j
alberpilot Dec 15, 2021
386000a
Fix sca template issue for day, wday and time parameters to 4.3
c-bordon Dec 30, 2021
f879e97
Merge pull request #694 from wazuh/692-FixSCATemplateIssueto4.3
alberpilot Jan 13, 2022
e74d60d
Fix agent sca template
c-bordon Jan 17, 2022
14a2953
Merge pull request #697 from wazuh/692-Fix-Agent-Template-to-4.3
teddytpc1 Jan 17, 2022
9bd3e0f
Initial indexer changes
teddytpc1 Feb 1, 2022
93d6bdb
Indexer variables update
teddytpc1 Feb 2, 2022
c722e5b
Wazuh dashboard role created
teddytpc1 Feb 2, 2022
d67ae78
Updates to Wazuh and Opensearch roles
teddytpc1 Feb 4, 2022
a5441dd
Indexer and dashboard variables names updated
teddytpc1 Feb 7, 2022
2e17343
filebeat oss configuration updated
teddytpc1 Feb 11, 2022
330ba0c
Opensearch dashboard keystore task added
teddytpc1 Feb 14, 2022
847de7c
opensearch.password command updated
teddytpc1 Feb 15, 2022
4bccd0f
Add sleep before securityadmin
teddytpc1 Feb 15, 2022
5c16fee
update sleep before securityadmin
teddytpc1 Feb 15, 2022
5faa3ef
add retry to securityadmin
teddytpc1 Feb 15, 2022
7a8ef4f
Indexer and Dashboard comments removed
teddytpc1 Feb 16, 2022
e51e893
Indexer securityadmin task updated
teddytpc1 Feb 17, 2022
35a14f3
Dashboard username and password removed from yml
teddytpc1 Feb 17, 2022
8499c6b
Playbooks updated
teddytpc1 Feb 18, 2022
78ff992
Single node deployment update
teddytpc1 Feb 18, 2022
f531fa2
Update README and deployment playbooks
teddytpc1 Feb 21, 2022
769d28e
Playbook and readme updated
teddytpc1 Feb 21, 2022
1f8dcbd
Comments removed
teddytpc1 Feb 21, 2022
43e7927
Custom user configuration updated
teddytpc1 Feb 22, 2022
501bb9c
jvm options copy removed
teddytpc1 Feb 23, 2022
e5ed0f5
Dashboard yml renamed
teddytpc1 Mar 2, 2022
64eda52
Indexer default ports updated
teddytpc1 Mar 2, 2022
b3cadea
Changes to packages prod repository
teddytpc1 Mar 3, 2022
b4f9b93
Sleep removed
teddytpc1 Mar 3, 2022
1932f68
Minor format fix
alberpilot Mar 4, 2022
3919e55
Minor format changes on production ready
alberpilot Mar 4, 2022
376f559
Opensearch roles and playbooks renamed
teddytpc1 Mar 4, 2022
3927f73
Merge branch '732-indexer-dashboard' of github.com:wazuh/wazuh-ansibl…
teddytpc1 Mar 4, 2022
43add01
Fixed wazuh_template_branch version
alberpilot Mar 4, 2022
8e7aa83
Changed opensearch comment by indexer
alberpilot Mar 4, 2022
6bca974
Minor format changes
alberpilot Mar 4, 2022
c154f5f
Minor format change
alberpilot Mar 4, 2022
a23f67f
Fix dashboard name format
alberpilot Mar 4, 2022
a293c33
Fix indexer name format
alberpilot Mar 4, 2022
8807df5
Fix indexer name format
alberpilot Mar 4, 2022
631e9be
Fix indexer name format
alberpilot Mar 4, 2022
49143df
Fix indexer name format
alberpilot Mar 4, 2022
dc6a5c3
Fix indexer name format
alberpilot Mar 4, 2022
2b2c05c
Fix indexer name format
alberpilot Mar 4, 2022
7cf9f23
Fix indexer name format
alberpilot Mar 4, 2022
7985e97
Removed disable log4j
alberpilot Mar 4, 2022
db468bf
Merge pull request #705 from wazuh/732-indexer-dashboard
alberpilot Mar 4, 2022
82bac44
Wazuh cert tool update
teddytpc1 Mar 8, 2022
5c6f098
Wazuh cert tool URL corrected
teddytpc1 Mar 8, 2022
a8731e0
opensearch yml update
teddytpc1 Mar 8, 2022
264b6e8
Wazuh template version
teddytpc1 Mar 8, 2022
e9bd834
DN updated in opensearch yaml
teddytpc1 Mar 8, 2022
d38a36e
config yml updated
teddytpc1 Mar 9, 2022
e3a4b98
Log config removed for dashboard
teddytpc1 Mar 10, 2022
781a3fa
Restore to packages bucket
teddytpc1 Mar 11, 2022
e1eb62d
Merge pull request #708 from wazuh/732-config_yml
alberpilot Mar 11, 2022
f88cbb2
Rootcheck if updated
teddytpc1 Mar 14, 2022
f4a035a
Rootcheck config updated in template
teddytpc1 Mar 14, 2022
22db4ac
Merge pull request #709 from wazuh/761-rootcheck-demo
alberpilot Mar 15, 2022
403b1b6
Molecules test for ELK deleted
teddytpc1 Mar 16, 2022
a7ce3cd
ELK roles and playbooks deleted
teddytpc1 Mar 16, 2022
8ee3463
Password corrected for prod ready playbook
teddytpc1 Mar 16, 2022
9ca18fe
Readme updated with prod playbook
teddytpc1 Mar 16, 2022
664f9d0
Merge pull request #711 from wazuh/710-elastic-cleanup
alberpilot Mar 16, 2022
67b3b32
Fixed wazuh-certs-tool.sh URL
alberpilot Mar 17, 2022
eb133c4
Certs generation command update
teddytpc1 Mar 23, 2022
1f2efeb
Merge pull request #715 from wazuh/cert_tool
alberpilot Mar 23, 2022
45fa200
Bump pygments from 2.7.2 to 2.7.4
dependabot[bot] Nov 24, 2021
5dd7cdb
Tabulate update
teddytpc1 Mar 28, 2022
a93c596
Merge pull request #721 from wazuh/4.3-dependabot-pygments
alberpilot Mar 29, 2022
b12c730
Bump urllib3 from 1.25.11 to 1.26.5
dependabot[bot] Mar 29, 2022
54a128d
Bump py from 1.9.0 to 1.10.0
dependabot[bot] Mar 29, 2022
f52c5e6
Bump pyyaml from 5.3.1 to 5.4
dependabot[bot] Mar 29, 2022
b9c6058
Merge pull request #675 from wazuh/dependabot/pip/py-1.10.0
teddytpc1 Mar 29, 2022
352e493
Merge pull request #674 from wazuh/dependabot/pip/urllib3-1.26.5
teddytpc1 Mar 29, 2022
e8f9a00
Merge pull request #712 from wazuh/dependabot/pip/pyyaml-5.4
teddytpc1 Mar 29, 2022
82922d5
Bump ansible-lint from 4.3.7 to 5.4.0
dependabot[bot] Mar 29, 2022
915c4f1
Merge pull request #722 from wazuh/dependabot/pip/4.3/ansible-lint-5.4.0
teddytpc1 Mar 29, 2022
dfa5b77
Bump testinfra from 5.3.1 to 6.0.0
dependabot[bot] Mar 29, 2022
e2b0909
Bump flake8 from 3.8.4 to 4.0.1
dependabot[bot] Mar 29, 2022
fbe8d3c
Merge pull request #724 from wazuh/dependabot/pip/4.3/testinfra-6.0.0
teddytpc1 Mar 29, 2022
face8d4
Merge branch '4.3' into dependabot/pip/4.3/flake8-4.0.1
teddytpc1 Mar 29, 2022
e826a6e
Bump yamllint from 1.25.0 to 1.26.3
dependabot[bot] Mar 29, 2022
56e4729
Bump pytest from 5.4.3 to 7.0.1
dependabot[bot] Mar 29, 2022
c318187
Merge pull request #726 from wazuh/dependabot/pip/4.3/flake8-4.0.1
teddytpc1 Mar 29, 2022
dd67b19
Merge pull request #727 from wazuh/dependabot/pip/4.3/pytest-7.0.1
teddytpc1 Mar 29, 2022
a151583
Merge branch '4.3' into dependabot/pip/4.3/yamllint-1.26.3
teddytpc1 Mar 29, 2022
f902d75
Merge pull request #728 from wazuh/dependabot/pip/4.3/yamllint-1.26.3
teddytpc1 Mar 29, 2022
4c612fc
Default converge test update
teddytpc1 Mar 29, 2022
779baf1
Default converge test indexer host update
teddytpc1 Mar 29, 2022
852fdf5
Bump jinja2 from 2.11.2 to 3.0.3
dependabot[bot] Mar 30, 2022
7f0d4c6
Bump molecule from 3.0.8 to 3.3.4
dependabot[bot] Mar 30, 2022
704010b
Merge pull request #735 from wazuh/dependabot/pip/4.3/jinja2-3.0.3
teddytpc1 Mar 30, 2022
8b77342
Merge branch '4.3' into dependabot/pip/4.3/molecule-3.3.4
teddytpc1 Mar 30, 2022
7b33853
Merge pull request #736 from wazuh/dependabot/pip/4.3/molecule-3.3.4
teddytpc1 Mar 30, 2022
ef89311
Bump ansible from 2.9.5 to 4.10.0
dependabot[bot] Mar 30, 2022
4d08fac
Merge pull request #737 from wazuh/dependabot/pip/4.3/ansible-4.10.0
teddytpc1 Mar 30, 2022
bf0dd97
Packages-dev
teddytpc1 Mar 30, 2022
3b09eab
filebeat_node_name default value added
teddytpc1 Mar 30, 2022
0ec5802
Default converge updates
teddytpc1 Mar 30, 2022
27a9c30
Converge indentation fixed
teddytpc1 Mar 30, 2022
da6a3f3
Converge generate certs tag added
teddytpc1 Mar 30, 2022
8a944aa
Converge playbook updated
teddytpc1 Mar 30, 2022
8811afd
Print config.yml added
teddytpc1 Mar 30, 2022
4242b07
Sudo added to poetry run
teddytpc1 Mar 30, 2022
a52721a
Become yes added to list certificates
teddytpc1 Mar 30, 2022
80189d1
Become yes to filebeat certificates copy
teddytpc1 Mar 30, 2022
35e66f8
Local cert path updated for filebeat
teddytpc1 Mar 30, 2022
7dc0e20
Certificates permissions updated
teddytpc1 Mar 31, 2022
16e6fb7
Packages-dev rollback
teddytpc1 Mar 31, 2022
5fc870a
Unstable changed for stable
teddytpc1 Mar 31, 2022
2879582
Merge pull request #733 from wazuh/4.3-molecule
alberpilot Mar 31, 2022
9591e6b
Certificates permissions updated
teddytpc1 Mar 31, 2022
412d0c1
Task name update
teddytpc1 Mar 31, 2022
c51e000
Merge pull request #741 from wazuh/738-certs_permissions
alberpilot Mar 31, 2022
1ef6819
config.yml template updated
teddytpc1 Apr 7, 2022
ad38aa4
Remove demo certificates task deleted
teddytpc1 Apr 11, 2022
68aec39
Merge pull request #743 from wazuh/742-config_yml
alberpilot Apr 11, 2022
d538e93
Dashboard port changed to 443
teddytpc1 Apr 11, 2022
265d80d
Merge pull request #745 from wazuh/744-port443
alberpilot Apr 11, 2022
c523cdd
Certificate permissions tasks removed
teddytpc1 Apr 12, 2022
889b8a9
Merge pull request #746 from wazuh/1449-certs-permissions
alberpilot Apr 13, 2022
9f85a4f
Dashboard port update in README
teddytpc1 Apr 18, 2022
f64be95
Merge pull request #747 from wazuh/4.3-readme
alberpilot Apr 18, 2022
fb4b8e8
Multitenancy disabled for dashboard
teddytpc1 Apr 20, 2022
c7a4499
Merge pull request #749 from wazuh/1470-dashboard-multitenancy
alberpilot Apr 20, 2022
af2e0c9
audit.type parameter removed from opensearch template
teddytpc1 Apr 20, 2022
a6093ae
Merge pull request #750 from wazuh/1469-audit-type
Apr 21, 2022
31d3cd6
Repositories variables unified
teddytpc1 Apr 26, 2022
60b8910
Conditions for CentOS 8
teddytpc1 Apr 26, 2022
5dc31f4
Remove OpenJDK install from Indexer role
teddytpc1 Apr 26, 2022
d1b80eb
If added to agent.conf template localfile tag
teddytpc1 Apr 27, 2022
ab62e61
Merge pull request #756 from wazuh/802-fix-windows-errors
alberpilot Apr 28, 2022
d9736b1
Clarification on the composition of the Dashboard node
c-bordon Apr 29, 2022
2fc1b5f
Merge pull request #757 from wazuh/754-UpdateProductionReadyReadme-to4.3
alberpilot Apr 29, 2022
acec963
Vars file added
teddytpc1 May 3, 2022
bbe2a22
Localfiles fix
teddytpc1 May 3, 2022
111a6c9
Get latest release updated for Agent role
teddytpc1 May 4, 2022
4955270
Merge pull request #753 from wazuh/4.3-unify-repo
alberpilot May 4, 2022
4bff96c
Win Agent MD5sum updated
teddytpc1 May 5, 2022
56c274e
Merge pull request #760 from wazuh/4.3-win_md5
alberpilot May 5, 2022
19819e4
Debian dashboard revision changed to *
teddytpc1 May 6, 2022
36e68e2
Merge pull request #761 from wazuh/4.3-debian-revision
alberpilot May 6, 2022
9aa09bf
Conflicts resolution
teddytpc1 May 6, 2022
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
61 changes: 0 additions & 61 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,67 +35,6 @@ jobs:
PY_COLORS: '1'
ANSIBLE_FORCE_COLOR: '1'

scenario-distributed-wazuh-elk:
name: Distributed ELK + Wazuh
runs-on: ubuntu-latest
steps:
- name: Check out the codebase.
uses: actions/checkout@v2

- name: Hack to get setup-python to work on act. See act issue 251
run: |
if [ ! -f "/etc/lsb-release" ] ; then
echo "DISTRIB_RELEASE=18.04" > /etc/lsb-release
fi

- name: Set up Python 3.
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Install poetry
run: pip3 install poetry

- name: Install dependencies
run: poetry install


- name: Run Molecule tests.
run: poetry run molecule test -s distributed-wazuh-elk
env:
PY_COLORS: '1'
ANSIBLE_FORCE_COLOR: '1'

scenario-distributed-wazuh-elk-xpack:
name: Distributed ELK + XPack + Wazuh
runs-on: ubuntu-latest
steps:
- name: Check out the codebase.
uses: actions/checkout@v2

- name: Hack to get setup-python to work on act. See act issue 251
run: |
if [ ! -f "/etc/lsb-release" ] ; then
echo "DISTRIB_RELEASE=18.04" > /etc/lsb-release
fi

- name: Set up Python 3.
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Install poetry
run: pip3 install poetry

- name: Install dependencies
run: poetry install

- name: Run Molecule tests.
run: poetry run molecule test -s distributed-wazuh-elk-xpack
env:
PY_COLORS: '1'
ANSIBLE_FORCE_COLOR: '1'

scenario-distributed-wazuh-odfe:
name: Distributed ODFE + Wazuh
runs-on: ubuntu-latest
Expand Down
Loading