Merge remote-tracking branch 'origin/upgrade-go' into upgrade-go

elastic · Jul 26, 2023 · 5e6300a · 5e6300a
2 parents a87f519 + 0c0f338
commit 5e6300a
Show file tree

Hide file tree

Showing 162 changed files with 530 additions and 292 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -155,6 +155,7 @@ CHANGELOG*
 /x-pack/filebeat/module/proofpoint @elastic/security-external-integrations
 /x-pack/filebeat/module/rabbitmq @elastic/obs-infraobs-integrations
 /x-pack/filebeat/module/radware @elastic/security-external-integrations
+/x-pack/filebeat/module/salesforce @elastic/obs-infraobs-integrations
 /x-pack/filebeat/module/snort @elastic/security-external-integrations
 /x-pack/filebeat/module/snyk @elastic/security-external-integrations
 /x-pack/filebeat/module/sonicwall @elastic/security-external-integrations

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -152,7 +152,9 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Fix handling of NUL-terminated log lines in Fortinet Firewall module. {issue}36026[36026] {pull}36027[36027]
 - Make redact field configuration recommended in CEL input and log warning if missing. {pull}36008[36008]
 - Fix handling of region name configuration in awss3 input {pull}36034[36034]
+- Fix panic when sqs input metrics getter is invoked {pull}36101[36101] {issue}36077[36077]
 - Make CEL input's `now` global variable static for evaluation lifetime. {pull}36107[36107]
+- Update mito CEL extension library to v1.5.0. {pull}36146[36146]
 
 *Heartbeat*
 
@@ -356,6 +358,7 @@ automatic splitting at root level, if root level element is an array. {pull}3415
 - Add fingerprint mode for the filestream scanner and new file identity based on it {issue}34419[34419] {pull}35734[35734]
 - Add file system metadata to events ingested via filestream {issue}35801[35801] {pull}36065[36065]
 - Allow parsing bytes in and bytes out as long integer in CEF processor. {issue}36100[36100] {pull}36108[36108]
+- Add support for registered owners and users to AzureAD entity analytics provider. {pull}36092[36092]
 
 *Auditbeat*
    - Migration of system/package module storage from gob encoding to flatbuffer encoding in bolt db. {pull}34817[34817]

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -15600,11 +15600,11 @@ limitations under the License.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/mito
-Version: v1.4.0
+Version: v1.5.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.4.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.5.0/LICENSE:
 
 
                                  Apache License

