Skip to content

Commit 2ea70aa

Browse files
Bump github.com/nginxinc/nginx-plus-go-client from 1.2.1 to 1.2.2 (#775)
* Bump github.com/nginxinc/nginx-plus-go-client from 1.2.1 to 1.2.2 Bumps [github.com/nginxinc/nginx-plus-go-client](https://github.com/nginxinc/nginx-plus-go-client) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/nginxinc/nginx-plus-go-client/releases) - [Changelog](https://github.com/nginxinc/nginx-plus-go-client/blob/main/CHANGELOG.md) - [Commits](nginx/nginx-plus-go-client@v1.2.1...v1.2.2) --- updated-dependencies: - dependency-name: github.com/nginxinc/nginx-plus-go-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Fix keepalive --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Luca Comellini <[email protected]>
1 parent a977839 commit 2ea70aa

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Flags:
247247
| `nginxplus_upstream_server_ssl_handshakes` | Counter | Successful SSL handshakes | `server`, `upstream` |
248248
| `nginxplus_upstream_server_ssl_handshakes_failed` | Counter | Failed SSL handshakes | `server`, `upstream` |
249249
| `nginxplus_upstream_server_ssl_session_reuses` | Counter | Session reuses during SSL handshake | `server`, `upstream` |
250-
| `nginxplus_upstream_keepalives` | Gauge | Idle keepalive connections | `upstream` |
250+
| `nginxplus_upstream_keepalive` | Gauge | Idle keepalive connections | `upstream` |
251251
| `nginxplus_upstream_zombies` | Gauge | Servers removed from the group but still processing active client requests | `upstream` |
252252

253253
#### [Stream Upstreams](https://nginx.org/en/docs/http/ngx_http_api_module.html#def_nginx_stream_upstream)

collector/nginx_plus.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ func NewNginxPlusCollector(nginxClient *plusclient.NginxClient, namespace string
372372
"ssl_session_reuses": newStreamServerZoneMetric(namespace, "ssl_session_reuses", "Session reuses during SSL handshake", variableLabelNames.StreamServerZoneVariableLabelNames, constLabels),
373373
},
374374
upstreamMetrics: map[string]*prometheus.Desc{
375-
"keepalives": newUpstreamMetric(namespace, "keepalives", "Idle keepalive connections", constLabels),
376-
"zombies": newUpstreamMetric(namespace, "zombies", "Servers removed from the group but still processing active client requests", constLabels),
375+
"keepalive": newUpstreamMetric(namespace, "keepalive", "Idle keepalive connections", constLabels),
376+
"zombies": newUpstreamMetric(namespace, "zombies", "Servers removed from the group but still processing active client requests", constLabels),
377377
},
378378
streamUpstreamMetrics: map[string]*prometheus.Desc{
379379
"zombies": newStreamUpstreamMetric(namespace, "zombies", "Servers removed from the group but still processing active client connections", constLabels),
@@ -980,8 +980,8 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
980980
ch <- prometheus.MustNewConstMetric(c.upstreamServerMetrics["ssl_session_reuses"],
981981
prometheus.CounterValue, float64(peer.SSL.SessionReuses), labelValues...)
982982
}
983-
ch <- prometheus.MustNewConstMetric(c.upstreamMetrics["keepalives"],
984-
prometheus.GaugeValue, float64(upstream.Keepalives), name)
983+
ch <- prometheus.MustNewConstMetric(c.upstreamMetrics["keepalive"],
984+
prometheus.GaugeValue, float64(upstream.Keepalive), name)
985985
ch <- prometheus.MustNewConstMetric(c.upstreamMetrics["zombies"],
986986
prometheus.GaugeValue, float64(upstream.Zombies), name)
987987
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.21.3
55
require (
66
github.com/alecthomas/kingpin/v2 v2.4.0
77
github.com/go-kit/log v0.2.1
8-
github.com/nginxinc/nginx-plus-go-client v1.2.1
8+
github.com/nginxinc/nginx-plus-go-client v1.2.2
99
github.com/prometheus/client_golang v1.19.1
1010
github.com/prometheus/common v0.55.0
1111
github.com/prometheus/exporter-toolkit v0.11.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
2828
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
2929
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
3030
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
31-
github.com/nginxinc/nginx-plus-go-client v1.2.1 h1:65L9xgPDNbEbd23FTTCcaZ2qF9TX5/Z6vkkEl7RKiVo=
32-
github.com/nginxinc/nginx-plus-go-client v1.2.1/go.mod h1:n8OFLzrJulJ2fur28Cwa1Qp5DZNS2VicLV+Adt30LQ4=
31+
github.com/nginxinc/nginx-plus-go-client v1.2.2 h1:sl7HqNDDZq2EVu0eQQVoZ6PKYGa4h2dB/Qr5Ib0YKGw=
32+
github.com/nginxinc/nginx-plus-go-client v1.2.2/go.mod h1:n8OFLzrJulJ2fur28Cwa1Qp5DZNS2VicLV+Adt30LQ4=
3333
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3434
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3535
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=

0 commit comments

Comments
 (0)