exporter provided timestamp preferred

n9e · Jun 16, 2020 · f951e14 · f951e14
1 parent 2fbce00
commit f951e14
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/collector/gather.go b/collector/gather.go
@@ -72,7 +72,7 @@ func gatherExporterUrl(url string) ([]byte, error) {
 	}
 
 	client := &http.Client{
-		Timeout: time.Duration(config.Get().TimeOut) * time.Millisecond,
+		Timeout: time.Duration(config.Get().Timeout) * time.Millisecond,
 	}
 
 	var resp *http.Response

diff --git a/collector/parser.go b/collector/parser.go
@@ -67,7 +67,10 @@ func Parse(buf []byte) ([]*dataobj.MetricValue, error) {
 				metric.Metric = strings.Replace(metric.Metric, "_", ".", -1)
 				metric.Endpoint = cfg.Endpoint
 				metric.Tags = makeAppendTags(metric.TagsMap, config.AppendTagsMap)
-
+				// set provided Time, ms to s
+				if m.GetTimestampMs() > 0 {
+					metric.Timestamp = m.GetTimestampMs() / 1000
+				}
 				metricList = append(metricList, metric)
 			}
 		}

diff --git a/config/plugin_cfg.go b/config/plugin_cfg.go
@@ -12,7 +12,7 @@ type PluginCfg struct {
 	Endpoint            string   `json:"endpoint"`
 	Username            string   `json:"username"`
 	Password            string   `json:"password"`
-	TimeOut             int      `json:"timeout"`
+	Timeout             int      `json:"timeout"`
 	IgnoreMetricsPrefix []string `json:"ignore_metrics_prefix"`
 }
 
@@ -32,7 +32,7 @@ func Parse(bs []byte) error {
 		Endpoint:            "",
 		Username:            "",
 		Password:            "",
-		TimeOut:             500,
+		Timeout:             500,
 		IgnoreMetricsPrefix: []string{},
 	}