
* Drop v1beta1 from ingress nginx (#7156) * Drop v1beta1 from ingress nginx Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix intorstr logic in controller Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * fixing admission Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * more intorstr fixing * correct template rendering Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix e2e tests for v1 api Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix gofmt errors * This is finally working...almost there... Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Re-add removed validation of AdmissionReview * Prepare for v1.0.0-alpha.1 release Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Update changelog and matrix table for v1.0.0-alpha.1 (#7274) Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * add docs for syslog feature (#7219) * Fix link to e2e-tests.md in developer-guide (#7201) * Use ENV expansion for namespace in args (#7146) Update the DaemonSet namespace references to use the `POD_NAMESPACE` environment variable in the same way that the Deployment does. * chart: using Helm builtin capabilities check (#7190) Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> * Update proper default value for HTTP2MaxConcurrentStreams in Docs (#6944) It should be 128 as documented in https://github.com/kubernetes/ingress-nginx/blob/master/internal/ingress/controller/config/config.go#L780 * Fix MaxWorkerOpenFiles calculation on high cores nodes (#7107) * Fix MaxWorkerOpenFiles calculation on high cores nodes * Add e2e test for rlimit_nofile * Fix doc for max-worker-open-files * ingress/tcp: add additional error logging on failed (#7208) * Add file containing stable release (#7313) * Handle named (non-numeric) ports correctly (#7311) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Updated v1beta1 to v1 as its deprecated (#7308) * remove mercurial from build (#7031) * Retry to download maxmind DB if it fails (#7242) * Retry to download maxmind DB if it fails. Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Add retries count arg, move retry logic into DownloadGeoLite2DB function Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Reorder parameters in DownloadGeoLite2DB Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Remove hardcoded value Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Release v1.0.0-alpha.1 * Add changelog for v1.0.0-alpha.2 * controller: ignore non-service backends (#7332) * controller: ignore non-service backends Signed-off-by: Carlos Panato <ctadeu@gmail.com> * update per feedback Signed-off-by: Carlos Panato <ctadeu@gmail.com> * fix: allow scope/tcp/udp configmap namespace to altered (#7161) * Lower webhook timeout for digital ocean (#7319) * Lower webhook timeout for digital ocean * Set Digital Ocean value controller.admissionWebhooks.timeoutSeconds to 29 * update OWNERS and aliases files (#7365) (#7366) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Downgrade Lua modules for s390x (#7355) Downgrade Lua modules to last known working version. * Fix IngressClass logic for newer releases (#7341) * Fix IngressClass logic for newer releases Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Change e2e tests for the new IngressClass presence * Fix chart and admission tests Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix helm chart test Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix reviews * Remove ingressclass code from admission * update tag to v1.0.0-beta.1 * update readme and changelog for v1.0.0-beta.1 * Release v1.0.0-beta.1 - helm and manifests (#7422) * Change the order of annotation just to trigger a new helm release (#7425) * [cherry-pick] Add dev-v1 branch into helm releaser (#7428) * Add dev-v1 branch into helm releaser (#7424) * chore: add link for artifacthub.io/prerelease annotations Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Ricardo Katz <rikatz@users.noreply.github.com> * k8s job ci pipeline for dev-v1 br v1.22.0 (#7453) * k8s job ci pipeline for dev-v1 br v1.22.0 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * k8s job ci pipeline for dev-v1 br v1.21.2 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * remove v1.21.1 version Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * Add controller.watchIngressWithoutClass config option (#7459) Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com> * Release new helm chart with certgen fixed (#7478) * Update go version, modules and remove ioutil * Release new helm chart with certgen fixed * changed appversion, chartversion, TAG, image (#7490) * Fix CI conflict * Fix CI conflict * Fix build.sh from rebase process * Fix controller_test post rebase Co-authored-by: Tianhao Guo <rggth09@gmail.com> Co-authored-by: Ray <61553+rctay@users.noreply.github.com> Co-authored-by: Bill Cassidy <cassid4@gmail.com> Co-authored-by: Jintao Zhang <tao12345666333@163.com> Co-authored-by: Sathish Ramani <rsathishx87@gmail.com> Co-authored-by: Mansur Marvanov <nanorobocop@gmail.com> Co-authored-by: Matt1360 <568198+Matt1360@users.noreply.github.com> Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com> Co-authored-by: Kundan Kumar <kundan.kumar@india.nec.com> Co-authored-by: Tom Hayward <thayward@infoblox.com> Co-authored-by: Sergey Shakuto <sshakuto@infoblox.com> Co-authored-by: Tore <tore.lonoy@gmail.com> Co-authored-by: Bouke Versteegh <info@boukeversteegh.nl> Co-authored-by: Shahid <shahid@us.ibm.com> Co-authored-by: James Strong <strong.james.e@gmail.com> Co-authored-by: Long Wu Yuan <longwuyuan@gmail.com> Co-authored-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Neha Lohia <nehapithadiya444@gmail.com> Co-authored-by: Akshit Grover <akshit.grover2016@gmail.com>
198 lines
4.6 KiB
Go
198 lines
4.6 KiB
Go
/*
|
|
Copyright 2017 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 metric
|
|
|
|
import (
|
|
"os"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
"k8s.io/klog/v2"
|
|
|
|
"k8s.io/apimachinery/pkg/util/sets"
|
|
"k8s.io/ingress-nginx/internal/ingress"
|
|
"k8s.io/ingress-nginx/internal/ingress/metric/collectors"
|
|
)
|
|
|
|
// Collector defines the interface for a metric collector
|
|
type Collector interface {
|
|
ConfigSuccess(uint64, bool)
|
|
|
|
IncReloadCount()
|
|
IncReloadErrorCount()
|
|
|
|
OnStartedLeading(string)
|
|
OnStoppedLeading(string)
|
|
|
|
IncCheckCount(string, string)
|
|
IncCheckErrorCount(string, string)
|
|
|
|
RemoveMetrics(ingresses, endpoints []string)
|
|
|
|
SetSSLExpireTime([]*ingress.Server)
|
|
|
|
// SetHosts sets the hostnames that are being served by the ingress controller
|
|
SetHosts(sets.String)
|
|
|
|
Start()
|
|
Stop()
|
|
}
|
|
|
|
type collector struct {
|
|
nginxStatus collectors.NGINXStatusCollector
|
|
nginxProcess collectors.NGINXProcessCollector
|
|
|
|
ingressController *collectors.Controller
|
|
|
|
socket *collectors.SocketCollector
|
|
|
|
registry *prometheus.Registry
|
|
}
|
|
|
|
// NewCollector creates a new metric collector the for ingress controller
|
|
func NewCollector(metricsPerHost bool, registry *prometheus.Registry, ingressclass string) (Collector, error) {
|
|
podNamespace := os.Getenv("POD_NAMESPACE")
|
|
if podNamespace == "" {
|
|
podNamespace = "default"
|
|
}
|
|
|
|
podName := os.Getenv("POD_NAME")
|
|
|
|
nc, err := collectors.NewNGINXStatus(podName, podNamespace, ingressclass)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
pc, err := collectors.NewNGINXProcess(podName, podNamespace, ingressclass)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
s, err := collectors.NewSocketCollector(podName, podNamespace, ingressclass, metricsPerHost)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ic := collectors.NewController(podName, podNamespace, ingressclass)
|
|
|
|
return Collector(&collector{
|
|
nginxStatus: nc,
|
|
nginxProcess: pc,
|
|
|
|
ingressController: ic,
|
|
|
|
socket: s,
|
|
|
|
registry: registry,
|
|
}), nil
|
|
}
|
|
|
|
func (c *collector) ConfigSuccess(hash uint64, success bool) {
|
|
c.ingressController.ConfigSuccess(hash, success)
|
|
}
|
|
|
|
func (c *collector) IncCheckCount(namespace string, name string) {
|
|
c.ingressController.IncCheckCount(namespace, name)
|
|
}
|
|
|
|
func (c *collector) IncCheckErrorCount(namespace string, name string) {
|
|
c.ingressController.IncCheckErrorCount(namespace, name)
|
|
}
|
|
|
|
func (c *collector) IncReloadCount() {
|
|
c.ingressController.IncReloadCount()
|
|
}
|
|
|
|
func (c *collector) IncReloadErrorCount() {
|
|
c.ingressController.IncReloadErrorCount()
|
|
}
|
|
|
|
func (c *collector) RemoveMetrics(ingresses, hosts []string) {
|
|
c.socket.RemoveMetrics(ingresses, c.registry)
|
|
c.ingressController.RemoveMetrics(hosts, c.registry)
|
|
}
|
|
|
|
func (c *collector) Start() {
|
|
c.registry.MustRegister(c.nginxStatus)
|
|
c.registry.MustRegister(c.nginxProcess)
|
|
c.registry.MustRegister(c.ingressController)
|
|
c.registry.MustRegister(c.socket)
|
|
|
|
// the default nginx.conf does not contains
|
|
// a server section with the status port
|
|
go func() {
|
|
time.Sleep(5 * time.Second)
|
|
c.nginxStatus.Start()
|
|
}()
|
|
go c.nginxProcess.Start()
|
|
go c.socket.Start()
|
|
}
|
|
|
|
func (c *collector) Stop() {
|
|
c.registry.Unregister(c.nginxStatus)
|
|
c.registry.Unregister(c.nginxProcess)
|
|
c.registry.Unregister(c.ingressController)
|
|
c.registry.Unregister(c.socket)
|
|
|
|
c.nginxStatus.Stop()
|
|
c.nginxProcess.Stop()
|
|
c.socket.Stop()
|
|
}
|
|
|
|
func (c *collector) SetSSLExpireTime(servers []*ingress.Server) {
|
|
if !isLeader() {
|
|
return
|
|
}
|
|
|
|
klog.V(2).InfoS("Updating ssl expiration metrics")
|
|
c.ingressController.SetSSLExpireTime(servers)
|
|
}
|
|
|
|
func (c *collector) SetHosts(hosts sets.String) {
|
|
c.socket.SetHosts(hosts)
|
|
}
|
|
|
|
// OnStartedLeading indicates the pod was elected as the leader
|
|
func (c *collector) OnStartedLeading(electionID string) {
|
|
setLeader(true)
|
|
c.ingressController.OnStartedLeading(electionID)
|
|
}
|
|
|
|
// OnStoppedLeading indicates the pod stopped being the leader
|
|
func (c *collector) OnStoppedLeading(electionID string) {
|
|
setLeader(false)
|
|
c.ingressController.OnStoppedLeading(electionID)
|
|
c.ingressController.RemoveAllSSLExpireMetrics(c.registry)
|
|
}
|
|
|
|
var (
|
|
currentLeader uint32
|
|
)
|
|
|
|
func setLeader(leader bool) {
|
|
var i uint32
|
|
if leader {
|
|
i = 1
|
|
}
|
|
|
|
atomic.StoreUint32(¤tLeader, i)
|
|
}
|
|
|
|
func isLeader() bool {
|
|
return atomic.LoadUint32(¤tLeader) != 0
|
|
}
|