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

feat: AFF250 Power calculation #2211

Merged
merged 7 commits into from
Jul 20, 2023
Merged

feat: AFF250 Power calculation #2211

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
129bc35
feat: AFF250 Power calculation
rahulguptajss Jul 18, 2023
1beb49f
feat: AFF250 Power calculation
rahulguptajss Jul 19, 2023
e72258f
feat: address review comments
rahulguptajss Jul 20, 2023
6074812
feat: add information in dashboard
rahulguptajss Jul 20, 2023
a378a8b
Merge remote-tracking branch 'origin/main' into rg2-power-watts
rahulguptajss Jul 20, 2023
7610fdd
feat: add test case
rahulguptajss Jul 20, 2023
2011ee7
feat: address review comments
rahulguptajss Jul 20, 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
11 changes: 11 additions & 0 deletions cmd/collectors/commonutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ const (
MaxAllowedTimeDrift = 10 * time.Second
)

var validUnits = map[string]bool{
"mW": true,
"W": true,
"mW*hr": true,
"W*hr": true,
}

func InvokeRestCall(client *rest.Client, href string, logger *logging.Logger) ([]gjson.Result, error) {
result, err := rest.Fetch(client, href)
if err != nil {
Expand Down Expand Up @@ -192,3 +199,7 @@ func UpdateLagTime(instance *matrix.Instance, lastTransferSize *matrix.Metric, l
}
}
}

func IsValidUnit(unit string) bool {
return validUnits[unit]
}
24 changes: 21 additions & 3 deletions cmd/collectors/rest/plugins/sensor/sensor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package sensor

import (
"fmt"
"github.com/netapp/harvest/v2/cmd/collectors"
"github.com/netapp/harvest/v2/cmd/poller/plugin"
"github.com/netapp/harvest/v2/pkg/dict"
"github.com/netapp/harvest/v2/pkg/matrix"
Expand Down Expand Up @@ -156,7 +157,7 @@ func (my *Sensor) calculateEnvironmentMetrics(data *matrix.Matrix) ([]*matrix.Ma

if isPowerMatch {
if value, ok := metric.GetValueFloat64(instance); ok {
if sensorUnit != "mW" && sensorUnit != "W" {
if !collectors.IsValidUnit(sensorUnit) {
my.Logger.Warn().Str("unit", sensorUnit).Float64("value", value).Msg("unknown power unit")
} else {
if sensorEnvironmentMetricMap[iKey].powerSensor == nil {
Expand Down Expand Up @@ -197,6 +198,8 @@ func (my *Sensor) calculateEnvironmentMetrics(data *matrix.Matrix) ([]*matrix.Ma
Msg("sensor excluded")
}

whrSensors := make(map[string]*sensorValue)

for key, v := range sensorEnvironmentMetricMap {
instance, err := my.data.NewInstance(key)
if err != nil {
Expand All @@ -212,13 +215,16 @@ func (my *Sensor) calculateEnvironmentMetrics(data *matrix.Matrix) ([]*matrix.Ma
var sumPower float64
if len(v.powerSensor) > 0 {
for _, v1 := range v.powerSensor {
if v1.unit == "mW" {
if v1.unit == "mW" || v1.unit == "mW*hr" {
sumPower += v1.value / 1000
} else if v1.unit == "W" {
} else if v1.unit == "W" || v1.unit == "W*hr" {
sumPower += v1.value
} else {
my.Logger.Warn().Str("unit", v1.unit).Float64("value", v1.value).Msg("unknown power unit")
}
if v1.unit == "mW*hr" || v1.unit == "W*hr" {
whrSensors[v1.name] = v1
}
}
} else if len(v.voltageSensor) > 0 && len(v.voltageSensor) == len(v.currentSensor) {
// sort voltage keys
Expand Down Expand Up @@ -333,5 +339,17 @@ func (my *Sensor) calculateEnvironmentMetrics(data *matrix.Matrix) ([]*matrix.Ma
}
}
}

if len(whrSensors) > 0 {
var whrSensorsStr string
for _, v := range whrSensors {
if v != nil {
whrSensorsStr += " sensor:" + fmt.Sprintf("%v", *v)
}
}
my.Logger.Info().Str("sensor", whrSensorsStr).
Msg("sensor with *hr units")
}

return []*matrix.Matrix{my.data}, nil
}
26 changes: 22 additions & 4 deletions cmd/collectors/zapi/plugins/sensor/sensor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package sensor

import (
"fmt"
"github.com/netapp/harvest/v2/cmd/collectors"
"github.com/netapp/harvest/v2/cmd/poller/plugin"
"github.com/netapp/harvest/v2/pkg/dict"
"github.com/netapp/harvest/v2/pkg/matrix"
Expand Down Expand Up @@ -160,7 +161,7 @@ func (my *Sensor) calculateEnvironmentMetrics(data *matrix.Matrix) ([]*matrix.Ma

if isPowerMatch {
if value, ok := metric.GetValueFloat64(instance); ok {
if sensorUnit != "mW" && sensorUnit != "W" {
if !collectors.IsValidUnit(sensorUnit) {
my.Logger.Warn().Str("unit", sensorUnit).Float64("value", value).Msg("unknown power unit")
} else {
if sensorEnvironmentMetricMap[iKey].powerSensor == nil {
Expand Down Expand Up @@ -201,6 +202,8 @@ func (my *Sensor) calculateEnvironmentMetrics(data *matrix.Matrix) ([]*matrix.Ma
Msg("sensor excluded")
}

whrSensors := make(map[string]*sensorValue)

for key, v := range sensorEnvironmentMetricMap {
instance, err := my.data.NewInstance(key)
if err != nil {
Expand All @@ -216,12 +219,15 @@ func (my *Sensor) calculateEnvironmentMetrics(data *matrix.Matrix) ([]*matrix.Ma
var sumPower float64
if len(v.powerSensor) > 0 {
for _, v1 := range v.powerSensor {
if v1.unit == "mW" {
if v1.unit == "mW" || v1.unit == "mW*hr" {
sumPower += v1.value / 1000
} else if v1.unit == "W" {
} else if v1.unit == "W" || v1.unit == "W*hr" {
sumPower += v1.value
} else {
my.Logger.Warn().Str("node", key).Str("unit", v1.unit).Float64("value", v1.value).Msg("unknown power unit")
my.Logger.Warn().Str("node", key).Str("name", v1.name).Str("unit", v1.unit).Float64("value", v1.value).Msg("unknown power unit")
}
if v1.unit == "mW*hr" || v1.unit == "W*hr" {
whrSensors[v1.name] = v1
}
}
} else if len(v.voltageSensor) > 0 && len(v.voltageSensor) == len(v.currentSensor) {
Expand Down Expand Up @@ -338,5 +344,17 @@ func (my *Sensor) calculateEnvironmentMetrics(data *matrix.Matrix) ([]*matrix.Ma
}
}
}

if len(whrSensors) > 0 {
var whrSensorsStr string
for _, v := range whrSensors {
if v != nil {
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
whrSensorsStr += " sensor:" + fmt.Sprintf("%v", *v)
}
}
my.Logger.Info().Str("sensor", whrSensorsStr).
Msg("sensor with *hr units")
}

return []*matrix.Matrix{my.data}, nil
}