Fix Docs links (#35744)

* Revert "add doc-site-branch to version.asciidoc and settings.go (#35693)"

This reverts commit 25adc03.

* revert to use 'master' on Docs links

dev-tools/mage/settings.go

@@ -386,11 +386,10 @@ func beatVersion() (string, error) {
 }
 
 var (
-	beatDocBranchRegex     = regexp.MustCompile(`(?m)doc-branch:\s*([^\s]+)\r?$`)
-	beatDocSiteBranchRegex = regexp.MustCompile(`(?m)doc-site-branch:\s*([^\s]+)\r?$`)
-	beatDocBranchValue     string
-	beatDocBranchErr       error
-	beatDocBranchOnce      sync.Once
+	beatDocBranchRegex = regexp.MustCompile(`(?m)doc-branch:\s*([^\s]+)\r?$`)
+	beatDocBranchValue string
+	beatDocBranchErr   error
+	beatDocBranchOnce  sync.Once
 )
 
 // BeatDocBranch returns the documentation branch name associated with the

filebeat/modules.d/apache.yml.disabled

@@ -1,5 +1,5 @@
 # Module: apache
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-apache.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-apache.html
 
 - module: apache
   # Access logs

filebeat/modules.d/auditd.yml.disabled

@@ -1,5 +1,5 @@
 # Module: auditd
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-auditd.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-auditd.html
 
 - module: auditd
   log:

filebeat/modules.d/elasticsearch.yml.disabled

@@ -1,5 +1,5 @@
 # Module: elasticsearch
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-elasticsearch.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-elasticsearch.html
 
 - module: elasticsearch
   # Server log

filebeat/modules.d/haproxy.yml.disabled

@@ -1,5 +1,5 @@
 # Module: haproxy
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-haproxy.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-haproxy.html
 
 - module: haproxy
   # All logs

filebeat/modules.d/icinga.yml.disabled

@@ -1,5 +1,5 @@
 # Module: icinga
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-icinga.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-icinga.html
 
 - module: icinga
   # Main logs

filebeat/modules.d/iis.yml.disabled

@@ -1,5 +1,5 @@
 # Module: iis
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-iis.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-iis.html
 
 - module: iis
   # Access logs

filebeat/modules.d/kafka.yml.disabled

@@ -1,5 +1,5 @@
 # Module: kafka
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-kafka.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-kafka.html
 
 - module: kafka
   # All logs

filebeat/modules.d/kibana.yml.disabled

@@ -1,5 +1,5 @@
 # Module: kibana
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-kibana.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-kibana.html
 
 - module: kibana
   # Server logs

filebeat/modules.d/logstash.yml.disabled

@@ -1,5 +1,5 @@
 # Module: logstash
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-logstash.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-logstash.html
 
 - module: logstash
   # logs

filebeat/modules.d/mongodb.yml.disabled

@@ -1,5 +1,5 @@
 # Module: mongodb
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-mongodb.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-mongodb.html
 
 - module: mongodb
   # All logs

filebeat/modules.d/mysql.yml.disabled

@@ -1,5 +1,5 @@
 # Module: mysql
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-mysql.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-mysql.html
 
 - module: mysql
   # Error logs

filebeat/modules.d/nats.yml.disabled

@@ -1,5 +1,5 @@
 # Module: nats
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-nats.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-nats.html
 
 - module: nats
   # All logs

filebeat/modules.d/nginx.yml.disabled

@@ -1,5 +1,5 @@
 # Module: nginx
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-nginx.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-nginx.html
 
 - module: nginx
   # Access logs

filebeat/modules.d/osquery.yml.disabled

@@ -1,5 +1,5 @@
 # Module: osquery
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-osquery.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-osquery.html
 
 - module: osquery
   result:

filebeat/modules.d/pensando.yml.disabled

@@ -1,5 +1,5 @@
 # Module: pensando
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-pensando.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-pensando.html
 
 - module: pensando
 # Firewall logs

filebeat/modules.d/postgresql.yml.disabled

@@ -1,5 +1,5 @@
 # Module: postgresql
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-postgresql.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-postgresql.html
 
 - module: postgresql
   # All logs

filebeat/modules.d/redis.yml.disabled

@@ -1,5 +1,5 @@
 # Module: redis
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-redis.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-redis.html
 
 - module: redis
   # Main logs

filebeat/modules.d/santa.yml.disabled

@@ -1,5 +1,5 @@
 # Module: santa
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-santa.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-santa.html
 
 - module: santa
   log:

filebeat/modules.d/system.yml.disabled

@@ -1,5 +1,5 @@
 # Module: system
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-system.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-system.html
 
 - module: system
   # Syslog

filebeat/modules.d/traefik.yml.disabled

@@ -1,5 +1,5 @@
 # Module: traefik
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-traefik.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-traefik.html
 
 - module: traefik
   # Access logs

libbeat/docs/version.asciidoc

@@ -1,8 +1,5 @@
 :stack-version: 8.9.0
-:doc-branch: main
-// FIXME: once elastic.co docs have been switched over to use `main`, remove
-// the `doc-site-branch` line below as well as any references to it in the code.
-:doc-site-branch: master
+:doc-branch: master
 :go-version: 1.19.9
 :release-state: unreleased
 :python: 3.7

metricbeat/modules.d/aerospike.yml.disabled

@@ -1,5 +1,5 @@
 # Module: aerospike
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-aerospike.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-aerospike.html
 
 - module: aerospike
   #metricsets:

metricbeat/modules.d/apache.yml.disabled

@@ -1,5 +1,5 @@
 # Module: apache
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-apache.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-apache.html
 
 - module: apache
   #metricsets:

metricbeat/modules.d/beat-xpack.yml.disabled

@@ -1,5 +1,5 @@
 # Module: beat
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-beat.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-beat.html
 
 - module: beat
   xpack.enabled: true

metricbeat/modules.d/beat.yml.disabled

@@ -1,5 +1,5 @@
 # Module: beat
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-beat.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-beat.html
 
 - module: beat
   metricsets:

metricbeat/modules.d/ceph-mgr.yml.disabled

@@ -1,5 +1,5 @@
 # Module: ceph
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-ceph.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-ceph.html
 
 - module: ceph
   metricsets:

metricbeat/modules.d/ceph.yml.disabled

@@ -1,5 +1,5 @@
 # Module: ceph
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-ceph.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-ceph.html
 
 - module: ceph
   #metricsets:

metricbeat/modules.d/consul.yml.disabled

@@ -1,5 +1,5 @@
 # Module: consul
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-consul.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-consul.html
 
 - module: consul
   metricsets:

metricbeat/modules.d/couchbase.yml.disabled

@@ -1,5 +1,5 @@
 # Module: couchbase
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-couchbase.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-couchbase.html
 
 - module: couchbase
   #metricsets:

metricbeat/modules.d/couchdb.yml.disabled

@@ -1,5 +1,5 @@
 # Module: couchdb
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-couchdb.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-couchdb.html
 
 - module: couchdb
   metricsets: ["server"]

metricbeat/modules.d/docker.yml.disabled

@@ -1,5 +1,5 @@
 # Module: docker
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-docker.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-docker.html
 
 - module: docker
   #metricsets:

metricbeat/modules.d/dropwizard.yml.disabled

@@ -1,5 +1,5 @@
 # Module: dropwizard
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-dropwizard.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-dropwizard.html
 
 - module: dropwizard
   #metricsets:

metricbeat/modules.d/elasticsearch-xpack.yml.disabled

@@ -1,5 +1,5 @@
 # Module: elasticsearch
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-elasticsearch.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-elasticsearch.html
 
 - module: elasticsearch
   xpack.enabled: true

metricbeat/modules.d/elasticsearch.yml.disabled

@@ -1,5 +1,5 @@
 # Module: elasticsearch
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-elasticsearch.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-elasticsearch.html
 
 - module: elasticsearch
   #metricsets:

metricbeat/modules.d/envoyproxy.yml.disabled

@@ -1,5 +1,5 @@
 # Module: envoyproxy
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-envoyproxy.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-envoyproxy.html
 
 - module: envoyproxy
   #metricsets:

metricbeat/modules.d/etcd.yml.disabled

@@ -1,5 +1,5 @@
 # Module: etcd
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-etcd.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-etcd.html
 
 - module: etcd
   #metricsets:

metricbeat/modules.d/golang.yml.disabled

@@ -1,5 +1,5 @@
 # Module: golang
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-golang.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-golang.html
 
 - module: golang
   #metricsets:

metricbeat/modules.d/graphite.yml.disabled

@@ -1,5 +1,5 @@
 # Module: graphite
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-graphite.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-graphite.html
 
 - module: graphite
   #metricsets:

metricbeat/modules.d/haproxy.yml.disabled

@@ -1,5 +1,5 @@
 # Module: haproxy
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-haproxy.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-haproxy.html
 
 - module: haproxy
   #metricsets:

metricbeat/modules.d/http.yml.disabled

@@ -1,5 +1,5 @@
 # Module: http
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-http.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-http.html
 
 - module: http
   #metricsets:

metricbeat/modules.d/jolokia.yml.disabled

@@ -1,5 +1,5 @@
 # Module: jolokia
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-jolokia.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-jolokia.html
 
 - module: jolokia
   #metricsets: ["jmx"]

metricbeat/modules.d/kafka.yml.disabled

@@ -1,5 +1,5 @@
 # Module: kafka
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-kafka.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kafka.html
 
 # Kafka metrics collected using the Kafka protocol
 - module: kafka

metricbeat/modules.d/kibana-xpack.yml.disabled

@@ -1,5 +1,5 @@
 # Module: kibana
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-kibana.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kibana.html
 
 - module: kibana
   xpack.enabled: true

metricbeat/modules.d/kibana.yml.disabled

@@ -1,5 +1,5 @@
 # Module: kibana
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-kibana.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kibana.html
 
 - module: kibana
   #metricsets:

metricbeat/modules.d/kubernetes.yml.disabled

@@ -1,5 +1,5 @@
 # Module: kubernetes
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-kubernetes.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kubernetes.html
 
 # Node metrics, from kubelet:
 - module: kubernetes

metricbeat/modules.d/kvm.yml.disabled

@@ -1,5 +1,5 @@
 # Module: kvm
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-kvm.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kvm.html
 
 - module: kvm
   #metricsets:

metricbeat/modules.d/linux.yml.disabled

@@ -1,5 +1,5 @@
 # Module: linux
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-linux.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-linux.html
 
 - module: linux
   period: 10s

metricbeat/modules.d/logstash-xpack.yml.disabled

@@ -1,5 +1,5 @@
 # Module: logstash
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-logstash.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-logstash.html
 
 - module: logstash
   xpack.enabled: true

metricbeat/modules.d/logstash.yml.disabled

@@ -1,5 +1,5 @@
 # Module: logstash
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-logstash.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-logstash.html
 
 - module: logstash
   #metricsets:

metricbeat/modules.d/memcached.yml.disabled

@@ -1,5 +1,5 @@
 # Module: memcached
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-memcached.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-memcached.html
 
 - module: memcached
 #  metricsets: ["stats"]

metricbeat/modules.d/mongodb.yml.disabled

@@ -1,5 +1,5 @@
 # Module: mongodb
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-mongodb.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mongodb.html
 
 - module: mongodb
   #metricsets:

metricbeat/modules.d/munin.yml.disabled

@@ -1,5 +1,5 @@
 # Module: munin
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-munin.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-munin.html
 
 - module: munin
   #metricsets:

metricbeat/modules.d/mysql.yml.disabled

@@ -1,5 +1,5 @@
 # Module: mysql
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-mysql.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mysql.html
 
 - module: mysql
   #metricsets:

metricbeat/modules.d/nats.yml.disabled

@@ -1,5 +1,5 @@
 # Module: nats
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-nats.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-nats.html
 
 - module: nats
   metricsets: