time: refactor collector (#1728)

This commit is contained in:
Jan-Otto Kröpke
2024-11-13 19:26:47 +01:00
committed by GitHub
parent b53f18bcc6
commit b4f50c542c
7 changed files with 159 additions and 89 deletions

View File

@@ -9,16 +9,16 @@ const (
cpuStolenMs = "CPU stolen time" // \VM Processor(*)\CPU stolen time
cpuTimePercents = "% Processor Time" // \VM Processor(*)\% Processor Time
MemActiveMB = "MemActiveMB" // \VM Memory\Memory Active in MB
MemBalloonedMB = "MemBalloonedMB" // \VM Memory\Memory Ballooned in MB
MemLimitMB = "MemLimitMB" // \VM Memory\Memory Limit in MB
MemMappedMB = "MemMappedMB" // \VM Memory\Memory Mapped in MB
MemOverheadMB = "MemOverheadMB" // \VM Memory\Memory Overhead in MB
MemReservationMB = "MemReservationMB" // \VM Memory\Memory Reservation in MB
MemSharedMB = "MemSharedMB" // \VM Memory\Memory Shared in MB
MemSharedSavedMB = "MemSharedSavedMB" // \VM Memory\Memory Shared Saved in MB
MemShares = "MemShares" // \VM Memory\Memory Shares
MemSwappedMB = "MemSwappedMB" // \VM Memory\Memory Swapped in MB
MemTargetSizeMB = "MemTargetSizeMB" // \VM Memory\Memory Target Size
MemUsedMB = "MemUsedMB" // \VM Memory\Memory Used in MB
memActiveMB = "MemActiveMB" // \VM Memory\Memory Active in MB
memBalloonedMB = "MemBalloonedMB" // \VM Memory\Memory Ballooned in MB
memLimitMB = "MemLimitMB" // \VM Memory\Memory Limit in MB
memMappedMB = "MemMappedMB" // \VM Memory\Memory Mapped in MB
memOverheadMB = "MemOverheadMB" // \VM Memory\Memory Overhead in MB
memReservationMB = "MemReservationMB" // \VM Memory\Memory Reservation in MB
memSharedMB = "MemSharedMB" // \VM Memory\Memory Shared in MB
memSharedSavedMB = "MemSharedSavedMB" // \VM Memory\Memory Shared Saved in MB
memShares = "MemShares" // \VM Memory\Memory Shares
memSwappedMB = "MemSwappedMB" // \VM Memory\Memory Swapped in MB
memTargetSizeMB = "MemTargetSizeMB" // \VM Memory\Memory Target Size
memUsedMB = "MemUsedMB" // \VM Memory\Memory Used in MB
)

View File

@@ -143,18 +143,18 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
)
counters = []string{
MemActiveMB,
MemBalloonedMB,
MemLimitMB,
MemMappedMB,
MemOverheadMB,
MemReservationMB,
MemSharedMB,
MemSharedSavedMB,
MemShares,
MemSwappedMB,
MemTargetSizeMB,
MemUsedMB,
memActiveMB,
memBalloonedMB,
memLimitMB,
memMappedMB,
memOverheadMB,
memReservationMB,
memSharedMB,
memSharedSavedMB,
memShares,
memSwappedMB,
memTargetSizeMB,
memUsedMB,
}
c.perfDataCollectorMemory, err = perfdata.NewCollector(perfdata.V2, "VM Memory", nil, counters)
@@ -268,73 +268,73 @@ func (c *Collector) collectMem(ch chan<- prometheus.Metric) error {
ch <- prometheus.MustNewConstMetric(
c.memActive,
prometheus.GaugeValue,
utils.MBToBytes(data[MemActiveMB].FirstValue),
utils.MBToBytes(data[memActiveMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memBallooned,
prometheus.GaugeValue,
utils.MBToBytes(data[MemBalloonedMB].FirstValue),
utils.MBToBytes(data[memBalloonedMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memLimit,
prometheus.GaugeValue,
utils.MBToBytes(data[MemLimitMB].FirstValue),
utils.MBToBytes(data[memLimitMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memMapped,
prometheus.GaugeValue,
utils.MBToBytes(data[MemMappedMB].FirstValue),
utils.MBToBytes(data[memMappedMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memOverhead,
prometheus.GaugeValue,
utils.MBToBytes(data[MemOverheadMB].FirstValue),
utils.MBToBytes(data[memOverheadMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memReservation,
prometheus.GaugeValue,
utils.MBToBytes(data[MemReservationMB].FirstValue),
utils.MBToBytes(data[memReservationMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memShared,
prometheus.GaugeValue,
utils.MBToBytes(data[MemSharedMB].FirstValue),
utils.MBToBytes(data[memSharedMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memSharedSaved,
prometheus.GaugeValue,
utils.MBToBytes(data[MemSharedSavedMB].FirstValue),
utils.MBToBytes(data[memSharedSavedMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memShares,
prometheus.GaugeValue,
data[MemShares].FirstValue,
data[memShares].FirstValue,
)
ch <- prometheus.MustNewConstMetric(
c.memSwapped,
prometheus.GaugeValue,
utils.MBToBytes(data[MemSwappedMB].FirstValue),
utils.MBToBytes(data[memSwappedMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memTargetSize,
prometheus.GaugeValue,
utils.MBToBytes(data[MemTargetSizeMB].FirstValue),
utils.MBToBytes(data[memTargetSizeMB].FirstValue),
)
ch <- prometheus.MustNewConstMetric(
c.memUsed,
prometheus.GaugeValue,
utils.MBToBytes(data[MemUsedMB].FirstValue),
utils.MBToBytes(data[memUsedMB].FirstValue),
)
return nil