Skip to content

Commit b7d683c

Browse files
atoulmeatoulme
authored
Merge branch 'main' into ansible_debian12
2 parents 3913a83 + 0d2250d commit b7d683c

File tree

669 files changed

+9644
-55803
lines changed

Some content is hidden

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

669 files changed

+9644
-55803
lines changed

‎.github/ISSUE_TEMPLATE/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
blank_issues_enabled: true
1+
blank_issues_enabled: false
22
contact_links:
33
- name: Splunk Ideas
44
url: https://ideas.splunk.com/
5-
about: Proposes enhancements through Splunk Ideas (requires a Splunk.com login)
5+
about: Request any enhancement, component addition, or new feature through Splunk Ideas. Requires a Splunk.com login.
66
- name: Splunk Support
77
url: https://splunk.my.site.com/customer/s/need-help/create-case
8-
about: Report an issue or request help (requires Splunk Support entitlement)
8+
about: Ask any question or report any issue by opening a support case. Requires Splunk Support entitlement.

‎.github/workflows/ansible.yml

+25-23
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717
- '.github/workflows/ansible.yml'
1818
- 'deployments/ansible/**'
1919
- '!**.md'
20+
schedule:
21+
- cron: '0 0 * * 1,4' # Every Monday and Thrusday at midnight UTC
2022

2123
concurrency:
2224
group: ansible-${{ github.event.pull_request.number || github.ref }}
@@ -40,7 +42,7 @@ jobs:
4042
uses: actions/checkout@v4
4143

4244
- name: Set up Python 3.
43-
uses: actions/setup-python@v4
45+
uses: actions/setup-python@v5
4446
with:
4547
python-version: '3.11'
4648

@@ -59,9 +61,9 @@ jobs:
5961
fail-fast: false
6062
matrix:
6163
ansible:
62-
- ansible~=2.10.0
63-
- ansible~=6.0
64-
- ansible~=7.0
64+
# Testing only the versions currently supported per https://endoflife.date/ansible
65+
- ansible~=9.2.0
66+
- ansible~=8.7.0
6567
distro:
6668
- amazonlinux2
6769
- amazonlinux2023
@@ -79,27 +81,27 @@ jobs:
7981
- ubuntu2004
8082
- ubuntu2204
8183
exclude:
82-
# ansible<6 unsupported on Amazon Linux 2023
83-
- distro: amazonlinux2023
84-
ansible: ansible~=2.10.0
84+
# ansible-core used by ansible 9.2.0 requires a minimum of Python2 version 2.7 or Python3 version 3.6. Current version: 3.5.2
85+
- distro: ubuntu1604
86+
ansible: ansible~=9.2.0
8587

8688
steps:
8789
- name: Check out the codebase.
8890
uses: actions/checkout@v4
8991

90-
- uses: DamianReeves/write-file-action@v1.2
92+
- uses: DamianReeves/write-file-action@v1.3
9193
with:
9294
path: "${{ github.workspace }}/requirements.txt"
9395
contents: |
9496
${{ matrix.ansible }}
95-
molecule==3.3.0
96-
molecule-docker==0.2.4
97-
docker==5.0.0
98-
ansible-lint==5.4.0
97+
ansible-lint==6.22.2
98+
molecule==6.0.3
99+
molecule-plugins[docker]==23.5.0
100+
docker==7.0.0
99101
urllib3<2
100102
101103
- name: Set up Python 3.
102-
uses: actions/setup-python@v4
104+
uses: actions/setup-python@v5
103105
with:
104106
python-version: '3.11'
105107
cache: 'pip'
@@ -131,9 +133,9 @@ jobs:
131133
fail-fast: false
132134
matrix:
133135
ansible:
134-
- ansible~=2.10.0
135-
- ansible~=6.0
136-
- ansible~=7.0
136+
# Testing only the versions currently supported per https://endoflife.date/ansible
137+
- ansible~=9.2.0
138+
- ansible~=8.7.0
137139
distro:
138140
- "2016"
139141
- "2019"
@@ -146,19 +148,19 @@ jobs:
146148
- name: Check out the codebase.
147149
uses: actions/checkout@v4
148150

