From 78af5e411e83feb0471146f19b6537707d3a682a Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Thu, 8 Jun 2017 10:12:37 -0700 Subject: [PATCH] etcdserver: add leaseRevoked metrics Fix https://github.com/coreos/etcd/issues/8050. Signed-off-by: Gyu-Ho Lee --- etcdserver/metrics.go | 7 +++++++ etcdserver/server.go | 1 + 2 files changed, 8 insertions(+) diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go index 2b549f738f7b..af548e8563ed 100644 --- a/etcdserver/metrics.go +++ b/etcdserver/metrics.go @@ -58,6 +58,12 @@ var ( Name: "proposals_failed_total", Help: "The total number of failed proposals seen.", }) + leaseExpired = prometheus.NewGauge(prometheus.GaugeOpts{ + Namespace: "etcd", + Subsystem: "server", + Name: "lease_expired_total", + Help: "The total number of expired lease.", + }) ) func init() { @@ -67,6 +73,7 @@ func init() { prometheus.MustRegister(proposalsApplied) prometheus.MustRegister(proposalsPending) prometheus.MustRegister(proposalsFailed) + prometheus.MustRegister(leaseExpired) } func monitorFileDescriptor(done <-chan struct{}) { diff --git a/etcdserver/server.go b/etcdserver/server.go index 0bb0885f9c04..070063777573 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -749,6 +749,7 @@ func (s *EtcdServer) run() { s.goAttach(func() { ctx := s.authStore.WithRoot(s.ctx) s.LeaseRevoke(ctx, &pb.LeaseRevokeRequest{ID: int64(lid)}) + leaseExpired.Inc() <-c }) }