github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83283 from RainbowMango/pr_migrate_etcd_version_monitor_to_metrics

Browse Source 
Migrate etcd version monitor to metrics stability framework
This commit is contained in:
Kubernetes Prow Robot 2019-10-15 23:04:24 -07:00 committed by GitHub
commit 7cc611b7e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/etcd-version-monitor/BUILD
View File

@ -16,8 +16,8 @@ go_library(
srcs = ["etcd-version-monitor.go"],
importpath = "k8s.io/kubernetes/cluster/images/etcd-version-monitor",
deps = [
"//staging/src/k8s.io/component-base/metrics:go_default_library",
"//vendor/github.com/gogo/protobuf/proto:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus/promhttp:go_default_library",
"//vendor/github.com/prometheus/client_model/go:go_default_library",
"//vendor/github.com/prometheus/common/expfmt:go_default_library",

21
cluster/images/etcd-version-monitor/etcd-version-monitor.go
View File

@ -26,11 +26,12 @@ import (
"time"
"github.com/gogo/protobuf/proto"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
"github.com/spf13/pflag"
"k8s.io/component-base/metrics"
"k8s.io/klog"
)
@ -58,15 +59,16 @@ const (
// Initialize prometheus metrics to be exported.
var (
// Register all custom metrics with a dedicated registry to keep them separate.
customMetricRegistry = prometheus.NewRegistry()
customMetricRegistry = metrics.NewKubeRegistry()
// Custom etcd version metric since etcd 3.2- does not export one.
// This will be replaced by https://github.com/coreos/etcd/pull/8960 in etcd 3.3.
etcdVersion = prometheus.NewGaugeVec(
prometheus.GaugeOpts{
Namespace: namespace,
Name: "version_info",
Help: "Etcd server's binary version",
etcdVersion = metrics.NewGaugeVec(
&metrics.GaugeOpts{
Namespace: namespace,
Name: "version_info",
Help: "Etcd server's binary version",
StabilityLevel: metrics.ALPHA,
},
[]string{"binary_version"})
@ -227,14 +229,14 @@ func getVersion(lastSeenBinaryVersion *string) error {
// Delete the metric for the previous version.
if *lastSeenBinaryVersion != "" {
deleted := etcdVersion.Delete(prometheus.Labels{"binary_version": *lastSeenBinaryVersion})
deleted := etcdVersion.Delete(metrics.Labels{"binary_version": *lastSeenBinaryVersion})
if !deleted {
return errors.New("failed to delete previous version's metric")
}
}
// Record the new version in a metric.
etcdVersion.With(prometheus.Labels{
etcdVersion.With(metrics.Labels{
"binary_version": version.BinaryVersion,
}).Set(0)
*lastSeenBinaryVersion = version.BinaryVersion
@ -392,7 +394,6 @@ func main() {
// Register the metrics we defined above with prometheus.
customMetricRegistry.MustRegister(etcdVersion)
customMetricRegistry.Unregister(prometheus.NewGoCollector())
// Spawn threads for periodically scraping etcd version metrics.
stopCh := make(chan struct{})