Skip to content

Commit 7838655

Browse files
authored
iis: fix panic (#1820)
Signed-off-by: Jan-Otto Kröpke <[email protected]>
1 parent a9f8b3b commit 7838655

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

internal/collector/iis/iis_w3svc_w3wp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ func (c *Collector) collectW3SVCW3WP(ch chan<- prometheus.Metric) error {
405405
}
406406

407407
func (c *Collector) collectW3SVCW3WPv8(ch chan<- prometheus.Metric) error {
408-
err := c.w3SVCW3WPPerfDataCollector.Collect(&c.perfDataObjectW3SVCW3WPV8)
408+
err := c.w3SVCW3WPPerfDataCollectorV8.Collect(&c.perfDataObjectW3SVCW3WPV8)
409409
if err != nil {
410410
return fmt.Errorf("failed to collect APP_POOL_WAS metrics: %w", err)
411411
}

internal/collector/vmware/types.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package vmware
1717

1818
type perfDataCounterValuesCPU struct {
19-
CouEffectiveVMSpeedMHz float64 `perfdata:"Effective VM Speed in MHz"` // \VM Processor(*)\Effective VM Speed in MHz
20-
CpuHostProcessorSpeedMHz float64 `perfdata:"Host processor speed in MHz"` // \VM Processor(*)\Host processor speed in MHz
21-
CpuLimitMHz float64 `perfdata:"Limit in MHz"` // \VM Processor(*)\Limit in MHz
22-
CpuReservationMHz float64 `perfdata:"Reservation in MHz"` // \VM Processor(*)\Reservation in MHz
23-
CpuShares float64 `perfdata:"Shares"` // \VM Processor(*)\Shares
24-
CpuStolenMs float64 `perfdata:"CPU stolen time"` // \VM Processor(*)\CPU stolen time
25-
CpuTimePercents float64 `perfdata:"% Processor Time"` // \VM Processor(*)\% Processor Time
19+
CPUEffectiveVMSpeedMHz float64 `perfdata:"Effective VM Speed in MHz"` // \VM Processor(*)\Effective VM Speed in MHz
20+
CPUHostProcessorSpeedMHz float64 `perfdata:"Host processor speed in MHz"` // \VM Processor(*)\Host processor speed in MHz
21+
CPULimitMHz float64 `perfdata:"Limit in MHz"` // \VM Processor(*)\Limit in MHz
22+
CPUReservationMHz float64 `perfdata:"Reservation in MHz"` // \VM Processor(*)\Reservation in MHz
23+
CPUShares float64 `perfdata:"Shares"` // \VM Processor(*)\Shares
24+
CPUStolenMs float64 `perfdata:"CPU stolen time"` // \VM Processor(*)\CPU stolen time
25+
CPUTimePercents float64 `perfdata:"% Processor Time"` // \VM Processor(*)\% Processor Time
2626
}
2727

2828
type perfDataCounterValuesMemory struct {

internal/collector/vmware/vmware.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -330,43 +330,43 @@ func (c *Collector) collectCpu(ch chan<- prometheus.Metric) error {
330330
ch <- prometheus.MustNewConstMetric(
331331
c.cpuLimitMHz,
332332
prometheus.GaugeValue,
333-
c.perfDataObjectCPU[0].CpuLimitMHz,
333+
c.perfDataObjectCPU[0].CPULimitMHz,
334334
)
335335

336336
ch <- prometheus.MustNewConstMetric(
337337
c.cpuReservationMHz,
338338
prometheus.GaugeValue,
339-
c.perfDataObjectCPU[0].CpuReservationMHz,
339+
c.perfDataObjectCPU[0].CPUReservationMHz,
340340
)
341341

342342
ch <- prometheus.MustNewConstMetric(
343343
c.cpuShares,
344344
prometheus.GaugeValue,
345-
c.perfDataObjectCPU[0].CpuShares,
345+
c.perfDataObjectCPU[0].CPUShares,
346346
)
347347

348348
ch <- prometheus.MustNewConstMetric(
349349
c.cpuStolenTotal,
350350
prometheus.CounterValue,
351-
utils.MilliSecToSec(c.perfDataObjectCPU[0].CpuStolenMs),
351+
utils.MilliSecToSec(c.perfDataObjectCPU[0].CPUStolenMs),
352352
)
353353

354354
ch <- prometheus.MustNewConstMetric(
355355
c.cpuTimeTotal,
356356
prometheus.CounterValue,
357-
utils.MilliSecToSec(c.perfDataObjectCPU[0].CpuTimePercents),
357+
utils.MilliSecToSec(c.perfDataObjectCPU[0].CPUTimePercents),
358358
)
359359

360360
ch <- prometheus.MustNewConstMetric(
361361
c.cpuEffectiveVMSpeedMHz,
362362
prometheus.GaugeValue,
363-
c.perfDataObjectCPU[0].CouEffectiveVMSpeedMHz,
363+
c.perfDataObjectCPU[0].CPUEffectiveVMSpeedMHz,
364364
)
365365

366366
ch <- prometheus.MustNewConstMetric(
367367
c.hostProcessorSpeedMHz,
368368
prometheus.GaugeValue,
369-
c.perfDataObjectCPU[0].CpuHostProcessorSpeedMHz,
369+
c.perfDataObjectCPU[0].CPUHostProcessorSpeedMHz,
370370
)
371371

372372
return nil

0 commit comments

Comments
 (0)