Skip to content

Commit

Permalink
Merge pull request #9845 from wenjiaswe/automated-cherry-pick-of-#896…
Browse files Browse the repository at this point in the history
…0-upstream-release-3.2

Automated cherry pick of #8960
  • Loading branch information
gyuho authored Jun 13, 2018
2 parents ad7db2b + b163084 commit 5e6adfa
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions etcdserver/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"time"

"github.com/coreos/etcd/pkg/runtime"
"github.com/coreos/etcd/version"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down Expand Up @@ -70,6 +71,13 @@ var (
Name: "lease_expired_total",
Help: "The total number of expired leases.",
})
currentVersion = prometheus.NewGaugeVec(prometheus.GaugeOpts{
Namespace: "etcd",
Subsystem: "server",
Name: "version",
Help: "Which version is running. 1 for 'server_version' label with current version.",
},
[]string{"server_version"})
)

func init() {
Expand All @@ -81,6 +89,11 @@ func init() {
prometheus.MustRegister(proposalsPending)
prometheus.MustRegister(proposalsFailed)
prometheus.MustRegister(leaseExpired)
prometheus.MustRegister(currentVersion)

currentVersion.With(prometheus.Labels{
"server_version": version.Version,
}).Set(1)
}

func monitorFileDescriptor(done <-chan struct{}) {
Expand Down

0 comments on commit 5e6adfa

Please sign in to comment.