gilles/scrutiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #725 from pabsi/706-add-wait-time-between-checks-fix-unit

Browse Source 
Issue 706: Fix time unit
This commit is contained in:
Jason Kulatunga
2024-11-26 09:48:53 -05:00
committed by GitHub
parent 0641b5e79d 9ad96e6d37
commit affe05e145
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
collector/pkg/collector/metrics.go
+8 -7
View File
@@ -4,6 +4,12 @@ import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/url"
"os"
"os/exec"
"strings"
"time"
"github.com/analogj/scrutiny/collector/pkg/common/shell" "github.com/analogj/scrutiny/collector/pkg/common/shell"
"github.com/analogj/scrutiny/collector/pkg/config" "github.com/analogj/scrutiny/collector/pkg/config"
"github.com/analogj/scrutiny/collector/pkg/detect" "github.com/analogj/scrutiny/collector/pkg/detect"
@@ -11,11 +17,6 @@ import (
"github.com/analogj/scrutiny/collector/pkg/models" "github.com/analogj/scrutiny/collector/pkg/models"
"github.com/samber/lo" "github.com/samber/lo"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"net/url"
"os"
"os/exec"
"strings"
"time"
) )
type MetricsCollector struct { type MetricsCollector struct {
@@ -92,7 +93,7 @@ func (mc *MetricsCollector) Run() error {
mc.Collect(device.WWN, device.DeviceName, device.DeviceType) mc.Collect(device.WWN, device.DeviceName, device.DeviceType)
if mc.config.GetInt("commands.metrics_smartctl_wait") > 0 { if mc.config.GetInt("commands.metrics_smartctl_wait") > 0 {
time.Sleep(time.Duration(mc.config.GetInt("commands.metrics_smartctl_wait")) * time.Millisecond) time.Sleep(time.Duration(mc.config.GetInt("commands.metrics_smartctl_wait")) * time.Second)
} }
} }
@@ -115,7 +116,7 @@ func (mc *MetricsCollector) Validate() error {
return nil return nil
} }
//func (mc *MetricsCollector) Collect(wg *sync.WaitGroup, deviceWWN string, deviceName string, deviceType string) { // func (mc *MetricsCollector) Collect(wg *sync.WaitGroup, deviceWWN string, deviceName string, deviceType string) {
func (mc *MetricsCollector) Collect(deviceWWN string, deviceName string, deviceType string) { func (mc *MetricsCollector) Collect(deviceWWN string, deviceName string, deviceType string) {
//defer wg.Done() //defer wg.Done()
if len(deviceWWN) == 0 { if len(deviceWWN) == 0 {