Skip to content

Commit 1dd239d

Browse files
mmencnerotherpirate
authored andcommitted
Fix num_remapped_pgs field in ceph plugin (influxdata#5167)
1 parent f93274e commit 1dd239d

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

plugins/inputs/ceph/ceph.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ type CephStatus struct {
328328
NumInOSDs float64 `json:"num_in_osds"`
329329
Full bool `json:"full"`
330330
NearFull bool `json:"nearfull"`
331-
NumRemappedPGs float64 `json:"num_rempapped_pgs"`
331+
NumRemappedPGs float64 `json:"num_remapped_pgs"`
332332
} `json:"osdmap"`
333333
} `json:"osdmap"`
334334
PGMap struct {
@@ -373,13 +373,13 @@ func decodeStatus(acc telegraf.Accumulator, input string) error {
373373
// decodeStatusOsdmap decodes the OSD map portion of the output of 'ceph -s'
374374
func decodeStatusOsdmap(acc telegraf.Accumulator, data *CephStatus) error {
375375
fields := map[string]interface{}{
376-
"epoch": data.OSDMap.OSDMap.Epoch,
377-
"num_osds": data.OSDMap.OSDMap.NumOSDs,
378-
"num_up_osds": data.OSDMap.OSDMap.NumUpOSDs,
379-
"num_in_osds": data.OSDMap.OSDMap.NumInOSDs,
380-
"full": data.OSDMap.OSDMap.Full,
381-
"nearfull": data.OSDMap.OSDMap.NearFull,
382-
"num_rempapped_pgs": data.OSDMap.OSDMap.NumRemappedPGs,
376+
"epoch": data.OSDMap.OSDMap.Epoch,
377+
"num_osds": data.OSDMap.OSDMap.NumOSDs,
378+
"num_up_osds": data.OSDMap.OSDMap.NumUpOSDs,
379+
"num_in_osds": data.OSDMap.OSDMap.NumInOSDs,
380+
"full": data.OSDMap.OSDMap.Full,
381+
"nearfull": data.OSDMap.OSDMap.NearFull,
382+
"num_remapped_pgs": data.OSDMap.OSDMap.NumRemappedPGs,
383383
}
384384
acc.AddFields("ceph_osdmap", fields, map[string]string{})
385385
return nil

plugins/inputs/ceph/ceph_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -851,13 +851,13 @@ var cephStatusResults = []expectedResult{
851851
{
852852
metric: "ceph_osdmap",
853853
fields: map[string]interface{}{
854-
"epoch": float64(21734),
855-
"num_osds": float64(24),
856-
"num_up_osds": float64(24),
857-
"num_in_osds": float64(24),
858-
"full": false,
859-
"nearfull": false,
860-
"num_rempapped_pgs": float64(0),
854+
"epoch": float64(21734),
855+
"num_osds": float64(24),
856+
"num_up_osds": float64(24),
857+
"num_in_osds": float64(24),
858+
"full": false,
859+
"nearfull": false,
860+
"num_remapped_pgs": float64(0),
861861
},
862862
tags: map[string]string{},
863863
},

0 commit comments

Comments
 (0)