149-
- uses: DamianReeves/write-file-action@v1.2
151+
- uses: DamianReeves/write-file-action@v1.3
150152
with:
151153
path: "${{ github.workspace }}/requirements.txt"
152154
contents: |
153155
${{ matrix.ansible }}
154-
ansible-compat==2.2.7
155-
ansible-lint==5.4.0
156-
molecule==4.0.4
157-
molecule-vagrant==2.0.0
156+
ansible-compat==4.1.11
157+
ansible-lint==6.22.2
158+
molecule==6.0.3
159+
molecule-plugins[vagrant]==23.5.0
158160
pywinrm==0.4.3
159161
160162
- name: Set up Python 3.
161-
uses: actions/setup-python@v4
163+
uses: actions/setup-python@v5
162164
with:
163165
python-version: '3.11'
164166
cache: 'pip'
@@ -195,7 +197,7 @@ jobs:
195197
run: echo "Fail to read version from galaxy.yml" && exit 1
196198

197199
- name: Push new release tag if it doesn't exist
198-
uses: actions/github-script@v6
200+
uses: actions/github-script@v7
199201
with:
200202
github-token: ${{ secrets.GITHUB_TOKEN }}
201203
script: |

‎.github/workflows/auto-instrumentation.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
PYTHON_VERSION: '3.11'
2222
PIP_VERSION: '22.0.4'
2323
REQUIREMENTS_PATH: "internal/buildscripts/packaging/tests/requirements.txt"
24-
GO_VERSION: 1.20.10
24+
GO_VERSION: 1.21.5
2525

2626
jobs:
2727
cross-compile:
@@ -45,7 +45,7 @@ jobs:
4545
make ${{ matrix.SYS_BINARIES }}
4646
4747
- name: Upload artifact
48-
uses: actions/upload-artifact@v3
48+
uses: actions/upload-artifact@v4
4949
with:
5050
name: ${{ matrix.SYS_BINARIES }}
5151
path: |
@@ -76,7 +76,7 @@ jobs:
7676
run: make -C instrumentation/ ${{ matrix.SYS_PACKAGE }}-package ARCH="${{ matrix.ARCH }}"
7777

7878
- name: Upload artifact
79-
uses: actions/upload-artifact@v3
79+
uses: actions/upload-artifact@v4
8080
with:
8181
name: splunk-otel-auto-instrumentation-${{ matrix.ARCH }}-${{ matrix.SYS_PACKAGE }}
8282
path: ./instrumentation/dist/*.${{ matrix.SYS_PACKAGE }}
@@ -128,12 +128,12 @@ jobs:
128128
echo "Unknown distro '${{ matrix.DISTRO }}'!"
129129
exit 1
130130
131-
- uses: actions/download-artifact@v3
131+
- uses: actions/download-artifact@v4
132132
with:
133133
name: binaries-linux_${{ matrix.ARCH }}
134134
path: ./bin
135135

136-
- uses: actions/download-artifact@v3
136+
- uses: actions/download-artifact@v4
137137
with:
138138
name: splunk-otel-auto-instrumentation-${{ matrix.ARCH }}-${{ env.SYS_PACKAGE }}
139139
path: ./instrumentation/dist
@@ -145,7 +145,7 @@ jobs:
145145
image: tonistiigi/binfmt:qemu-v7.0.0
146146

147147
- name: Setup python
148-
uses: actions/setup-python@v4
148+
uses: actions/setup-python@v5
149149
with:
150150
python-version: ${{ env.PYTHON_VERSION }}
151151
cache: 'pip'

‎.github/workflows/build-and-test.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323
cancel-in-progress: true
2424

2525
env:
26-
GO_VERSION: 1.20.10
26+
GO_VERSION: 1.21.5
2727

2828
jobs:
2929
setup-environment:
@@ -135,7 +135,7 @@ jobs:
135135

136136
- run: echo "GOLANGCI_LINT_CACHE=${HOME}/.cache/golangci-lint" >> $GITHUB_ENV
137137

138-
- uses: actions/cache@v3
138+
- uses: actions/cache@v4
139139
with:
140140
path: ${{ env.GOLANGCI_LINT_CACHE }}
141141
key: golangci-lint-${{ hashFiles('**/.golangci.yml', '**/*.go', '**/go.sum') }}
@@ -169,7 +169,7 @@ jobs:
169169
make for-all CMD="make test" | tee unit-test-results/go-unit-tests.out
170170
171171
- name: Uploading artifacts
172-
uses: actions/upload-artifact@v3
172+
uses: actions/upload-artifact@v4
173173
with:
174174
name: unit-test-results
175175
path: ./unit-test-results
@@ -203,7 +203,7 @@ jobs:
203203
make test-with-cover
204204
205205
- name: Uploading artifacts
206-
uses: actions/upload-artifact@v3
206+
uses: actions/upload-artifact@v4
207207
with:
208208
name: coverage-results
209209
path: ./coverage.html
@@ -231,7 +231,7 @@ jobs:
231231
make ${{ matrix.SYS_BINARIES }}
232232
233233
- name: Uploading binaries
234-
uses: actions/upload-artifact@v3
234+
uses: actions/upload-artifact@v4
235235
with:
236236
name: ${{ matrix.SYS_BINARIES }}
237237
path: |

