Skip to content

Commit e50acc2

Browse files
authored
Merge branch 'main' into docs/release-1.3.0
2 parents 7293a34 + 68df05b commit e50acc2

File tree

8 files changed

+97
-85
lines changed

8 files changed

+97
-85
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,25 @@ jobs:
6868
echo "go_path=$(go env GOPATH)" >> $GITHUB_OUTPUT
6969
7070
- name: Setup QEMU
71-
uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
71+
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
7272
with:
7373
platforms: arm,arm64,ppc64le,s390x,mips64le,386
7474
if: github.event_name != 'pull_request'
7575

7676
- name: Docker Buildx
77-
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
77+
uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3.5.0
7878
with:
7979
version: latest
8080

8181
- name: DockerHub Login
82-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
82+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
8383
with:
8484
username: ${{ secrets.DOCKER_USERNAME }}
8585
password: ${{ secrets.DOCKER_PASSWORD }}
8686
if: github.event_name != 'pull_request'
8787

8888
- name: Login to GitHub Container Registry
89-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
89+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
9090
with:
9191
registry: ghcr.io
9292
username: ${{ github.repository_owner }}
@@ -101,13 +101,13 @@ jobs:
101101
if: github.event_name != 'pull_request'
102102

103103
- name: Login to Public ECR
104-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
104+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
105105
with:
106106
registry: public.ecr.aws
107107
if: github.event_name != 'pull_request'
108108

109109
- name: Login to Quay.io
110-
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
110+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
111111
with:
112112
registry: quay.io
113113
username: ${{ secrets.QUAY_USERNAME }}
@@ -193,7 +193,7 @@ jobs:
193193
continue-on-error: true
194194

195195
- name: Build and Push Docker Image
196-
uses: docker/build-push-action@a254f8ca60a858f3136a2f1f23a60969f2c402dd # v6.4.0
196+
uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6.5.0
197197
with:
198198
file: build/Dockerfile
199199
context: "."
@@ -219,7 +219,7 @@ jobs:
219219
add-cpes-if-none: true
220220

221221
- name: Upload scan result to GitHub Security tab
222-
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
222+
uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
223223
continue-on-error: true
224224
with:
225225
sarif_file: ${{ steps.scan.outputs.sarif }}

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
# Initializes the CodeQL tools for scanning.
5757
- name: Initialize CodeQL
58-
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
58+
uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
5959
with:
6060
languages: ${{ matrix.language }}
6161
build-mode: ${{ matrix.build-mode }}
@@ -67,6 +67,6 @@ jobs:
6767
# queries: security-extended,security-and-quality
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
70+
uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
7171
with:
7272
category: "/language:${{matrix.language}}"

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: "Upload to code-scanning"
59-
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
59+
uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
6060
with:
6161
sarif_file: results.sarif

.golangci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,19 @@ linters:
3737
- asasalint
3838
- asciicheck
3939
- bidichk
40+
- contextcheck
4041
- dupword
42+
- durationcheck
4143
- errcheck
44+
- errchkjson
4245
- errname
4346
- errorlint
4447
- exportloopref
4548
- fatcontext
4649
- forcetypeassert
4750
- gocheckcompilerdirectives
51+
- gochecksumtype
52+
- gocritic
4853
- godot
4954
- gofmt
5055
- gofumpt
@@ -58,6 +63,7 @@ linters:
5863
- loggercheck
5964
- makezero
6065
- misspell
66+
- musttag
6167
- nilerr
6268
- noctx
6369
- nolintlint

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ Flags:
302302
| `nginxplus_upstream_server_ssl_handshakes` | Counter | Successful SSL handshakes | `server`, `upstream` |
303303
| `nginxplus_upstream_server_ssl_handshakes_failed` | Counter | Failed SSL handshakes | `server`, `upstream` |
304304
| `nginxplus_upstream_server_ssl_session_reuses` | Counter | Session reuses during SSL handshake | `server`, `upstream` |
305-
| `nginxplus_upstream_keepalive` | Gauge | Idle keepalive connections | `upstream` |
305+
| `nginxplus_upstream_keepalive` | Gauge | Idle keepalive connections | `upstream` |
306306
| `nginxplus_upstream_zombies` | Gauge | Servers removed from the group but still processing active client requests | `upstream` |
307307

308308
#### [Stream Upstreams](https://nginx.org/en/docs/http/ngx_http_api_module.html#def_nginx_stream_upstream)
@@ -396,7 +396,7 @@ Flags:
396396
| `nginxplus_stream_limit_connection_rejected` | Counter | Total number of connections that were rejected | `zone` |
397397
| `nginxplus_stream_limit_connection_rejected_dry_run` | Counter | Total number of connections accounted as rejected in the dry run mode | `zone` |
398398

399-
#### [Cache](https://nginx.org/en/docs/http/ngx_http_api_module.html#http_caches_http_cache_zone_name)
399+
#### [Cache](https://nginx.org/en/docs/http/ngx_http_api_module.html#def_nginx_http_cache)
400400

401401
| Name | Type | Description | Labels |
402402
| ------------------------------------------- | ------- | ----------------------------------------------------------------------- | ------- |
@@ -422,16 +422,16 @@ Flags:
422422
| `nginxplus_cache_bypass_responses_written` | Counter | Total number of cache bypasses written to cache | `cache` |
423423
| `nginxplus_cache_bypass_bytes_written` | Counter | Total number of bytes written to cache from cache bypasses | `cache` |
424424

425-
#### [Worker](hhttps://nginx.org/en/docs/http/ngx_http_api_module.html#workers)
425+
#### [Worker](https://nginx.org/en/docs/http/ngx_http_api_module.html#def_nginx_worker)
426426

427-
| Name | Type | Description | Labels |
428-
| ---------------------------------------- | ------- | ---------------------------------------------------------------------------------------------- | ----------- |
429-
| `nginxplus_worker_connection_accepted` | Counter | The total number of accepted client connections | `id`, `pid` |
430-
| `nginxplus_worker_connection_dropped` | Counter | The total number of accepted client connections | `id`, `pid` |
431-
| `nginxplus_worker_connection_active` | Gauge | The current number of active client connections | `id`, `pid` |
432-
| `nginxplus_worker_connection_idle` | Gauge | The current number of idle client connection | `id`, `pid` |
433-
| `nginxplus_worker_http_requests_total` | Counter | The total number of client requests received by the worker process | `id`, `pid` |
434-
| `nginxplus_worker_http_requests_current` | Gauge | The current number of client requests that are currently being processed by the worker process | `id`, `pid` |
427+
| Name | Type | Description | Labels |
428+
| ---------------------------------------- | ------- | ------------------------------------------------------------------------ | ----------- |
429+
| `nginxplus_worker_connection_accepted` | Counter | The total number of accepted client connections | `id`, `pid` |
430+
| `nginxplus_worker_connection_dropped` | Counter | The total number of dropped client connections | `id`, `pid` |
431+
| `nginxplus_worker_connection_active` | Gauge | The current number of active client connections | `id`, `pid` |
432+
| `nginxplus_worker_connection_idle` | Gauge | The current number of idle client connection | `id`, `pid` |
433+
| `nginxplus_worker_http_requests_total` | Counter | The total number of client requests received | `id`, `pid` |
434+
| `nginxplus_worker_http_requests_current` | Gauge | The current number of client requests that are currently being processed | `id`, `pid` |
435435

436436
Connect to the `/metrics` page of the running exporter to see the complete list of metrics along with their
437437
descriptions. Note: to see server zones related metrics you must configure [status

0 commit comments

Comments
 (0)