RepoMirrors
/
ceph_exporter
mirror of https://github.com/digitalocean/ceph_exporter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds per osd tracking of nearfull,backfillfull, and full states (#119)

This commit is contained in:
ssobolewski 2019-05-28 10:42:01 -06:00 committed by GitHub
parent 4b62362942
commit 3cbdd8e1f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 109 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
collectors/osd.go
View File

@ -79,6 +79,15 @@ type OSDCollector struct {
// OSDUp displays the Up state of the OSD
OSDUp *prometheus.GaugeVec
// OSDFull flags if an osd is full
OSDFull *prometheus.GaugeVec
// OSDNearfull flags if an osd is near full
OSDNearFull *prometheus.GaugeVec
// OSDBackfillFull flags if an osd is backfill full
OSDBackfillFull *prometheus.GaugeVec
// OSDDownDesc displays OSDs present in the cluster in "down" state
OSDDownDesc *prometheus.Desc
@ -273,6 +282,37 @@ func NewOSDCollector(conn Conn, cluster string) *OSDCollector {
},
[]string{"osd"},
),
OSDFull: prometheus.NewGaugeVec(
prometheus.GaugeOpts{
Namespace: cephNamespace,
Name: "osd_full",
Help: "OSD Full Status",
ConstLabels: labels,
},
[]string{"osd"},
),
OSDNearFull: prometheus.NewGaugeVec(
prometheus.GaugeOpts{
Namespace: cephNamespace,
Name: "osd_near_full",
Help: "OSD Near Full Status",
ConstLabels: labels,
},
[]string{"osd"},
),
OSDBackfillFull: prometheus.NewGaugeVec(
prometheus.GaugeOpts{
Namespace: cephNamespace,
Name: "osd_backfill_full",
Help: "OSD Backfill Full Status",
ConstLabels: labels,
},
[]string{"osd"},
),
OSDDownDesc: prometheus.NewDesc(
fmt.Sprintf("%s_osd_down", cephNamespace),
"No. of OSDs down in the cluster",
@ -307,6 +347,9 @@ func (o *OSDCollector) collectorList() []prometheus.Collector {
o.ApplyLatency,
o.OSDIn,
o.OSDUp,
o.OSDFull,
o.OSDNearFull,
o.OSDBackfillFull,
}
}
@ -344,9 +387,10 @@ type cephPerfStat struct {
type cephOSDDump struct {
OSDs []struct {
OSD json.Number `json:"osd"`
Up json.Number `json:"up"`
In json.Number `json:"in"`
OSD json.Number `json:"osd"`
Up json.Number `json:"up"`
In json.Number `json:"in"`
State []string `json:"state"`
} `json:"osds"`
}
@ -579,6 +623,20 @@ func (o *OSDCollector) collectOSDDump() error {
}
o.OSDUp.WithLabelValues(osdName).Set(up)
o.OSDFull.WithLabelValues(osdName).Set(0)
o.OSDNearFull.WithLabelValues(osdName).Set(0)
o.OSDBackfillFull.WithLabelValues(osdName).Set(0)
for _, state := range dumpInfo.State {
switch state {
case "full":
o.OSDFull.WithLabelValues(osdName).Set(1)
case "nearfull":
o.OSDNearFull.WithLabelValues(osdName).Set(1)
case "backfillfull":
o.OSDBackfillFull.WithLabelValues(osdName).Set(1)
}
}
}
return nil
@ -701,20 +759,20 @@ func (o *OSDCollector) Describe(ch chan<- *prometheus.Desc) {
// It requires the caller to handle synchronization.
func (o *OSDCollector) Collect(ch chan<- prometheus.Metric) {
// Reset daemon specifc metrics; daemons can leave the cluster
o.CrushWeight.Reset()
o.Depth.Reset()
o.Reweight.Reset()
o.Bytes.Reset()
o.UsedBytes.Reset()
o.AvailBytes.Reset()
o.Utilization.Reset()
o.Variance.Reset()
o.Pgs.Reset()
o.CommitLatency.Reset()
o.ApplyLatency.Reset()
o.OSDIn.Reset()
o.OSDUp.Reset()
// Reset daemon specifc metrics; daemons can leave the cluster
o.CrushWeight.Reset()
o.Depth.Reset()
o.Reweight.Reset()
o.Bytes.Reset()
o.UsedBytes.Reset()
o.AvailBytes.Reset()
o.Utilization.Reset()
o.Variance.Reset()
o.Pgs.Reset()
o.CommitLatency.Reset()
o.ApplyLatency.Reset()
o.OSDIn.Reset()
o.OSDUp.Reset()
if err := o.collectOSDPerf(); err != nil {
log.Println("failed collecting osd perf stats:", err)

37
collectors/osd_test.go
View File

@ -232,19 +232,35 @@ func TestOSDCollector(t *testing.T) {
"osd": 2,
"uuid": "ca9ab3de",
"up": 1,
"in": 1
"in": 1,
"state": [
"nearfull",
"exists",
"up"
]
},
{
"osd": 3,
"uuid": "bef98b10",
"up": 1,
"in": 1
"in": 1,
"state": [
"full",
"backfillfull",
"exists",
"up"
]
},
{
"osd": 4,
"uuid": "5936c9e8",
"up": 0,
"in": 0
"in": 0,
"state": [
"backfillfull",
"exists",
"up"
]
}
]
}
@ -260,6 +276,21 @@ func TestOSDCollector(t *testing.T) {
regexp.MustCompile(`ceph_osd_up{cluster="ceph",osd="osd.2"} 1`),
regexp.MustCompile(`ceph_osd_up{cluster="ceph",osd="osd.3"} 1`),
regexp.MustCompile(`ceph_osd_up{cluster="ceph",osd="osd.4"} 0`),
regexp.MustCompile(`ceph_osd_full{cluster="ceph",osd="osd.0"} 0`),
regexp.MustCompile(`ceph_osd_full{cluster="ceph",osd="osd.1"} 0`),
regexp.MustCompile(`ceph_osd_full{cluster="ceph",osd="osd.2"} 0`),
regexp.MustCompile(`ceph_osd_full{cluster="ceph",osd="osd.3"} 1`),
regexp.MustCompile(`ceph_osd_full{cluster="ceph",osd="osd.4"} 0`),
regexp.MustCompile(`ceph_osd_near_full{cluster="ceph",osd="osd.0"} 0`),
regexp.MustCompile(`ceph_osd_near_full{cluster="ceph",osd="osd.1"} 0`),
regexp.MustCompile(`ceph_osd_near_full{cluster="ceph",osd="osd.2"} 1`),
regexp.MustCompile(`ceph_osd_near_full{cluster="ceph",osd="osd.3"} 0`),
regexp.MustCompile(`ceph_osd_near_full{cluster="ceph",osd="osd.4"} 0`),
regexp.MustCompile(`ceph_osd_backfill_full{cluster="ceph",osd="osd.0"} 0`),
regexp.MustCompile(`ceph_osd_backfill_full{cluster="ceph",osd="osd.1"} 0`),
regexp.MustCompile(`ceph_osd_backfill_full{cluster="ceph",osd="osd.2"} 0`),
regexp.MustCompile(`ceph_osd_backfill_full{cluster="ceph",osd="osd.3"} 1`),
regexp.MustCompile(`ceph_osd_backfill_full{cluster="ceph",osd="osd.4"} 1`),
},
},
{