Skip to content

Commit 9042087

Browse files
devbgvdevbgv
committed
Merge remote-tracking branch 'origin/main' into bgv/nim-nap-otel-log-parser
2 parents 4237dd1 + a520f9b commit 9042087

File tree

73 files changed

+4891
-2354
lines changed

Some content is hidden

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

73 files changed

+4891
-2354
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 149 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
env:
3131
GOPROXY: "https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev"
3232
steps:
33-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
33+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434
with:
3535
fetch-tags: 'true'
36-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
36+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
3737
with:
3838
go-version-file: 'go.mod'
3939
cache: false
@@ -45,8 +45,8 @@ jobs:
4545
name: Lint
4646
runs-on: ubuntu-22.04
4747
steps:
48-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
49-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
48+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
49+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
5050
with:
5151
go-version-file: 'go.mod'
5252
cache: false
@@ -61,8 +61,8 @@ jobs:
6161
permissions:
6262
contents: write
6363
steps:
64-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
65-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
64+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
65+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
6666
with:
6767
go-version-file: 'go.mod'
6868
cache: false
@@ -81,8 +81,8 @@ jobs:
8181
name: Unit tests with race condition detection
8282
runs-on: ubuntu-22.04
8383
steps:
84-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
85-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
84+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
85+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
8686
with:
8787
go-version-file: 'go.mod'
8888
cache: false
@@ -93,10 +93,10 @@ jobs:
9393
name: Build Unsigned Snapshot
9494
runs-on: ubuntu-22.04
9595
steps:
96-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
96+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9797
with:
9898
fetch-tags: 'true'
99-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
99+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
100100
with:
101101
go-version-file: 'go.mod'
102102
cache: false
@@ -126,13 +126,13 @@ jobs:
126126
- image: "alpine"
127127
version: "3.22"
128128
steps:
129-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
130-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
129+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
130+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
131131
with:
132132
go-version-file: 'go.mod'
133133
cache: false
134134
- name: Download Packages
135-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
135+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
136136
with:
137137
name: nginx-agent-unsigned-snapshots
138138
path: build
@@ -170,13 +170,13 @@ jobs:
170170
- image: "alpine"
171171
version: "3.22"
172172
steps:
173-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
174-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
173+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
174+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
175175
with:
176176
go-version-file: 'go.mod'
177177
cache: false
178178
- name: Download Packages
179-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
179+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
180180
with:
181181
name: nginx-agent-unsigned-snapshots
182182
path: build
@@ -221,13 +221,13 @@ jobs:
221221
version: "mainline"
222222
release: "alpine"
223223
steps:
224-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
225-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
224+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
225+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
226226
with:
227227
go-version-file: 'go.mod'
228228
cache: false
229229
- name: Download Packages
230-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
230+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
231231
with:
232232
name: nginx-agent-unsigned-snapshots
233233
path: build
@@ -282,13 +282,13 @@ jobs:
282282
release: "debian"
283283
path: "/nginx-plus/agent"
284284
steps:
285-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
286-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
285+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
286+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
287287
with:
288288
go-version-file: 'go.mod'
289289
cache: false
290290
- name: Download Packages
291-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
291+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
292292
with:
293293
name: nginx-agent-unsigned-snapshots
294294
path: build
@@ -321,14 +321,135 @@ jobs:
321321
if: always()
322322
run: bash ./scripts/dashboard/format_results.sh ${{job.status}} ${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}} ${{github.workspace}}
323323

