RepoMirrors
/
json_exporter
mirror of https://github.com/prometheus-community/json_exporter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix lint issues. 

Signed-off-by: Ben Kochie <superq@gmail.com>
This commit is contained in:
Ben Kochie 2020-04-17 08:59:32 +02:00
parent 429000ac5e
commit bfa58a640c
No known key found for this signature in database
GPG Key ID: C646B23C9E3245F1
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
harness/exporter.go
View File

@ -85,7 +85,7 @@ func (exp *exporter) main(c *cli.Context) {
collector.Collect(registry)
interval := c.Int("interval")
go func() {
for _ = range time.Tick(time.Duration(interval) * time.Second) {
for range time.Tick(time.Duration(interval) * time.Second) {
if exp.ResetOnTick {
registry.Reset()
}

12
jsonexporter/config.go
View File

@ -20,12 +20,12 @@ import (
)
type Config struct {
Name string `yaml:name`
Path string `yaml:path`
Labels map[string]string `yaml:labels`
Type string `yaml:type`
Help string `yaml:help`
Values map[string]string `yaml:values`
Name string `yaml:"name"`
Path string `yaml:"path"`
Labels map[string]string `yaml:"labels"`
Type string `yaml:"type"`
Help string `yaml:"help"`
Values map[string]string `yaml:"values"`
}
func (config *Config) labelNames() []string {

2
jsonexporter/init.go
View File

@ -62,7 +62,7 @@ func Init(c *cli.Context, reg *harness.MetricRegistry) (harness.Collector, error
args := c.Args()
if len(args) < 2 {
cli.ShowAppHelp(c)
cli.ShowAppHelp(c) //nolint:errcheck
return nil, fmt.Errorf("not enough arguments")
}

20
jsonexporter/scraper.go
View File

@ -57,7 +57,7 @@ func (vs *ValueScraper) parseValue(bytes []byte) (float64, error) {
func (vs *ValueScraper) forTargetValue(data []byte, handle func(*jsonpath.Result)) error {
eval, err := jsonpath.EvalPathsInBytes(data, []*jsonpath.Path{vs.valueJsonPath})
if err != nil {
return fmt.Errorf("failed to eval jsonpath;path:<%s>,json:<%s>", vs.valueJsonPath, data)
return fmt.Errorf("failed to eval jsonpath;path:<%v>,json:<%s>", vs.valueJsonPath, data)
}
for {
@ -74,7 +74,7 @@ func (vs *ValueScraper) Scrape(data []byte, reg *harness.MetricRegistry) error {
isFirst := true
return vs.forTargetValue(data, func(result *jsonpath.Result) {
if !isFirst {
log.Infof("ignoring non-first value;path:<%s>", vs.valueJsonPath)
log.Infof("ignoring non-first value;path:<%v>", vs.valueJsonPath)
return
}
isFirst = false
@ -90,13 +90,13 @@ func (vs *ValueScraper) Scrape(data []byte, reg *harness.MetricRegistry) error {
case jsonpath.JsonNull:
value = math.NaN()
default:
log.Warnf("skipping not numerical result;path:<%s>,value:<%s>",
log.Warnf("skipping not numerical result;path:<%v>,value:<%s>",
vs.valueJsonPath, result.Value)
return
}
if err != nil {
// Should never happen.
log.Errorf("could not parse numerical value as float;path:<%s>,value:<%s>",
log.Errorf("could not parse numerical value as float;path:<%v>,value:<%s>",
vs.valueJsonPath, result.Value)
return
}
@ -161,7 +161,7 @@ func (obsc *ObjectScraper) extractFirstValue(data []byte, path *jsonpath.Path) (
func (obsc *ObjectScraper) Scrape(data []byte, reg *harness.MetricRegistry) error {
return obsc.forTargetValue(data, func(result *jsonpath.Result) {
if result.Type != jsonpath.JsonObject && result.Type != jsonpath.JsonArray {
log.Warnf("skipping not structual result;path:<%s>,value:<%s>",
log.Warnf("skipping not structual result;path:<%v>,value:<%s>",
obsc.valueJsonPath, result.Value)
return
}
@ -170,7 +170,7 @@ func (obsc *ObjectScraper) Scrape(data []byte, reg *harness.MetricRegistry) erro
for name, path := range obsc.labelJsonPaths {
firstResult, err := obsc.extractFirstValue(result.Value, path)
if err != nil {
log.Warnf("could not find value for label path;path:<%s>,json:<%s>,err:<%s>", path, result.Value, err)
log.Warnf("could not find value for label path;path:<%v>,json:<%s>,err:<%s>", path, result.Value, err)
continue
}
value := firstResult.Value
@ -189,7 +189,7 @@ func (obsc *ObjectScraper) Scrape(data []byte, reg *harness.MetricRegistry) erro
// Static value
value, err := obsc.parseValue([]byte(configValue))
if err != nil {
log.Errorf("could not use configured value as float number;name:<%s>,err:<%s>", err)
log.Errorf("could not use configured value as float number;err:<%s>", err)
continue
}
metricValue = value
@ -197,7 +197,7 @@ func (obsc *ObjectScraper) Scrape(data []byte, reg *harness.MetricRegistry) erro
// Dynamic value
firstResult, err := obsc.extractFirstValue(result.Value, path)
if err != nil {
log.Warnf("could not find value for value path;path:<%s>,json:<%s>,err:<%s>", path, result.Value, err)
log.Warnf("could not find value for value path;path:<%v>,json:<%s>,err:<%s>", path, result.Value, err)
continue
}
@ -211,13 +211,13 @@ func (obsc *ObjectScraper) Scrape(data []byte, reg *harness.MetricRegistry) erro
case jsonpath.JsonNull:
value = math.NaN()
default:
log.Warnf("skipping not numerical result;path:<%s>,value:<%s>",
log.Warnf("skipping not numerical result;path:<%v>,value:<%s>",
obsc.valueJsonPath, result.Value)
continue
}
if err != nil {
// Should never happen.
log.Errorf("could not parse numerical value as float;path:<%s>,value:<%s>",
log.Errorf("could not parse numerical value as float;path:<%v>,value:<%s>",
obsc.valueJsonPath, firstResult.Value)
continue
}