adding rcmp.host to error log messages

This commit is contained in:
Danny Kulchinsky 2019-03-16 12:41:05 -04:00
parent 684e696b9a
commit 7e5c643b90
1 changed files with 7 additions and 7 deletions

View File

@ -370,13 +370,13 @@ func collectGenericSensor(ch chan<- prometheus.Metric, state float64, data senso
func collectMonitoring(ch chan<- prometheus.Metric, target ipmiTarget) (int, error) { func collectMonitoring(ch chan<- prometheus.Metric, target ipmiTarget) (int, error) {
output, err := ipmiMonitoringOutput(target) output, err := ipmiMonitoringOutput(target)
if err != nil { if err != nil {
log.Errorf("Failed to collect ipmimonitoring data: %s", err) log.Errorf("Failed to collect ipmimonitoring data from %s: %s", rcmp.host, err)
return 0, err return 0, err
} }
excludeIds := target.config.ExcludeSensorIDs excludeIds := target.config.ExcludeSensorIDs
results, err := splitMonitoringOutput(output, excludeIds) results, err := splitMonitoringOutput(output, excludeIds)
if err != nil { if err != nil {
log.Errorf("Failed to parse ipmimonitoring data: %s", err) log.Errorf("Failed to parse ipmimonitoring data from %s: %s", rcmp.host, err)
return 0, err return 0, err
} }
for _, data := range results { for _, data := range results {
@ -419,12 +419,12 @@ func collectMonitoring(ch chan<- prometheus.Metric, target ipmiTarget) (int, err
func collectDCMI(ch chan<- prometheus.Metric, target ipmiTarget) (int, error) { func collectDCMI(ch chan<- prometheus.Metric, target ipmiTarget) (int, error) {
output, err := ipmiDCMIOutput(target) output, err := ipmiDCMIOutput(target)
if err != nil { if err != nil {
log.Debugf("Failed to collect ipmi-dcmi data: %s", err) log.Debugf("Failed to collect ipmi-dcmi data from %s: %s", rcmp.host, err)
return 0, err return 0, err
} }
currentPowerConsumption, err := getCurrentPowerConsumption(output) currentPowerConsumption, err := getCurrentPowerConsumption(output)
if err != nil { if err != nil {
log.Errorf("Failed to parse ipmi-dcmi data: %s", err) log.Errorf("Failed to parse ipmi-dcmi data from %s: %s", rcmp.host, err)
return 0, err return 0, err
} }
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
@ -438,17 +438,17 @@ func collectDCMI(ch chan<- prometheus.Metric, target ipmiTarget) (int, error) {
func collectBmcInfo(ch chan<- prometheus.Metric, target ipmiTarget) (int, error) { func collectBmcInfo(ch chan<- prometheus.Metric, target ipmiTarget) (int, error) {
output, err := bmcInfoOutput(target) output, err := bmcInfoOutput(target)
if err != nil { if err != nil {
log.Debugf("Failed to collect bmc-info data: %s", err) log.Debugf("Failed to collect bmc-info data from %s: %s", rcmp.host, err)
return 0, err return 0, err
} }
firmwareRevision, err := getBMCInfoFirmwareRevision(output) firmwareRevision, err := getBMCInfoFirmwareRevision(output)
if err != nil { if err != nil {
log.Errorf("Failed to parse bmc-info data: %s", err) log.Errorf("Failed to parse bmc-info data from %s: %s", rcmp.host, err)
return 0, err return 0, err
} }
manufacturerID, err := getBMCInfoManufacturerID(output) manufacturerID, err := getBMCInfoManufacturerID(output)
if err != nil { if err != nil {
log.Errorf("Failed to parse bmc-info data: %s", err) log.Errorf("Failed to parse bmc-info data from %s: %s", rcmp.host, err)
return 0, err return 0, err
} }
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(