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

Fix inconsistent metric labels

Browse source
This commit is contained in:
Manuel de Brito Fontes 2018-07-27 12:41:37 -04:00
parent 18cc2be826
commit 4a316045a8
2 changed files with 47 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@ limitations under the License.
package collectors
import (
"fmt"
"time"
"github.com/golang/glog"
@ -27,7 +28,7 @@ import (
)
var (
operation = []string{"namespace", "class"}
operation = []string{"controller_namespace", "controller_class", "controller_pod"}
sslLabelHost = []string{"namespace", "class", "host"}
)
@ -43,7 +44,8 @@ type Controller struct {
reloadOperationErrors *prometheus.CounterVec
sslExpireTime *prometheus.GaugeVec
labels prometheus.Labels
constLabels prometheus.Labels
labels prometheus.Labels
}
// NewController creates a new prometheus collector for the
@ -56,6 +58,8 @@ func NewController(pod, namespace, class string) *Controller {
}
cm := &Controller{
constLabels: constLabels,
labels: prometheus.Labels{
"namespace": namespace,
"class": class,
@ -115,12 +119,12 @@ func NewController(pod, namespace, class string) *Controller {
// IncReloadCount increment the reload counter
func (cm *Controller) IncReloadCount() {
cm.reloadOperation.With(cm.labels).Inc()
cm.reloadOperation.With(cm.constLabels).Inc()
}
// IncReloadErrorCount increment the reload error counter
func (cm *Controller) IncReloadErrorCount() {
cm.reloadOperationErrors.With(cm.labels).Inc()
cm.reloadOperationErrors.With(cm.constLabels).Inc()
}
// ConfigSuccess set a boolean flag according to the output of the controller configuration reload
@ -186,7 +190,7 @@ func (cm *Controller) RemoveMetrics(hosts []string, registry prometheus.Gatherer
for _, mf := range mfs {
metricName := mf.GetName()
if "ssl_expire_time_seconds" != metricName {
if fmt.Sprintf("%v_ssl_expire_time_seconds", PrometheusNamespace) != metricName {
continue
}