DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Metrics: Fix namespace in nginx_ingress_controller_ssl_expire_time_seconds. (#11985)

Browse source 
Co-authored-by: Aleksey Gavrilov <alexey.gavrilov@flant.com>
This commit is contained in:
k8s-infra-cherrypick-robot 2024-09-17 13:40:43 -07:00 committed by GitHub
parent cb182e8595
commit ff9275bc15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/ingress/metric/collectors/controller.go
View file

@ -305,6 +305,7 @@ func (cm *Controller) SetSSLExpireTime(servers []*ingress.Server) {
} }
labels["host"] = s.Hostname labels["host"] = s.Hostname
labels["secret_name"] = s.SSLCert.Name labels["secret_name"] = s.SSLCert.Name
labels["namespace"] = s.SSLCert.Namespace
labels["identifier"] = s.SSLCert.Identifier() labels["identifier"] = s.SSLCert.Identifier()
cm.sslExpireTime.With(labels).Set(float64(s.SSLCert.ExpireTime.Unix())) cm.sslExpireTime.With(labels).Set(float64(s.SSLCert.ExpireTime.Unix()))

4
internal/ingress/metric/collectors/controller_test.go
View file

@ -88,6 +88,8 @@ func TestControllerCounters(t *testing.T) {
Hostname: "demo", Hostname: "demo",
SSLCert: &ingress.SSLCert{ SSLCert: &ingress.SSLCert{
ExpireTime: t1, ExpireTime: t1,
Name: "secret-name",
Namespace: "secret-namespace",
Certificate: &x509.Certificate{ Certificate: &x509.Certificate{
PublicKeyAlgorithm: x509.ECDSA, PublicKeyAlgorithm: x509.ECDSA,
Issuer: pkix.Name{ Issuer: pkix.Name{
@ -111,7 +113,7 @@ func TestControllerCounters(t *testing.T) {
want: ` want: `
# HELP nginx_ingress_controller_ssl_expire_time_seconds Number of seconds since 1970 to the SSL Certificate expire.\n An example to check if this certificate will expire in 10 days is: "nginx_ingress_controller_ssl_expire_time_seconds < (time() + (10 * 24 * 3600))" # HELP nginx_ingress_controller_ssl_expire_time_seconds Number of seconds since 1970 to the SSL Certificate expire.\n An example to check if this certificate will expire in 10 days is: "nginx_ingress_controller_ssl_expire_time_seconds < (time() + (10 * 24 * 3600))"
# TYPE nginx_ingress_controller_ssl_expire_time_seconds gauge # TYPE nginx_ingress_controller_ssl_expire_time_seconds gauge
nginx_ingress_controller_ssl_expire_time_seconds{class="nginx",host="demo",identifier="abcd1234-100",namespace="default",secret_name=""} 1.351807721e+09 nginx_ingress_controller_ssl_expire_time_seconds{class="nginx",host="demo",identifier="abcd1234-100",namespace="secret-namespace",secret_name="secret-name"} 1.351807721e+09
`, `,
metrics: []string{"nginx_ingress_controller_ssl_expire_time_seconds"}, metrics: []string{"nginx_ingress_controller_ssl_expire_time_seconds"},
}, },