324+
oss-metrics-tests:
325+
name: Metrics Integration Tests - Official OSS Images
326+
needs: build-unsigned-snapshot
327+
if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.head_ref, 'dependabot-') }}
328+
runs-on: ubuntu-22.04
329+
strategy:
330+
matrix:
331+
container:
332+
- image: "bookworm"
333+
version: "stable"
334+
release: "debian"
335+
- image: "bookworm"
336+
version: "mainline"
337+
release: "debian"
338+
- image: "alpine"
339+
version: "stable"
340+
release: "alpine"
341+
- image: "alpine"
342+
version: "mainline"
343+
release: "alpine"
344+
steps:
345+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
346+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
347+
with:
348+
go-version-file: 'go.mod'
349+
cache: false
350+
- name: Download Packages
351+
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
352+
with:
353+
name: nginx-agent-unsigned-snapshots
354+
path: build
355+
356+
- name: Create Results Directory
357+
run: mkdir -p ${{ github.workspace }}/test/dashboard/logs/${{ github.job }}/${{matrix.container.image}}-${{matrix.container.version}}
358+
359+
- name: Start Promtail
360+
uses: ./.github/actions/start-promtail
361+
with:
362+
loki_url: ${{ secrets.LOKI_DASHBOARD_URL }}
363+
364+
- name: Run Integration Tests
365+
run: |
366+
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
367+
CONTAINER_NGINX_IMAGE_REGISTRY="docker-registry.nginx.com" \
368+
TAG="${{ matrix.container.version }}-${{ matrix.container.image }}" \
369+
OS_RELEASE="${{ matrix.container.release }}" OS_VERSION="${{ matrix.container.version }}" \
370+
make metrics-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
371+
exit "${PIPESTATUS[0]}"
372+
373+
- name: Format Results
374+
if: always()
375+
run: bash ./scripts/dashboard/format_results.sh ${{job.status}} ${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}} ${{github.workspace}}
376+
377+
plus-metrics-tests:
378+
name: Metrics Integration Tests - Official Plus Images
379+
needs: build-unsigned-snapshot
380+
if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.head_ref, 'dependabot-') }}
381+
runs-on: ubuntu-22.04
382+
strategy:
383+
matrix:
384+
container:
385+
- image: "alpine"
386+
version: "3.22"
387+
plus: "r35"
388+
release: "alpine"
389+
path: "/nginx-plus/agent"
390+
- image: "alpine"
391+
version: "3.21"
392+
plus: "r34"
393+
release: "alpine"
394+
path: "/nginx-plus/agent"
395+
- image: "debian"
396+
version: "bookworm"
397+
plus: "r35"
398+
release: "debian"
399+
path: "/nginx-plus/agent"
400+
- image: "debian"
401+
version: "bookworm"
402+
plus: "r34"
403+
release: "debian"
404+
path: "/nginx-plus/agent"
405+
steps:
406+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
407+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
408+
with:
409+
go-version-file: 'go.mod'
410+
cache: false
411+
- name: Download Packages
412+
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
413+
with:
414+
name: nginx-agent-unsigned-snapshots
415+
path: build
416+
- name: Login to Docker Registry
417+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
418+
with:
419+
registry: ${{ secrets.TEST_REGISTRY_URL }}
420+
username: ${{ secrets.REGISTRY_USERNAME }}
421+
password: ${{ secrets.REGISTRY_PASSWORD }}
422+
423+
- name: Create Results Directory
424+
run: mkdir -p ${{ github.workspace }}/test/dashboard/logs/${{ github.job }}/${{matrix.container.image}}-${{matrix.container.version}}
425+
426+
- name: Start Promtail
427+
uses: ./.github/actions/start-promtail
428+
with:
429+
loki_url: ${{ secrets.LOKI_DASHBOARD_URL }}
430+
431+
- name: Run Integration Tests
432+
run: |
433+
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
434+
CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.TEST_REGISTRY_URL }}" \
435+
TAG="${{ matrix.container.plus }}-${{ matrix.container.image }}-${{ matrix.container.version }}" \
436+
OS_RELEASE="${{ matrix.container.release }}" OS_VERSION="${{ matrix.container.version }}" IMAGE_PATH="${{ matrix.container.path }}" \
437+
NGINX_LICENSE_JWT="${{ secrets.TEST_JWT }}" \
438+
make metrics-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
439+
exit "${PIPESTATUS[0]}"
440+
441+
- name: Format Results
442+
if: always()
443+
run: bash ./scripts/dashboard/format_results.sh ${{job.status}} ${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}} ${{github.workspace}}
444+
324445
performance-tests:
325446
name: Performance Tests
326447
runs-on: ubuntu-22.04
327448
permissions:
328449
contents: write
329450
steps:
330-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
331-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
451+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
452+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
332453
with:
333454
go-version-file: 'go.mod'
334455
cache: false
@@ -359,20 +480,20 @@ jobs:
359480
needs: build-unsigned-snapshot
360481

361482
steps:
362-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
363-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
483+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
484+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
364485
with:
365486
go-version-file: 'go.mod'
366487
cache: false
367488

368489
- name: Download Packages
369-
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2
490+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
370491
with:
371492
name: nginx-agent-unsigned-snapshots
372493
path: build
373494

374495
- name: Set up Docker Build
375-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
496+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
376497

377498
- name: Set env
378499
run: echo "GO_VERSION=$(cat go.mod | grep toolchain | sed 's/toolchain //; s/go//')" >> $GITHUB_ENV

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
docs_only: ${{ github.event.pull_request && steps.docs.outputs.docs_only == 'true' }}
3333
steps:
3434
- name: Checkout Repository
35-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
35+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3636
with:
3737
fetch-depth: 0
3838

‎.github/workflows/dependency-review.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
pull-requests: write # for actions/dependency-review-action to post comments
2323
steps:
2424
- name: "Checkout Repository"
25-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
25+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626

2727
- name: "Dependency Review"
28-
uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2
28+
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
2929
with:
3030
config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"

‎.github/workflows/label-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write
1515
runs-on: ubuntu-22.04
1616
steps:
17-
- uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5.25.0
17+
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
1818
with:
1919
disable-releaser: true
2020
env:

‎.github/workflows/release-branch.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
create_pull_request: ${{steps.vars.outputs.create_pull_request }}
6868
steps:
6969
- name: Checkout Repository
70-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
70+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7171
with:
7272
ref: ${{ inputs.releaseBranch }}
7373

@@ -91,12 +91,12 @@ jobs:
9191
release_id: ${{ steps.vars.outputs.RELEASE_ID }}
9292
steps:
9393
- name: Checkout Repository
94-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
94+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9595
with:
9696
ref: ${{ inputs.releaseBranch }}
9797

9898
- name: Setup Node Environment
99-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
99+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
100100

101101
- name: Create Draft Release
102102
if: ${{ needs.vars.outputs.github_release == 'true' }}
@@ -188,7 +188,7 @@ jobs:
188188
contents: write
189189
steps:
190190
- name: Checkout Repository
191-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
191+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
192192
with:
193193
ref: ${{ inputs.releaseBranch }}
194194

@@ -213,12 +213,12 @@ jobs:
213213
contents: write # Needed to update a github release
214214
steps:
215215
- name: Checkout Repository
216-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
216+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
217217
with:
218218
ref: ${{ inputs.releaseBranch }}
219219

220220
- name: Setup go
221-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
221+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
222222
with:
223223
go-version-file: 'go.mod'
224224
cache: false
@@ -233,7 +233,7 @@ jobs:
233233
nfpm --version
234234
235235
- name: Docker Buildx
236-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
236+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
237237

238238
- name: Build Docker Image
239239
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
@@ -294,7 +294,7 @@ jobs:
294294
pull-requests: write
295295
steps:
296296
- name: Checkout Repository
297-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
297+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
298298
with:
299299
ref: ${{ inputs.releaseBranch }}
300300

0 commit comments

Comments
 (0)