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

remove _ssl_expire_time_seconds metric by identifier (#9706)

Browse source 
Signed-off-by: xiayu.lyt <xiayu.lyt@alibaba-inc.com>
This commit is contained in:
Tony Li 2024-04-09 03:32:21 +08:00 • committed by GitHub
parent d808e38911
commit b4cae70b52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,6 +88,15 @@ func TestControllerCounters(t *testing.T) {
Hostname: "demo",
SSLCert: &ingress.SSLCert{
ExpireTime: t1,
Certificate: &x509.Certificate{
PublicKeyAlgorithm: x509.ECDSA,
Issuer: pkix.Name{
CommonName: "certificate issuer",
SerialNumber: "abcd1234",
Organization: []string{"issuer org"},
},
SerialNumber: big.NewInt(100),
},
},
},
{
@ -102,7 +111,7 @@ func TestControllerCounters(t *testing.T) {
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))"
# TYPE nginx_ingress_controller_ssl_expire_time_seconds gauge
nginx_ingress_controller_ssl_expire_time_seconds{class="nginx",host="demo",namespace="default",secret_name=""} 1.351807721e+09
nginx_ingress_controller_ssl_expire_time_seconds{class="nginx",host="demo",identifier="abcd1234-100",namespace="default",secret_name=""} 1.351807721e+09
`,
metrics: []string{"nginx_ingress_controller_ssl_expire_time_seconds"},
},
@ -262,7 +271,7 @@ func TestRemoveMetrics(t *testing.T) {
cm.SetSSLExpireTime(servers)
cm.SetSSLInfo(servers)
cm.RemoveMetrics([]string{"demo"}, []string{"abcd1234-100"}, reg)
cm.RemoveMetrics([]string{"abcd1234-100"}, reg)
if err := GatherAndCompare(cm, "", []string{"nginx_ingress_controller_ssl_expire_time_seconds"}, reg); err != nil {
t.Errorf("unexpected collecting result:\n%s", err)