Skip to content

Commit 154b8f6

Browse files
Wintermute2k6Wintermute2k6
authored
Merge branch 'main' into tagging/auditbeat
2 parents c93a530 + 7255b20 commit 154b8f6

55 files changed

Lines changed: 316 additions & 168 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/test_elasticsearch_modules.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,30 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
distro: [ubuntu2204]
31+
distro:
32+
- ubuntu2204
3233
scenario:
3334
- elasticsearch_test_modules
3435
release:
3536
- 8
37+
python_version:
38+
- "3.11"
39+
ansible_version:
40+
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
3641

3742
steps:
3843
- name: Check out code
3944
uses: actions/checkout@v6
4045

41-
- name: Set up Python 3.8
46+
- name: Set up Python ${{ matrix.python_version }}
4247
uses: actions/setup-python@v6
4348
with:
44-
python-version: 3.8
49+
python-version: ${{ matrix.python_version }}
4550

4651
- name: Install dependencies
4752
run: |
4853
python3 -m pip install --upgrade pip
54+
python3 -m pip install "${{ matrix.ansible_version }}"
4955
python3 -m pip install -r requirements-test.txt
5056
5157
- name: Install collection
@@ -55,6 +61,8 @@ jobs:
5561
5662
- name: Test with molecule
5763
run: |
64+
ansible --version
65+
molecule --version
5866
molecule test -s ${{ matrix.scenario }}
5967
env:
6068
MOLECULE_DISTRO: ${{ matrix.distro }}

‎.github/workflows/test_full_stack.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,31 @@ jobs:
3434
max-parallel: 1
3535
matrix:
3636
distro:
37-
- rockylinux8
3837
- rockylinux9
39-
- ubuntu2004
4038
- ubuntu2204
41-
- debian10
42-
- debian11
43-
- centos8
4439
scenario:
4540
- elasticstack_default
4641
release:
4742
- 7
4843
- 8
44+
ansible_version:
45+
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
46+
python_version:
47+
- "3.11"
4948

5049
steps:
5150
- name: Check out code
5251
uses: actions/checkout@v6
5352

54-
- name: Set up Python 3.8
53+
- name: Set up Python ${{ matrix.python_version }}
5554
uses: actions/setup-python@v6
5655
with:
57-
python-version: 3.8
56+
python-version: ${{ matrix.python_version }}
5857

5958
- name: Install dependencies
6059
run: |
6160
python3 -m pip install --upgrade pip
61+
python3 -m pip install "${{ matrix.ansible_version }}"
6262
python3 -m pip install -r requirements-test.txt
6363
6464
- name: Install collection
@@ -68,6 +68,8 @@ jobs:
6868
6969
- name: Test with molecule
7070
run: |
71+
ansible --version
72+
molecule --version
7173
molecule test -s ${{ matrix.scenario }}
7274
env:
7375
MOLECULE_DISTRO: ${{ matrix.distro }}

‎.github/workflows/test_linting.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
- name: Check out the codebase.
2929
uses: actions/checkout@v6
3030

31-
- name: Set up Python 3.
31+
- name: Set up Python 3.11
3232
uses: actions/setup-python@v6
3333
with:
34-
python-version: '3.x'
34+
python-version: "3.11"
3535

3636
- name: Install test dependencies.
3737
run: |

‎.github/workflows/test_role_beats.yml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,32 @@ jobs:
3939
strategy:
4040
fail-fast: false
4141
matrix:
42-
distro: [ubuntu2204]
43-
scenario: [beats_default, beats_peculiar]
44-
release: [ 7, 8 ]
42+
distro:
43+
- ubuntu2204
44+
scenario:
45+
- beats_default
46+
- beats_peculiar
47+
release:
48+
- 7
49+
- 8
50+
ansible_version:
51+
- "ansible>=9.0,<10.0" #Correspond ansible-core>=2.16,<2.17
52+
python_version:
53+
- "3.11"
4554