‎.github/workflows/chef-test.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ on:
1414
- '.github/workflows/chef-test.yml'
1515
- 'deployments/chef/**'
1616
- '!**.md'
17+
schedule:
18+
- cron: '0 0 * * 2,5' # Every Tuesday and Friday at midnight UTC
1719

1820
concurrency:
1921
group: chef-test-${{ github.event.pull_request.number || github.ref }}
@@ -85,13 +87,13 @@ jobs:
8587
uses: actions/checkout@v4
8688

8789
- name: Install chef
88-
uses: actionshub/chef-install@2.0.4
90+
uses: actionshub/chef-install@3.0.0
8991
with:
9092
version: 21.12.720
9193

9294
- run: kitchen test ${{ matrix.DISTRO }}
9395

94-
- uses: actions/upload-artifact@v3
96+
- uses: actions/upload-artifact@v4
9597
if: always()
9698
with:
9799
name: ${{ matrix.DISTRO }}
@@ -108,7 +110,7 @@ jobs:
108110
uses: actions/checkout@v4
109111

110112
- name: Install chef
111-
uses: actionshub/chef-install@2.0.4
113+
uses: actionshub/chef-install@3.0.0
112114
with:
113115
version: 21.12.720
114116

@@ -126,7 +128,7 @@ jobs:
126128
env:
127129
KITCHEN_YAML: kitchen.windows.yml
128130

129-
- uses: actions/upload-artifact@v3
131+
- uses: actions/upload-artifact@v4
130132
if: always()
131133
with:
132134
name: ${{ matrix.SUITE }}-${{ matrix.DISTRO }}

‎.github/workflows/chef.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
echo "version=${version}" >> $GITHUB_OUTPUT
3636
3737
- name: Push new release tag if it doesn't exist
38-
uses: actions/github-script@v6
38+
uses: actions/github-script@v7
3939
with:
4040
github-token: ${{ secrets.GITHUB_TOKEN }}
4141
script: |

‎.github/workflows/darwin-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929
strategy:
3030
matrix:
3131
# The "macos-13-xlarge" runner is arm64: https://github.com/actions/runner-images/issues/8439
32-
OS: [ "macos-11", "macos-12", "macos-13", "macos-13-xlarge" ]
32+
OS: [ "macos-12", "macos-13", "macos-13-xlarge", "macos-14" ]
3333
steps:
3434
- name: Check out the codebase.
3535
uses: actions/checkout@v4
3636

3737
- name: Set up Go
3838
uses: actions/setup-go@v5
3939
with:
40-
go-version: 1.20.10
40+
go-version: 1.21.5
4141
cache-dependency-path: '**/go.sum'
4242

4343
- run: go env -w CGO_ENABLED=0
@@ -49,7 +49,7 @@ jobs:
4949
run: make test-with-cover
5050

5151
- name: Uploading artifacts
52-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@v4
5353
with:
5454
name: coverage-results-${{ matrix.OS }}
5555
path: ./coverage.html

‎.github/workflows/gendependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- '.github/workflows/scripts/gendependabot.sh'
99

1010
env:
11-
GO_VERSION: 1.20.10
11+
GO_VERSION: 1.21.5
1212

1313
jobs:
1414
gendependabot:

‎.github/workflows/installer-script-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
image: tonistiigi/binfmt:qemu-v7.0.0
6868

6969
- name: Setup python
70-
uses: actions/setup-python@v4
70+
uses: actions/setup-python@v5
7171
with:
7272
python-version: ${{ env.PYTHON_VERSION }}
7373
cache: 'pip'

0 commit comments

Comments
 (0)