
* Release version v1.10.0 * set deploy url to v1-10-0 in docs * quotes around numbers fort ports definitions * Bump dorny/paths-filter from 3.0.1 to 3.0.2 Bumps [dorny/paths-filter](https://github.com/dorny/paths-filter) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/dorny/paths-filter/releases) - [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md) - [Commits](ebc4d7e9eb...de90cc6fb3
) --- updated-dependencies: - dependency-name: dorny/paths-filter dependency-type: direct:production update-type: version-update:semver-patch ... * Bump aquasecurity/trivy-action from 0.17.0 to 0.18.0 Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.17.0 to 0.18.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](84384bd6e7...062f259268
) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... * Bump github/codeql-action from 3.24.5 to 3.24.6 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.5 to 3.24.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](47b3d888fe...8a470fddaf
) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... * Bump github.com/prometheus/common from 0.48.0 to 0.49.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.49.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](https://github.com/prometheus/common/compare/v0.48.0...v0.49.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... * Bump docker/setup-buildx-action from 3.0.0 to 3.1.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](f95db51fdd...0d103c3126
) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... * Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.8.4...v1.9.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... * Bump actions/download-artifact from 4.1.2 to 4.1.4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.2 to 4.1.4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](eaceaf801f...c850b930e6
) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-patch ... * Update README.md remove older version, left latest for release train. * docs: update the 404 link to FAQ * bump golang * golangci-lint update, ci cleanup, group dependabot updates * bump golangci-lint to v1.56.x * cleanup empty lines * group dependabot updates * run on job changes as well * remove deprecated checks * fix lints and format * Bump github.com/prometheus/common from 0.49.0 to 0.50.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.49.0 to 0.50.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](https://github.com/prometheus/common/compare/v0.49.0...v0.50.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... * Bump the all group with 1 update Bumps the all group with 1 update: [google.golang.org/grpc](https://github.com/grpc/grpc-go). Updates `google.golang.org/grpc` from 1.62.0 to 1.62.1 - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.62.0...v1.62.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... * Bump the all group with 1 update Bumps the all group with 1 update: [actions/add-to-project](https://github.com/actions/add-to-project). Updates `actions/add-to-project` from 0.5.0 to 0.6.0 - [Release notes](https://github.com/actions/add-to-project/releases) - [Commits](31b3f3ccdc...0609a2702e
) --- updated-dependencies: - dependency-name: actions/add-to-project dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... * Bump github.com/onsi/ginkgo/v2 from 2.15.0 to 2.16.0 Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.15.0 to 2.16.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.15.0...v2.16.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... --------- Co-authored-by: Ricardo Katz <rikatz@users.noreply.github.com> Co-authored-by: longwuyuan <longwuyuan@gmail.com> Co-authored-by: Bartosz Fenski <fenio@debian.org> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Strong <strong.james.e@gmail.com> Co-authored-by: Grinish <grinish@gmail.com> Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
324 lines
9.4 KiB
Go
324 lines
9.4 KiB
Go
/*
|
|
Copyright 2018 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package collectors
|
|
|
|
import (
|
|
"crypto/x509"
|
|
"crypto/x509/pkix"
|
|
"math/big"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
"k8s.io/ingress-nginx/pkg/apis/ingress"
|
|
)
|
|
|
|
func TestControllerCounters(t *testing.T) {
|
|
const metadata = `
|
|
# HELP nginx_ingress_controller_config_last_reload_successful Whether the last configuration reload attempt was successful
|
|
# TYPE nginx_ingress_controller_config_last_reload_successful gauge
|
|
# HELP nginx_ingress_controller_success Cumulative number of Ingress controller reload operations
|
|
# TYPE nginx_ingress_controller_success counter
|
|
`
|
|
cases := []struct {
|
|
name string
|
|
test func(*Controller)
|
|
metrics []string
|
|
want string
|
|
}{
|
|
{
|
|
name: "should return not increment in metrics if no operations are invoked",
|
|
test: func(_ *Controller) {
|
|
},
|
|
want: metadata + `
|
|
nginx_ingress_controller_config_last_reload_successful{controller_class="nginx",controller_namespace="default",controller_pod="pod"} 0
|
|
`,
|
|
metrics: []string{"nginx_ingress_controller_config_last_reload_successful", "nginx_ingress_controller_success"},
|
|
},
|
|
{
|
|
name: "single increase in reload count should return 1",
|
|
test: func(cm *Controller) {
|
|
cm.IncReloadCount()
|
|
cm.ConfigSuccess(0, true)
|
|
},
|
|
want: metadata + `
|
|
nginx_ingress_controller_config_last_reload_successful{controller_class="nginx",controller_namespace="default",controller_pod="pod"} 1
|
|
nginx_ingress_controller_success{controller_class="nginx",controller_namespace="default",controller_pod="pod"} 1
|
|
`,
|
|
metrics: []string{"nginx_ingress_controller_config_last_reload_successful", "nginx_ingress_controller_success"},
|
|
},
|
|
{
|
|
name: "single increase in error reload count should return 1",
|
|
test: func(cm *Controller) {
|
|
cm.IncReloadErrorCount()
|
|
},
|
|
want: `
|
|
# HELP nginx_ingress_controller_errors Cumulative number of Ingress controller errors during reload operations
|
|
# TYPE nginx_ingress_controller_errors counter
|
|
nginx_ingress_controller_errors{controller_class="nginx",controller_namespace="default",controller_pod="pod"} 1
|
|
`,
|
|
metrics: []string{"nginx_ingress_controller_errors"},
|
|
},
|
|
{
|
|
name: "should set SSL certificates metrics",
|
|
test: func(cm *Controller) {
|
|
t1, err := time.Parse(
|
|
time.RFC3339,
|
|
"2012-11-01T22:08:41+00:00")
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
servers := []*ingress.Server{
|
|
{
|
|
Hostname: "demo",
|
|
SSLCert: &ingress.SSLCert{
|
|
ExpireTime: t1,
|
|
},
|
|
},
|
|
{
|
|
Hostname: "invalid",
|
|
SSLCert: &ingress.SSLCert{
|
|
ExpireTime: time.Unix(0, 0),
|
|
},
|
|
},
|
|
}
|
|
cm.SetSSLExpireTime(servers)
|
|
},
|
|
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
|
|
`,
|
|
metrics: []string{"nginx_ingress_controller_ssl_expire_time_seconds"},
|
|
},
|
|
{
|
|
name: "should set SSL certificates infos metrics",
|
|
test: func(cm *Controller) {
|
|
servers := []*ingress.Server{
|
|
{
|
|
Hostname: "demo",
|
|
SSLCert: &ingress.SSLCert{
|
|
Name: "secret-name",
|
|
Namespace: "ingress-namespace",
|
|
Certificate: &x509.Certificate{
|
|
PublicKeyAlgorithm: x509.ECDSA,
|
|
Issuer: pkix.Name{
|
|
CommonName: "certificate issuer",
|
|
SerialNumber: "abcd1234",
|
|
Organization: []string{"issuer org"},
|
|
},
|
|
SerialNumber: big.NewInt(100),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Hostname: "invalid",
|
|
SSLCert: &ingress.SSLCert{
|
|
ExpireTime: time.Unix(0, 0),
|
|
},
|
|
},
|
|
}
|
|
cm.SetSSLInfo(servers)
|
|
},
|
|
want: `
|
|
# HELP nginx_ingress_controller_ssl_certificate_info Hold all labels associated to a certificate
|
|
# TYPE nginx_ingress_controller_ssl_certificate_info gauge
|
|
nginx_ingress_controller_ssl_certificate_info{class="nginx",host="demo",identifier="abcd1234-100",issuer_common_name="certificate issuer",issuer_organization="issuer org",namespace="ingress-namespace",public_key_algorithm="ECDSA",secret_name="secret-name",serial_number="100"} 1
|
|
`,
|
|
metrics: []string{"nginx_ingress_controller_ssl_certificate_info"},
|
|
},
|
|
{
|
|
name: "should ignore certificates without serial number",
|
|
test: func(cm *Controller) {
|
|
servers := []*ingress.Server{
|
|
{
|
|
Hostname: "demo",
|
|
SSLCert: &ingress.SSLCert{
|
|
Name: "secret-name",
|
|
Namespace: "ingress-namespace",
|
|
Certificate: &x509.Certificate{
|
|
PublicKeyAlgorithm: x509.ECDSA,
|
|
Issuer: pkix.Name{
|
|
CommonName: "certificate issuer",
|
|
SerialNumber: "abcd1234",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
cm.SetSSLInfo(servers)
|
|
},
|
|
want: ``,
|
|
metrics: []string{"nginx_ingress_controller_ssl_certificate_info"},
|
|
},
|
|
{
|
|
name: "should ignore certificates with nil x509 pointer",
|
|
test: func(cm *Controller) {
|
|
servers := []*ingress.Server{
|
|
{
|
|
Hostname: "demo",
|
|
SSLCert: &ingress.SSLCert{
|
|
Name: "secret-name",
|
|
Namespace: "ingress-namespace",
|
|
Certificate: &x509.Certificate{
|
|
PublicKeyAlgorithm: x509.ECDSA,
|
|
Issuer: pkix.Name{
|
|
CommonName: "certificate issuer",
|
|
SerialNumber: "abcd1234",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
cm.SetSSLInfo(servers)
|
|
},
|
|
want: ``,
|
|
metrics: []string{"nginx_ingress_controller_ssl_certificate_info"},
|
|
},
|
|
{
|
|
name: "should ignore servers without certificates",
|
|
test: func(cm *Controller) {
|
|
servers := []*ingress.Server{
|
|
{
|
|
Hostname: "demo",
|
|
},
|
|
}
|
|
cm.SetSSLInfo(servers)
|
|
},
|
|
want: ``,
|
|
metrics: []string{"nginx_ingress_controller_ssl_certificate_info"},
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
t.Run(c.name, func(t *testing.T) {
|
|
cm := NewController("pod", "default", "nginx")
|
|
reg := prometheus.NewPedanticRegistry()
|
|
if err := reg.Register(cm); err != nil {
|
|
t.Errorf("registering collector failed: %s", err)
|
|
}
|
|
|
|
c.test(cm)
|
|
|
|
if err := GatherAndCompare(cm, c.want, c.metrics, reg); err != nil {
|
|
t.Errorf("unexpected collecting result:\n%s", err)
|
|
}
|
|
|
|
reg.Unregister(cm)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRemoveMetrics(t *testing.T) {
|
|
cm := NewController("pod", "default", "nginx")
|
|
reg := prometheus.NewPedanticRegistry()
|
|
if err := reg.Register(cm); err != nil {
|
|
t.Errorf("registering collector failed: %s", err)
|
|
}
|
|
|
|
t1, err := time.Parse(
|
|
time.RFC3339,
|
|
"2012-11-01T22:08:41+00:00")
|
|
if err != nil {
|
|
t.Errorf("Unexpected error: %v", err)
|
|
}
|
|
|
|
servers := []*ingress.Server{
|
|
{
|
|
Hostname: "demo",
|
|
SSLCert: &ingress.SSLCert{
|
|
ExpireTime: t1,
|
|
Certificate: &x509.Certificate{
|
|
Issuer: pkix.Name{
|
|
CommonName: "certificate issuer",
|
|
SerialNumber: "abcd1234",
|
|
},
|
|
SerialNumber: big.NewInt(100),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Hostname: "invalid",
|
|
SSLCert: &ingress.SSLCert{
|
|
ExpireTime: time.Unix(0, 0),
|
|
},
|
|
},
|
|
}
|
|
cm.SetSSLExpireTime(servers)
|
|
cm.SetSSLInfo(servers)
|
|
|
|
cm.RemoveMetrics([]string{"demo"}, []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)
|
|
}
|
|
if err := GatherAndCompare(cm, "", []string{"nginx_ingress_controller_ssl_certificate_info"}, reg); err != nil {
|
|
t.Errorf("unexpected collecting result:\n%s", err)
|
|
}
|
|
|
|
reg.Unregister(cm)
|
|
}
|
|
|
|
func TestRemoveAllSSLMetrics(t *testing.T) {
|
|
cm := NewController("pod", "default", "nginx")
|
|
reg := prometheus.NewPedanticRegistry()
|
|
if err := reg.Register(cm); err != nil {
|
|
t.Errorf("registering collector failed: %s", err)
|
|
}
|
|
|
|
t1, err := time.Parse(
|
|
time.RFC3339,
|
|
"2012-11-01T22:08:41+00:00")
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
servers := []*ingress.Server{
|
|
{
|
|
Hostname: "demo",
|
|
SSLCert: &ingress.SSLCert{
|
|
ExpireTime: t1,
|
|
Certificate: &x509.Certificate{
|
|
Issuer: pkix.Name{
|
|
CommonName: "certificate issuer",
|
|
SerialNumber: "abcd1234",
|
|
},
|
|
SerialNumber: big.NewInt(100),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Hostname: "invalid",
|
|
SSLCert: &ingress.SSLCert{
|
|
ExpireTime: time.Unix(0, 0),
|
|
},
|
|
},
|
|
}
|
|
cm.SetSSLExpireTime(servers)
|
|
cm.SetSSLInfo(servers)
|
|
|
|
cm.RemoveAllSSLMetrics(reg)
|
|
|
|
if err := GatherAndCompare(cm, "", []string{"nginx_ingress_controller_ssl_expire_time_seconds"}, reg); err != nil {
|
|
t.Errorf("unexpected collecting result:\n%s", err)
|
|
}
|
|
if err := GatherAndCompare(cm, "", []string{"nginx_ingress_controller_ssl_certificate_info"}, reg); err != nil {
|
|
t.Errorf("unexpected collecting result:\n%s", err)
|
|
}
|
|
|
|
reg.Unregister(cm)
|
|
}
|