1
0
Fork 0

Merge current v2.6 into master

This commit is contained in:
Tom Moulard 2022-02-21 14:05:28 +01:00
commit 25725e9b2f
No known key found for this signature in database
GPG key ID: 521ABE0C1A0DEAF6
45 changed files with 155 additions and 99 deletions

View file

@ -131,7 +131,7 @@ func initStandardRegistry(config *types.Prometheus) Registry {
Name: configLastReloadFailureName,
Help: "Last config reload failure",
}, []string{})
tlsCertsNotAfterTimesptamp := newGaugeFrom(promState.collectors, stdprometheus.GaugeOpts{
tlsCertsNotAfterTimestamp := newGaugeFrom(promState.collectors, stdprometheus.GaugeOpts{
Name: tlsCertsNotAfterTimestamp,
Help: "Certificate expiration timestamp",
}, []string{"cn", "serial", "sans"})
@ -141,7 +141,7 @@ func initStandardRegistry(config *types.Prometheus) Registry {
configReloadsFailures.cv.Describe,
lastConfigReloadSuccess.gv.Describe,
lastConfigReloadFailure.gv.Describe,
tlsCertsNotAfterTimesptamp.gv.Describe,
tlsCertsNotAfterTimestamp.gv.Describe,
}
reg := &standardRegistry{
@ -152,7 +152,7 @@ func initStandardRegistry(config *types.Prometheus) Registry {
configReloadsFailureCounter: configReloadsFailures,
lastConfigReloadSuccessGauge: lastConfigReloadSuccess,
lastConfigReloadFailureGauge: lastConfigReloadFailure,
tlsCertsNotAfterTimestampGauge: tlsCertsNotAfterTimesptamp,
tlsCertsNotAfterTimestampGauge: tlsCertsNotAfterTimestamp,
}
if config.AddEntryPointsLabels {