4655
steps:
4756
- name: Check out code
4857
uses: actions/checkout@v6
4958

50-
- name: Set up Python 3.8
59+
- name: Set up Python ${{ matrix.python_version }}
5160
uses: actions/setup-python@v6
5261
with:
53-
python-version: 3.8
62+
python-version: ${{ matrix.python_version }}
5463

5564
- name: Install dependencies
5665
run: |
5766
python3 -m pip install --upgrade pip
67+
python3 -m pip install "${{ matrix.ansible_version }}"
5868
python3 -m pip install -r requirements-test.txt
5969
6070
- name: Install collection
@@ -64,6 +74,8 @@ jobs:
6474
6575
- name: Test with molecule
6676
run: |
77+
ansible --version
78+
molecule --version
6779
molecule test -s ${{ matrix.scenario }}
6880
env:
6981
MOLECULE_DISTRO: ${{ matrix.distro }}

‎.github/workflows/test_role_elasticsearch.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939
strategy:
4040
fail-fast: false
4141
matrix:
42-
distro: [ubuntu2204]
42+
distro:
43+
- ubuntu2204
4344
scenario:
4445
- elasticsearch_default
4546
- elasticsearch_roles_calculation
@@ -48,19 +49,23 @@ jobs:
4849
release:
4950
- 7
5051
- 8
51-
52+
ansible_version:
53+
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
54+
python_version:
55+
- "3.11"
5256
steps:
5357
- name: Check out code
5458
uses: actions/checkout@v6
5559

56-
- name: Set up Python 3.8
60+
- name: Set up Python ${{ matrix.python_version }}
5761
uses: actions/setup-python@v6
5862
with:
59-
python-version: 3.8
63+
python-version: ${{ matrix.python_version }}
6064

6165
- name: Install dependencies
6266
run: |
6367
python3 -m pip install --upgrade pip
68+
python3 -m pip install "${{ matrix.ansible_version }}"
6469
python3 -m pip install -r requirements-test.txt
6570
6671
- name: Install collection
@@ -70,6 +75,8 @@ jobs:
7075
7176
- name: Test with molecule
7277
run: |
78+
ansible --version
79+
molecule --version
7380
molecule test -s ${{ matrix.scenario }}
7481
env:
7582
MOLECULE_DISTRO: ${{ matrix.distro }}

‎.github/workflows/test_role_kibana.yml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,31 @@ jobs:
4040
strategy:
4141
fail-fast: false
4242
matrix:
43-
distro: [ubuntu2204]
44-
scenario: [kibana_default]
45-
release: [ 7, 8 ]
43+
distro:
44+
- ubuntu2204
45+
scenario:
46+
- kibana_default
47+
release:
48+
- 7
49+
- 8
50+
ansible_version:
51+
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
52+
python_version:
53+
- "3.11"
4654

4755
steps:
4856
- name: Check out code
4957
uses: actions/checkout@v6
5058

51-
- name: Set up Python 3.8
59+
- name: Set up Python ${{ matrix.python_version }}
5260
uses: actions/setup-python@v6
5361
with:
54-
python-version: 3.8
62+
python-version: ${{ matrix.python_version }}
5563

5664
- name: Install dependencies
5765
run: |
5866
python3 -m pip install --upgrade pip
67+
python3 -m pip install "${{ matrix.ansible_version }}"
5968
python3 -m pip install -r requirements-test.txt
6069
6170
- name: Install collection
@@ -65,6 +74,8 @@ jobs:
6574
6675
- name: Test with molecule
6776
run: |
77+
ansible --version
78+
molecule --version
6879
molecule test -s ${{ matrix.scenario }}
6980
env:
7081
MOLECULE_DISTRO: ${{ matrix.distro }}

‎.github/workflows/test_role_logstash.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,24 @@ jobs:
4848
release:
4949
- 7
5050
- 8
51+
ansible_version:
52+
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
53+
python_version:
54+
- "3.11"
5155

5256
steps:
5357
- name: Check out code
5458
uses: actions/checkout@v6
5559

