etcdserver: add alarms metrics for server
Signed-off-by: yuzhiquanlong <yuzhiquanlong@gmail.com>dependabot/go_modules/go.uber.org/atomic-1.10.0
parent
5fab045242
commit
4c13767881
|
@ -83,6 +83,7 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.5.0...v3.6.0).
|
||||||
See [List of metrics](https://etcd.io/docs/latest/metrics/) for all metrics per release.
|
See [List of metrics](https://etcd.io/docs/latest/metrics/) for all metrics per release.
|
||||||
|
|
||||||
- Add [`etcd_disk_defrag_inflight`](https://github.com/etcd-io/etcd/pull/13371).
|
- Add [`etcd_disk_defrag_inflight`](https://github.com/etcd-io/etcd/pull/13371).
|
||||||
|
- Add [`etcd_debugging_server_alarms`](https://github.com/etcd-io/etcd/pull/14276).
|
||||||
|
|
||||||
### Go
|
### Go
|
||||||
- Compile with [Go 1.17+](https://golang.org/doc/devel/release.html#go1.17)
|
- Compile with [Go 1.17+](https://golang.org/doc/devel/release.html#go1.17)
|
||||||
|
|
|
@ -17,7 +17,6 @@ package apply
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/coreos/go-semver/semver"
|
|
||||||
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
|
||||||
"go.etcd.io/etcd/api/v3/membershippb"
|
"go.etcd.io/etcd/api/v3/membershippb"
|
||||||
"go.etcd.io/etcd/client/pkg/v3/types"
|
"go.etcd.io/etcd/client/pkg/v3/types"
|
||||||
|
@ -34,9 +33,10 @@ import (
|
||||||
serverstorage "go.etcd.io/etcd/server/v3/storage"
|
serverstorage "go.etcd.io/etcd/server/v3/storage"
|
||||||
"go.etcd.io/etcd/server/v3/storage/backend"
|
"go.etcd.io/etcd/server/v3/storage/backend"
|
||||||
"go.etcd.io/etcd/server/v3/storage/mvcc"
|
"go.etcd.io/etcd/server/v3/storage/mvcc"
|
||||||
|
|
||||||
"github.com/gogo/protobuf/proto"
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
|
||||||
|
"github.com/coreos/go-semver/semver"
|
||||||
|
"github.com/gogo/protobuf/proto"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -231,12 +231,14 @@ func (a *applierV3backend) Alarm(ar *pb.AlarmRequest) (*pb.AlarmResponse, error)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
resp.Alarms = append(resp.Alarms, m)
|
resp.Alarms = append(resp.Alarms, m)
|
||||||
|
alarms.WithLabelValues(types.ID(ar.MemberID).String(), m.Alarm.String()).Inc()
|
||||||
case pb.AlarmRequest_DEACTIVATE:
|
case pb.AlarmRequest_DEACTIVATE:
|
||||||
m := a.alarmStore.Deactivate(types.ID(ar.MemberID), ar.Alarm)
|
m := a.alarmStore.Deactivate(types.ID(ar.MemberID), ar.Alarm)
|
||||||
if m == nil {
|
if m == nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
resp.Alarms = append(resp.Alarms, m)
|
resp.Alarms = append(resp.Alarms, m)
|
||||||
|
alarms.WithLabelValues(types.ID(ar.MemberID).String(), m.Alarm.String()).Dec()
|
||||||
default:
|
default:
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
// Copyright 2022 The etcd Authors
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package apply
|
||||||
|
|
||||||
|
import "github.com/prometheus/client_golang/prometheus"
|
||||||
|
|
||||||
|
var (
|
||||||
|
alarms = prometheus.NewGaugeVec(prometheus.GaugeOpts{
|
||||||
|
Namespace: "etcd_debugging",
|
||||||
|
Subsystem: "server",
|
||||||
|
Name: "alarms",
|
||||||
|
Help: "Alarms for every member in cluster. 1 for 'server_id' label with current ID. 2 for 'alarm_type' label with type of this alarm",
|
||||||
|
},
|
||||||
|
[]string{"server_id", "alarm_type"})
|
||||||
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
prometheus.MustRegister(alarms)
|
||||||
|
}
|
Loading…
Reference in New Issue