Merge branch 'public-single-node' into pmm-6401-read-prometheus-data-files

README.md

@@ -1424,6 +1424,7 @@ The collected profiles may be analyzed with [go tool pprof](https://github.com/g
 * [Ansible role for installing single-node VictoriaMetrics](https://github.com/dreamteam-gg/ansible-victoriametrics-role).
 * [Ansible role for installing cluster VictoriaMetrics](https://github.com/Slapper/ansible-victoriametrics-cluster-role).
 * [Snap package for VictoriaMetrics](https://snapcraft.io/victoriametrics).
+* [vmalert-cli](https://github.com/aorfanos/vmalert-cli) - a CLI application for managing [vmalert](https://victoriametrics.github.io/vmalert.html).
 
 
 ## Third-party contributions

docs/CHANGELOG.md

@@ -3,6 +3,7 @@
 # tip
 
 * BUGFIX: vmagent: prevent from `dialing to the given TCP address time out` error when scraping big number of unavailable targets. See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/987
+* BUGFIX: vmagent: properly show scrape duration on `/targets` page. Previously it was incorrectly shown as 0.000s.
 * BUGFIX: vmalert: return non-empty result in template func `query` stub to pass validation. See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/989 .
 
 * FEATURE: provide a sample list of alerting rules for VictoriaMetrics components. It is available [here](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/deployment/docker/alerts.yml).

docs/Single-server-VictoriaMetrics.md

@@ -1424,6 +1424,7 @@ The collected profiles may be analyzed with [go tool pprof](https://github.com/g
 * [Ansible role for installing single-node VictoriaMetrics](https://github.com/dreamteam-gg/ansible-victoriametrics-role).
 * [Ansible role for installing cluster VictoriaMetrics](https://github.com/Slapper/ansible-victoriametrics-cluster-role).
 * [Snap package for VictoriaMetrics](https://snapcraft.io/victoriametrics).
+* [vmalert-cli](https://github.com/aorfanos/vmalert-cli) - a CLI application for managing [vmalert](https://victoriametrics.github.io/vmalert.html).
 
 
 ## Third-party contributions

lib/promscrape/targetstatus.go

@@ -312,7 +312,7 @@ func (tsm *targetStatusMap) getTargetsStatusByJob() []jobTargetsStatuses {
 				labels:         promrelabel.FinalizeLabels(nil, st.sw.Labels),
 				originalLabels: st.sw.OriginalLabels,
 				lastScrapeTime: st.getDurationFromLastScrape(),
-				scrapeDuration: time.Duration(st.scrapeDuration),
+				scrapeDuration: time.Duration(st.scrapeDuration) * time.Millisecond,
 				error:          errMsg,
 			})
 		}