56-
- name: Set up Python 3.8
60+
- name: Set up Python ${{ matrix.python_version }}
5761
uses: actions/setup-python@v6
5862
with:
59-
python-version: 3.8
63+
python-version: ${{ matrix.python_version }}
6064

6165
- name: Install dependencies
6266
run: |
6367
python3 -m pip install --upgrade pip
68+
python3 -m pip install "${{ matrix.ansible_version }}"
6469
python3 -m pip install -r requirements-test.txt
6570
6671
- name: Install collection
@@ -70,6 +75,8 @@ jobs:
7075
7176
- name: Test with molecule
7277
run: |
78+
ansible --version
79+
molecule --version
7380
molecule test -s ${{ matrix.scenario }}
7481
env:
7582
MOLECULE_DISTRO: ${{ matrix.distro }}

‎.github/workflows/test_role_repos.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,34 @@ jobs:
4141
matrix:
4242

4343
distro:
44-
# centos7 removed - no longer supported
45-
- debian10
46-
- debian11
47-
- rockylinux8
44+
- debian13
4845
- rockylinux9
49-
- ubuntu2004
5046
- ubuntu2204
5147
scenario:
5248
- repos_default
5349
- repos_oss
5450
release:
5551
- 7
5652
- 8
53+
ansible_version:
54+
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
55+
python_version:
56+
- "3.11"
5757

5858
steps:
5959
- name: Check out code
6060
uses: actions/checkout@v6
6161

62-
- name: Set up Python 3.8
62+
- name: Set up Python ${{ matrix.python_version }}
6363
uses: actions/setup-python@v6
6464
with:
65-
python-version: 3.8
65+
python-version: ${{ matrix.python_version }}
6666

6767
- name: Install dependencies
6868
run: |
6969
python3 -m pip install --upgrade pip
70+
python3 -m pip install "${{ matrix.ansible_version }}"
7071
python3 -m pip install -r requirements-test.txt
71-
ansible-galaxy collection install community.general
7272
7373
- name: Install collection
7474
run: |
@@ -77,6 +77,8 @@ jobs:
7777
7878
- name: Test with molecule
7979
run: |
80+
ansible --version
81+
molecule --version
8082
molecule test -s ${{ matrix.scenario }}
8183
env:
8284
MOLECULE_DISTRO: ${{ matrix.distro }}

‎.github/workflows/test_roles_pr.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,31 @@ jobs:
3333
fail-fast: false
3434
matrix:
3535
distro:
36-
- rockylinux8
36+
- rockylinux9
3737
- ubuntu2204
3838
scenario:
3939
- elasticstack_default
4040
release:
4141
- 7
4242
- 8
43+
python_version:
44+
- "3.11"
45+
ansible_version:
46+
- "ansible-core>=2.19,<2.20" #Correspond ansible>=12.0,<13.0
4347

4448
steps:
4549
- name: Check out code
4650
uses: actions/checkout@v6
4751

48-
- name: Set up Python 3.8
52+
- name: Set up Python ${{ matrix.python_version }}
4953
uses: actions/setup-python@v6
5054
with:
51-
python-version: 3.8
55+
python-version: ${{ matrix.python_version }}
5256

5357
- name: Install dependencies
5458
run: |
5559
python3 -m pip install --upgrade pip
60+
python3 -m pip install "${{ matrix.ansible_version }}"
5661
python3 -m pip install -r requirements-test.txt
5762
5863
- name: Install collection
@@ -62,6 +67,8 @@ jobs:
6267
6368
- name: Test with molecule
6469
run: |
70+
ansible --version
71+
molecule --version
6572
molecule test -s ${{ matrix.scenario }}
6673
env:
6774
MOLECULE_DISTRO: ${{ matrix.distro }}

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@
22
*.swp
33
__pycache__*
44
.vscode
5-
.roo
6-
.ansible
7-
.rooignore
85
.venv

0 commit comments

Comments
 (0)