diff --git a/deploy/kubernetes/auditbeat-kubernetes.yaml b/deploy/kubernetes/auditbeat-kubernetes.yaml
@@ -205,7 +205,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: auditbeat
-        image: docker.elastic.co/beats/auditbeat:8.9.0
+        image: docker.elastic.co/beats/auditbeat:8.10.0
         args: [
           "-c", "/etc/auditbeat.yml",
           "-e",

diff --git a/deploy/kubernetes/filebeat-kubernetes.yaml b/deploy/kubernetes/filebeat-kubernetes.yaml
@@ -167,7 +167,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: filebeat
-        image: docker.elastic.co/beats/filebeat:8.9.0
+        image: docker.elastic.co/beats/filebeat:8.10.0
         args: [
           "-c", "/etc/filebeat.yml",
           "-e",

diff --git a/deploy/kubernetes/heartbeat-kubernetes.yaml b/deploy/kubernetes/heartbeat-kubernetes.yaml
@@ -171,7 +171,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: heartbeat
-        image: docker.elastic.co/beats/heartbeat:8.9.0
+        image: docker.elastic.co/beats/heartbeat:8.10.0
         args: [
           "-c", "/etc/heartbeat.yml",
           "-e",

diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml
@@ -290,7 +290,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: metricbeat
-        image: docker.elastic.co/beats/metricbeat:8.9.0
+        image: docker.elastic.co/beats/metricbeat:8.10.0
         args: [
           "-c", "/etc/metricbeat.yml",
           "-e",

diff --git a/filebeat/modules.d/apache.yml.disabled b/filebeat/modules.d/apache.yml.disabled
@@ -1,5 +1,5 @@
 # Module: apache
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-apache.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-apache.html
 
 - module: apache
   # Access logs

diff --git a/filebeat/modules.d/auditd.yml.disabled b/filebeat/modules.d/auditd.yml.disabled
@@ -1,5 +1,5 @@
 # Module: auditd
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-auditd.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-auditd.html
 
 - module: auditd
   log:

diff --git a/filebeat/modules.d/elasticsearch.yml.disabled b/filebeat/modules.d/elasticsearch.yml.disabled
@@ -1,5 +1,5 @@
 # Module: elasticsearch
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-elasticsearch.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-elasticsearch.html
 
 - module: elasticsearch
   # Server log

diff --git a/filebeat/modules.d/haproxy.yml.disabled b/filebeat/modules.d/haproxy.yml.disabled
@@ -1,5 +1,5 @@
 # Module: haproxy
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-haproxy.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-haproxy.html
 
 - module: haproxy
   # All logs

diff --git a/filebeat/modules.d/icinga.yml.disabled b/filebeat/modules.d/icinga.yml.disabled
@@ -1,5 +1,5 @@
 # Module: icinga
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-icinga.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-icinga.html
 
 - module: icinga
   # Main logs

diff --git a/filebeat/modules.d/iis.yml.disabled b/filebeat/modules.d/iis.yml.disabled
@@ -1,5 +1,5 @@
 # Module: iis
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-iis.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-iis.html
 
 - module: iis
   # Access logs

diff --git a/filebeat/modules.d/kafka.yml.disabled b/filebeat/modules.d/kafka.yml.disabled
@@ -1,5 +1,5 @@
 # Module: kafka
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-kafka.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-kafka.html
 
 - module: kafka
   # All logs

diff --git a/filebeat/modules.d/kibana.yml.disabled b/filebeat/modules.d/kibana.yml.disabled
@@ -1,5 +1,5 @@
 # Module: kibana
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-kibana.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-kibana.html
 
 - module: kibana
   # Server logs

diff --git a/filebeat/modules.d/logstash.yml.disabled b/filebeat/modules.d/logstash.yml.disabled
@@ -1,5 +1,5 @@
 # Module: logstash
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-logstash.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-logstash.html
 
 - module: logstash
   # logs

diff --git a/filebeat/modules.d/mongodb.yml.disabled b/filebeat/modules.d/mongodb.yml.disabled
@@ -1,5 +1,5 @@
 # Module: mongodb
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-mongodb.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-mongodb.html
 
 - module: mongodb
   # All logs

diff --git a/filebeat/modules.d/mysql.yml.disabled b/filebeat/modules.d/mysql.yml.disabled
@@ -1,5 +1,5 @@
 # Module: mysql
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-mysql.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-mysql.html
 
 - module: mysql
   # Error logs

diff --git a/filebeat/modules.d/nats.yml.disabled b/filebeat/modules.d/nats.yml.disabled
@@ -1,5 +1,5 @@
 # Module: nats
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-nats.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-nats.html
 
 - module: nats
   # All logs

diff --git a/filebeat/modules.d/nginx.yml.disabled b/filebeat/modules.d/nginx.yml.disabled
@@ -1,5 +1,5 @@
 # Module: nginx
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-nginx.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-nginx.html
 
 - module: nginx
   # Access logs

diff --git a/filebeat/modules.d/osquery.yml.disabled b/filebeat/modules.d/osquery.yml.disabled
@@ -1,5 +1,5 @@
 # Module: osquery
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-osquery.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-osquery.html
 
 - module: osquery
   result:

diff --git a/filebeat/modules.d/pensando.yml.disabled b/filebeat/modules.d/pensando.yml.disabled
@@ -1,5 +1,5 @@
 # Module: pensando
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-pensando.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-pensando.html
 
 - module: pensando
 # Firewall logs

diff --git a/filebeat/modules.d/postgresql.yml.disabled b/filebeat/modules.d/postgresql.yml.disabled
@@ -1,5 +1,5 @@
 # Module: postgresql
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-postgresql.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-postgresql.html
 
 - module: postgresql
   # All logs

diff --git a/filebeat/modules.d/redis.yml.disabled b/filebeat/modules.d/redis.yml.disabled
@@ -1,5 +1,5 @@
 # Module: redis
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-redis.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-redis.html
 
 - module: redis
   # Main logs

diff --git a/filebeat/modules.d/santa.yml.disabled b/filebeat/modules.d/santa.yml.disabled
@@ -1,5 +1,5 @@
 # Module: santa
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-santa.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-santa.html
 
 - module: santa
   log:

diff --git a/filebeat/modules.d/system.yml.disabled b/filebeat/modules.d/system.yml.disabled
@@ -1,5 +1,5 @@
 # Module: system
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-system.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-system.html
 
 - module: system
   # Syslog

diff --git a/filebeat/modules.d/traefik.yml.disabled b/filebeat/modules.d/traefik.yml.disabled
@@ -1,5 +1,5 @@
 # Module: traefik
-# Docs: https://www.elastic.co/guide/en/beats/filebeat/master/filebeat-module-traefik.html
+# Docs: https://www.elastic.co/guide/en/beats/filebeat/main/filebeat-module-traefik.html
 
 - module: traefik
   # Access logs

diff --git a/go.mod b/go.mod
@@ -206,7 +206,7 @@ require (
 	github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3
 	github.com/elastic/elastic-agent-system-metrics v0.6.1
 	github.com/elastic/go-elasticsearch/v8 v8.8.2
-	github.com/elastic/mito v1.4.0
+	github.com/elastic/mito v1.5.0
 	github.com/elastic/toutoumomoma v0.0.0-20221026030040-594ef30cb640
 	github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15
 	github.com/google/cel-go v0.15.3

diff --git a/go.sum b/go.sum
@@ -564,8 +564,8 @@ github.com/elastic/gopacket v1.1.20-0.20211202005954-d412fca7f83a h1:8WfL/X6fK11
 github.com/elastic/gopacket v1.1.20-0.20211202005954-d412fca7f83a/go.mod h1:riddUzxTSBpJXk3qBHtYr4qOhFhT6k/1c0E3qkQjQpA=
 github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4=
 github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
-github.com/elastic/mito v1.4.0 h1:RgosnKOfjIIBeKfSP7h1x6YHrqfBNaao8I5+BMmKXpE=
-github.com/elastic/mito v1.4.0/go.mod h1:J0LW+SbpiAoiBUBEBrbH8epwNDFhWWgEWyR/9DpY04c=
+github.com/elastic/mito v1.5.0 h1:637UzhwJH8XfHgusGrpL9b7sTkDE+gJ4unf1tDPDtUE=
+github.com/elastic/mito v1.5.0/go.mod h1:J0LW+SbpiAoiBUBEBrbH8epwNDFhWWgEWyR/9DpY04c=
 github.com/elastic/ristretto v0.1.1-0.20220602190459-83b0895ca5b3 h1:ChPwRVv1RR4a0cxoGjKcyWjTEpxYfm5gydMIzo32cAw=
 github.com/elastic/ristretto v0.1.1-0.20220602190459-83b0895ca5b3/go.mod h1:RAy2GVV4sTWVlNMavv3xhLsk18rxhfhDnombTe6EF5c=
 github.com/elastic/sarama v1.19.1-0.20220310193331-ebc2b0d8eef3 h1:FzA0/n4iMt8ojGDGRoiFPSHFvvdVIvxOxyLtiFnrLBM=

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,5 +1,5 @@
-:stack-version: 8.9.0
-:doc-branch: master
+:stack-version: 8.10.0
+:doc-branch: main
 :go-version: 1.20.6
 :release-state: unreleased
 :python: 3.7

diff --git a/metricbeat/modules.d/aerospike.yml.disabled b/metricbeat/modules.d/aerospike.yml.disabled
@@ -1,5 +1,5 @@
 # Module: aerospike
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-aerospike.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-aerospike.html
 
 - module: aerospike
   #metricsets:

diff --git a/metricbeat/modules.d/apache.yml.disabled b/metricbeat/modules.d/apache.yml.disabled
@@ -1,5 +1,5 @@
 # Module: apache
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-apache.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-apache.html
 
 - module: apache
   #metricsets:

diff --git a/metricbeat/modules.d/beat-xpack.yml.disabled b/metricbeat/modules.d/beat-xpack.yml.disabled
@@ -1,5 +1,5 @@
 # Module: beat
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-beat.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-beat.html
 
 - module: beat
   xpack.enabled: true

diff --git a/metricbeat/modules.d/beat.yml.disabled b/metricbeat/modules.d/beat.yml.disabled
@@ -1,5 +1,5 @@
 # Module: beat
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-beat.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-beat.html
 
 - module: beat
   metricsets:

diff --git a/metricbeat/modules.d/ceph-mgr.yml.disabled b/metricbeat/modules.d/ceph-mgr.yml.disabled
@@ -1,5 +1,5 @@
 # Module: ceph
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-ceph.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-ceph.html
 
 - module: ceph
   metricsets:

diff --git a/metricbeat/modules.d/ceph.yml.disabled b/metricbeat/modules.d/ceph.yml.disabled
@@ -1,5 +1,5 @@
 # Module: ceph
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-ceph.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-ceph.html
 
 - module: ceph
   #metricsets:

diff --git a/metricbeat/modules.d/consul.yml.disabled b/metricbeat/modules.d/consul.yml.disabled
@@ -1,5 +1,5 @@
 # Module: consul
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-consul.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-consul.html
 
 - module: consul
   metricsets:

diff --git a/metricbeat/modules.d/couchbase.yml.disabled b/metricbeat/modules.d/couchbase.yml.disabled
@@ -1,5 +1,5 @@
 # Module: couchbase
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-couchbase.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-couchbase.html
 
 - module: couchbase
   #metricsets:

diff --git a/metricbeat/modules.d/couchdb.yml.disabled b/metricbeat/modules.d/couchdb.yml.disabled
@@ -1,5 +1,5 @@
 # Module: couchdb
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-couchdb.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-couchdb.html
 
 - module: couchdb
   metricsets: ["server"]

diff --git a/metricbeat/modules.d/docker.yml.disabled b/metricbeat/modules.d/docker.yml.disabled
@@ -1,5 +1,5 @@
 # Module: docker
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-docker.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-docker.html
 
 - module: docker
   #metricsets:

diff --git a/metricbeat/modules.d/dropwizard.yml.disabled b/metricbeat/modules.d/dropwizard.yml.disabled
@@ -1,5 +1,5 @@
 # Module: dropwizard
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-dropwizard.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-dropwizard.html
 
 - module: dropwizard
   #metricsets:

diff --git a/metricbeat/modules.d/elasticsearch-xpack.yml.disabled b/metricbeat/modules.d/elasticsearch-xpack.yml.disabled
@@ -1,5 +1,5 @@
 # Module: elasticsearch
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-elasticsearch.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-elasticsearch.html
 
 - module: elasticsearch
   xpack.enabled: true

diff --git a/metricbeat/modules.d/elasticsearch.yml.disabled b/metricbeat/modules.d/elasticsearch.yml.disabled
@@ -1,5 +1,5 @@
 # Module: elasticsearch
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-elasticsearch.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-elasticsearch.html
 
 - module: elasticsearch
   #metricsets:

diff --git a/metricbeat/modules.d/envoyproxy.yml.disabled b/metricbeat/modules.d/envoyproxy.yml.disabled
@@ -1,5 +1,5 @@
 # Module: envoyproxy
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-envoyproxy.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-envoyproxy.html
 
 - module: envoyproxy
   #metricsets:

diff --git a/metricbeat/modules.d/etcd.yml.disabled b/metricbeat/modules.d/etcd.yml.disabled
@@ -1,5 +1,5 @@
 # Module: etcd
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-etcd.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-etcd.html
 
 - module: etcd
   #metricsets:

diff --git a/metricbeat/modules.d/golang.yml.disabled b/metricbeat/modules.d/golang.yml.disabled
@@ -1,5 +1,5 @@
 # Module: golang
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-golang.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-golang.html
 
 - module: golang
   #metricsets:

diff --git a/metricbeat/modules.d/graphite.yml.disabled b/metricbeat/modules.d/graphite.yml.disabled
@@ -1,5 +1,5 @@
 # Module: graphite
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-graphite.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-graphite.html
 
 - module: graphite
   #metricsets:

diff --git a/metricbeat/modules.d/haproxy.yml.disabled b/metricbeat/modules.d/haproxy.yml.disabled
@@ -1,5 +1,5 @@
 # Module: haproxy
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-haproxy.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-haproxy.html
 
 - module: haproxy
   #metricsets:

diff --git a/metricbeat/modules.d/http.yml.disabled b/metricbeat/modules.d/http.yml.disabled
@@ -1,5 +1,5 @@
 # Module: http
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-http.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-http.html
 
 - module: http
   #metricsets:

diff --git a/metricbeat/modules.d/jolokia.yml.disabled b/metricbeat/modules.d/jolokia.yml.disabled
@@ -1,5 +1,5 @@
 # Module: jolokia
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-jolokia.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-jolokia.html
 
 - module: jolokia
   #metricsets: ["jmx"]

diff --git a/metricbeat/modules.d/kafka.yml.disabled b/metricbeat/modules.d/kafka.yml.disabled
@@ -1,5 +1,5 @@
 # Module: kafka
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kafka.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-kafka.html
 
 # Kafka metrics collected using the Kafka protocol
 - module: kafka

diff --git a/metricbeat/modules.d/kibana-xpack.yml.disabled b/metricbeat/modules.d/kibana-xpack.yml.disabled
@@ -1,5 +1,5 @@
 # Module: kibana
-# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kibana.html
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/main/metricbeat-module-kibana.html
 
 - module: kibana
   xpack.enabled: true