这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

cmd/scollector: Collect controller and ps hardware metadata #1383

Merged
merged 1 commit into from
Oct 6, 2015
Merged

cmd/scollector: Collect controller and ps hardware metadata #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 43 additions & 3 deletions cmd/scollector/collectors/dell_hw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,23 @@ func c_omreport_ps() (opentsdb.MultiDataPoint, error) {
return
}
id := strings.Replace(fields[0], ":", "_", -1)
Add(&md, "hw.ps", severity(fields[1]), opentsdb.TagSet{"id": id}, metadata.Gauge, metadata.Ok, descDellHWPS)
ts := opentsdb.TagSet{"id": id}
Add(&md, "hw.ps", severity(fields[1]), ts, metadata.Gauge, metadata.Ok, descDellHWPS)
pm := &metadata.HWPowerSupply{}
if len(fields) < 6 {
return
}
if fields[4] != "" {
pm.RatedInputWattage = fields[4]
}
if fields[5] != "" {
pm.RatedOutputWattage = fields[5]
}
if j, err := json.Marshal(&pm); err == nil {
metadata.AddMeta("", ts, "psMeta", string(j), true)
} else {
slog.Error(err)
}
}, "chassis", "pwrsupplies")
return md, nil
}
Expand Down Expand Up @@ -138,7 +154,32 @@ func c_omreport_storage_controller() (opentsdb.MultiDataPoint, error) {
}
c_omreport_storage_pdisk(fields[0], &md)
id := strings.Replace(fields[0], ":", "_", -1)
Add(&md, "hw.storage.controller", severity(fields[1]), opentsdb.TagSet{"id": id}, metadata.Gauge, metadata.Ok, descDellHWStorageCtl)
ts := opentsdb.TagSet{"id": id}
Add(&md, "hw.storage.controller", severity(fields[1]), ts, metadata.Gauge, metadata.Ok, descDellHWStorageCtl)
cm := &metadata.HWControllerMeta{}
if len(fields) < 8 {
return
}
if fields[2] != "" {
cm.Name = fields[2]
}
if fields[3] != "" {
cm.SlotId = fields[3]
}
if fields[4] != "" {
cm.State = fields[4]
}
if fields[5] != "" {
cm.FirmwareVersion = fields[5]
}
if fields[7] != "" {
cm.DriverVersion = fields[7]
}
if j, err := json.Marshal(&cm); err == nil {
metadata.AddMeta("", ts, "controllerMeta", string(j), true)
} else {
slog.Error(err)
}
}, "storage", "controller")
return md, nil
}
Expand Down Expand Up @@ -193,7 +234,6 @@ func c_omreport_storage_pdisk(id string, md *opentsdb.MultiDataPoint) {
} else {
slog.Error(err)
}

}, "storage", "pdisk", "controller="+id)
}

Expand Down
13 changes: 13 additions & 0 deletions metadata/shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,16 @@ type HWDiskMeta struct {
CapableSpeed string
SectorSize string
}

type HWControllerMeta struct {
Name string
SlotId string
State string
FirmwareVersion string
DriverVersion string
}

type HWPowerSupply struct {
RatedInputWattage string
RatedOutputWattage string
}