Merge remote-tracking branch 'upstream/master' into feature/support-b…

…uild-retry-docker-if-error-packaging

* upstream/master:
  Fix the url of reviewdog (elastic#21981)
  revert WSS process reporting for windows (elastic#22055)
  Fix typo (elastic#19585) (elastic#22061)

CHANGELOG.next.asciidoc

@@ -378,6 +378,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix azure storage event format. {pull}21845[21845]
 - Fix panic in kubernetes autodiscover related to keystores {issue}21843[21843] {pull}21880[21880]
 - [Kubernetes] Remove redundant dockersock volume mount {pull}22009[22009]
+- Revert change to report `process.memory.rss` as `process.memory.wss` on Windows. {pull}22055[22055]
 
 *Packetbeat*
 

Makefile

@@ -12,7 +12,7 @@ GOLINT=golint
 GOLINT_REPO=golang.org/x/lint/golint
 REVIEWDOG=reviewdog
 REVIEWDOG_OPTIONS?=-diff "git diff master"
-REVIEWDOG_REPO=github.com/haya14busa/reviewdog/cmd/reviewdog
+REVIEWDOG_REPO=github.com/reviewdog/reviewdog/cmd/reviewdog
 XPACK_SUFFIX=x-pack/
 
 # PROJECTS_XPACK_PKG is a list of Beats that have independent packaging support

heartbeat/docs/monitors/monitor-http.asciidoc

@@ -161,7 +161,7 @@ Under `check.response`, specify these options:
 
 *`status`*:: A list of expected status codes. 4xx and 5xx codes are considered `down` by default. Other codes are considered `up`.
 *`headers`*:: The required response headers.
-*`body`*:: A list of regular expressions to match the the body output. Only a single expression needs to match. HTTP response
+*`body`*:: A list of regular expressions to match the body output. Only a single expression needs to match. HTTP response
 bodies of up to 100MiB are supported.
 
 Example configuration:

metricbeat/module/system/process/process.go

@@ -150,24 +150,11 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error {
 			rootFields.Put("process.args", args)
 		}
 
-		// This is a temporary fix until we make these changes global across libbeat
-		// This logic should happen in libbeat getProcessEvent()
-
-		// There's some more Windows memory quirks we need to deal with.
-		// "rss" is a linux concept, but "wss" is a direct match on Windows.
-		// "share" is also unavailable on Windows.
+		// "share" is unavailable on Windows.
 		if runtime.GOOS == "windows" {
 			proc.Delete("memory.share")
 		}
 
-		if m.IsAgent {
-			if runtime.GOOS == "windows" {
-				if setSize := getAndRemove(proc, "memory.rss"); setSize != nil {
-					proc.Put("memory.wss", setSize)
-				}
-			}
-		}
-
 		e := mb.Event{
 			RootFields:      rootFields,
 			MetricSetFields: proc,