Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add block disk backend statistic label #39

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add block disk backend statistic label #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
161cf81
add block disk backend stat label
Feb 1, 2022
47b57d9
fix
Vatson112 Feb 2, 2022
9449cf4
add metric: read and write time for block device
Apr 13, 2022
fc9bad7
Merge pull request #1 from Vatson112/add-block-time-metric
Vatson112 Dec 12, 2023
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
9 changes: 5 additions & 4 deletions libvirt_schema/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ type Metadata struct {
}

type NovaInstance struct {
XMLName xml.Name `xml:"instance"`
Name string `xml:"name"`
Owner NovaOwner `xml:"owner"`
XMLName xml.Name `xml:"instance"`
Name string `xml:"name"`
Owner NovaOwner `xml:"owner"`
Flavor NovaFlavor `xml:"flavor"`
}

Expand Down Expand Up @@ -52,7 +52,8 @@ type Disk struct {
}

type DiskSource struct {
File string `xml:"file,attr"`
File string `xml:"file,attr"`
Device string `xml:"dev,attr"`
}

type DiskTarget struct {
Expand Down
73 changes: 66 additions & 7 deletions prometheus-libvirt-exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ var (
"Amount of CPU time used by the domain, in seconds.",
[]string{"domain", "instanceName", "instanceId", "flavorName", "userName", "userId", "projectName", "projectId", "host"},
nil)

// block devices
libvirtDomainBlockRdBytesDesc = prometheus.NewDesc(
prometheus.BuildFQName("libvirt", "domain_block_stats", "read_bytes_total"),
"Number of bytes read from a block device, in bytes.",
Expand All @@ -107,7 +107,16 @@ var (
"Number of write requests from a block device.",
[]string{"domain", "instanceName", "instanceId", "flavorName", "userName", "userId", "projectName", "projectId", "host", "source_file", "target_device"},
nil)

libvirtDomainBlockWrTimeDesc = prometheus.NewDesc(
prometheus.BuildFQName("libvirt", "domain_block_stats", "write_time_total"),
"Total duration of write requests from a block device. (ns)",
[]string{"domain", "instanceName", "instanceId", "flavorName", "userName", "userId", "projectName", "projectId", "host", "source_file", "target_device"},
nil)
libvirtDomainBlockRdTimeDesc = prometheus.NewDesc(
prometheus.BuildFQName("libvirt", "domain_block_stats", "read_time_total"),
"Total duration of read requests from a block device. (ns)",
[]string{"domain", "instanceName", "instanceId", "flavorName", "userName", "userId", "projectName", "projectId", "host", "source_file", "target_device"},
nil)
//DomainInterface
libvirtDomainInterfaceRxBytesDesc = prometheus.NewDesc(
prometheus.BuildFQName("libvirt", "domain_interface_stats", "receive_bytes_total"),
Expand Down Expand Up @@ -347,13 +356,49 @@ func CollectDomainBlockDeviceInfo(ch chan<- prometheus.Metric, l *libvirt.Libvir
continue
}

var rRdReq, rRdBytes, rWrReq, rWrBytes int64
if rRdReq, rRdBytes, rWrReq, rWrBytes, _, err = l.DomainBlockStats(domain.libvirtDomain, disk.Target.Device); err != nil {
logger.Warn("failed to get DomainBlockStats", zap.Error(err))
return err
var rRdReq, rRdBytes, rWrReq, rWrBytes, rWrTime, rRdTime int64
var diskParams []libvirt.TypedParam
var promDiskLabels []string

// for supported flags see https://libvirt.org/html/libvirt-libvirt-common.html#virTypedParameterFlags
// for nparams see go-libvirt/internal/constants/remote_protocol.gen.go DomainBlockStatsParametersMax
if diskParams, _, err = l.DomainBlockStatsFlags(domain.libvirtDomain, disk.Target.Device, 16, 4); err != nil {
logger.Warn("failed to get DomainBlockStatsFlags, switch to legacy api DomainBlockStats", zap.Error(err))

if rRdReq, rRdBytes, rWrReq, rWrBytes, _, err = l.DomainBlockStats(domain.libvirtDomain, disk.Target.Device); err != nil {
logger.Warn("failed to get DomainBlockStats", zap.Error(err))
return err
}

} else {
for _, diskParam := range diskParams {

// supported keys: wr_bytes, wr_operations, rd_bytes, rd_operations, flush_operations, flush_total_times, wr_total_times, rd_total_times
switch diskParam.Field {
case "wr_bytes":
rWrBytes = diskParam.Value.I.(int64)
case "wr_operations":
rWrReq = diskParam.Value.I.(int64)
case "rd_bytes":
rRdBytes = diskParam.Value.I.(int64)
case "rd_operations":
rRdReq = diskParam.Value.I.(int64)
case "wr_total_times":
rWrTime = diskParam.Value.I.(int64)
case "rd_total_times":
rRdTime = diskParam.Value.I.(int64)
}

}
}

// check if we have block or fs backend
if len(disk.Source.File) > 0 {
promDiskLabels = append(promLabels, disk.Source.File, disk.Target.Device)
} else if len(disk.Source.Device) > 0 {
promDiskLabels = append(promLabels, disk.Source.Device, disk.Target.Device)
}

promDiskLabels := append(promLabels, disk.Source.File, disk.Target.Device)
ch <- prometheus.MustNewConstMetric(
libvirtDomainBlockRdBytesDesc,
prometheus.CounterValue,
Expand All @@ -378,6 +423,18 @@ func CollectDomainBlockDeviceInfo(ch chan<- prometheus.Metric, l *libvirt.Libvir
float64(rWrReq),
promDiskLabels...)

ch <- prometheus.MustNewConstMetric(
libvirtDomainBlockWrTimeDesc,
prometheus.CounterValue,
float64(rWrTime),
promDiskLabels...)

ch <- prometheus.MustNewConstMetric(
libvirtDomainBlockRdTimeDesc,
prometheus.CounterValue,
float64(rRdTime),
promDiskLabels...)

}
return
}
Expand Down Expand Up @@ -513,6 +570,8 @@ func (e *LibvirtExporter) Describe(ch chan<- *prometheus.Desc) {
ch <- libvirtDomainBlockRdReqDesc
ch <- libvirtDomainBlockWrBytesDesc
ch <- libvirtDomainBlockWrReqDesc
ch <- libvirtDomainBlockWrTimeDesc
ch <- libvirtDomainBlockRdTimeDesc

//domain interface
ch <- libvirtDomainInterfaceRxBytesDesc
Expand Down