Merge pull request #7 from elastic/main

Fork Sync: Update from parent repository

.github/CODEOWNERS

@@ -12,6 +12,12 @@
 # https://github.community/t/codeowners-file-with-a-not-file-type-condition/1423/9
 CHANGELOG*
 
+# The tech leads of the teams working in Beats share ownership of the Go module dependencies and related files.
+/.github/CODEOWNERS/ @elastic/beats-tech-leads
+/.go.mod/ @elastic/beats-tech-leads
+/.go.sum/ @elastic/beats-tech-leads
+/NOTICE.txt/ @elastic/beats-tech-leads
+
 /.ci/ @elastic/elastic-agent-data-plane
 /.github/ @elastic/elastic-agent-data-plane
 /auditbeat/ @elastic/security-external-integrations
@@ -24,25 +30,23 @@ CHANGELOG*
 /filebeat/input/syslog/ @elastic/security-external-integrations
 /filebeat/input/winlog/ @elastic/security-external-integrations
 /filebeat/module/ @elastic/integrations
-/filebeat/module/apache @elastic/integrations
+/filebeat/module/apache @elastic/obs-infraobs-integrations
 /filebeat/module/auditd @elastic/security-external-integrations
 /filebeat/module/elasticsearch/ @elastic/infra-monitoring-ui
-/filebeat/module/haproxy @elastic/integrations
+/filebeat/module/haproxy @elastic/obs-infraobs-integrations
 /filebeat/module/icinga @elastic/integrations
-/filebeat/module/iis @elastic/integrations
-/filebeat/module/kafka @elastic/integrations
-/filebeat/module/kibana @elastic/integrations
+/filebeat/module/iis @elastic/obs-infraobs-integrations
+/filebeat/module/kafka @elastic/obs-infraobs-integrations
 /filebeat/module/kibana/ @elastic/infra-monitoring-ui
-/filebeat/module/logstash @elastic/integrations
 /filebeat/module/logstash/ @elastic/infra-monitoring-ui
-/filebeat/module/mongodb @elastic/integrations
+/filebeat/module/mongodb @elastic/obs-infraobs-integrations
 /filebeat/module/mysql @elastic/security-external-integrations
 /filebeat/module/nats @elastic/integrations
-/filebeat/module/nginx @elastic/integrations
+/filebeat/module/nginx @elastic/obs-infraobs-integrations
 /filebeat/module/osquery @elastic/security-asset-management
 /filebeat/module/pensando @elastic/security-external-integrations
-/filebeat/module/postgresql @elastic/integrations
-/filebeat/module/redis @elastic/integrations
+/filebeat/module/postgresql @elastic/obs-infraobs-integrations
+/filebeat/module/redis @elastic/obs-infraobs-integrations
 /filebeat/module/santa @elastic/security-external-integrations
 /filebeat/module/system @elastic/elastic-agent-data-plane
 /filebeat/module/traefik @elastic/integrations
@@ -63,14 +67,34 @@ CHANGELOG*
 /metricbeat/ @elastic/elastic-agent-data-plane
 /metricbeat/docs/ # Listed without an owner to avoid maintaining doc ownership for each input and module.
 /metricbeat/module/ @elastic/integrations
+/metricbeat/module/apache @elastic/obs-infraobs-integrations
 /metricbeat/module/beat/ @elastic/infra-monitoring-ui
+/metricbeat/module/ceph @elastic/obs-infraobs-integrations
+/metricbeat/module/couchbase @elastic/obs-infraobs-integrations
+/metricbeat/module/couchdb @elastic/obs-infraobs-integrations
 /metricbeat/module/elasticsearch/ @elastic/infra-monitoring-ui
+/metricbeat/module/etcd @elastic/obs-infraobs-integrations
+/metricbeat/module/golang @elastic/obs-infraobs-integrations
+/metricbeat/module/haproxy @elastic/obs-infraobs-integrations
+/metricbeat/module/http @elastic/obs-infraobs-integrations
+/metricbeat/module/jolokia @elastic/obs-infraobs-integrations
+/metricbeat/module/kafka @elastic/obs-infraobs-integrations
 /metricbeat/module/kibana/ @elastic/infra-monitoring-ui
 /metricbeat/module/kubernetes/ @elastic/obs-cloudnative-monitoring
 /metricbeat/module/logstash/ @elastic/infra-monitoring-ui
+/metricbeat/module/memcached @elastic/obs-infraobs-integrations
+/metricbeat/module/mongodb @elastic/obs-infraobs-integrations
+/metricbeat/module/mysql @elastic/obs-infraobs-integrations
 /metricbeat/module/nats/ @elastic/obs-cloudnative-monitoring
+/metricbeat/module/nginx @elastic/obs-infraobs-integrations
+/metricbeat/module/php_fpm @elastic/obs-infraobs-integrations
 /metricbeat/module/prometheus/ @elastic/obs-cloudnative-monitoring
+/metricbeat/module/postgresql @elastic/obs-infraobs-integrations
+/metricbeat/module/rabbitmq @elastic/obs-infraobs-integrations
+/metricbeat/module/redis @elastic/obs-infraobs-integrations
 /metricbeat/module/system/ @elastic/elastic-agent-data-plane
+/metricbeat/module/vsphere @elastic/obs-infraobs-integrations
+/metricbeat/module/zookeeper @elastic/obs-infraobs-integrations
 /packetbeat/ @elastic/security-external-integrations
 /script/ @elastic/elastic-agent-data-plane
 /testing/ @elastic/elastic-agent-data-plane
@@ -85,6 +109,7 @@ CHANGELOG*
 /x-pack/filebeat/input/azureblobstorage/ @elastic/security-external-integrations
 /x-pack/filebeat/input/azureeventhub/ @elastic/obs-cloud-monitoring
 /x-pack/filebeat/input/cel/ @elastic/security-external-integrations
+/x-pack/filebeat/input/cometd/ @elastic/obs-infraobs-integrations
 /x-pack/filebeat/input/entityanalytics/ @elastic/security-external-integrations
 /x-pack/filebeat/input/gcppubsub/ @elastic/security-external-integrations
 /x-pack/filebeat/input/gcs/ @elastic/security-external-integrations
@@ -94,7 +119,7 @@ CHANGELOG*
 /x-pack/filebeat/input/netflow/ @elastic/security-external-integrations
 /x-pack/filebeat/input/o365audit/ @elastic/security-external-integrations
 /x-pack/filebeat/module/ @elastic/integrations
-/x-pack/filebeat/module/activemq @elastic/integrations
+/x-pack/filebeat/module/activemq @elastic/obs-infraobs-integrations
 /x-pack/filebeat/module/aws @elastic/obs-cloud-monitoring
 /x-pack/filebeat/module/awsfargate @elastic/obs-cloud-monitoring
 /x-pack/filebeat/module/azure @elastic/obs-cloud-monitoring
@@ -112,14 +137,14 @@ CHANGELOG*
 /x-pack/filebeat/module/fortinet @elastic/security-external-integrations
 /x-pack/filebeat/module/gcp @elastic/security-external-integrations
 /x-pack/filebeat/module/google_workspace @elastic/security-external-integrations
-/x-pack/filebeat/module/ibmmq @elastic/integrations
+/x-pack/filebeat/module/ibmmq @elastic/obs-infraobs-integrations
 /x-pack/filebeat/module/imperva @elastic/security-external-integrations
 /x-pack/filebeat/module/infoblox @elastic/security-external-integrations
 /x-pack/filebeat/module/iptables @elastic/security-external-integrations
 /x-pack/filebeat/module/juniper @elastic/security-external-integrations
 /x-pack/filebeat/module/microsoft @elastic/security-external-integrations
 /x-pack/filebeat/module/misp @elastic/security-external-integrations
-/x-pack/filebeat/module/mssql @elastic/integrations
+/x-pack/filebeat/module/mssql @elastic/obs-infraobs-integrations
 /x-pack/filebeat/module/mysqlenterprise @elastic/security-external-integrations
 /x-pack/filebeat/module/netflow @elastic/security-external-integrations
 /x-pack/filebeat/module/netscout @elastic/security-external-integrations
@@ -128,7 +153,7 @@ CHANGELOG*
 /x-pack/filebeat/module/oracle @elastic/security-external-integrations
 /x-pack/filebeat/module/panw @elastic/security-external-integrations
 /x-pack/filebeat/module/proofpoint @elastic/security-external-integrations
-/x-pack/filebeat/module/rabbitmq @elastic/integrations
+/x-pack/filebeat/module/rabbitmq @elastic/obs-infraobs-integrations
 /x-pack/filebeat/module/radware @elastic/security-external-integrations
 /x-pack/filebeat/module/snort @elastic/security-external-integrations
 /x-pack/filebeat/module/snyk @elastic/security-external-integrations
@@ -139,19 +164,33 @@ CHANGELOG*
 /x-pack/filebeat/module/threatintel @elastic/security-external-integrations
 /x-pack/filebeat/module/tomcat @elastic/security-external-integrations
 /x-pack/filebeat/module/zeek @elastic/security-external-integrations
-/x-pack/filebeat/module/zookeeper @elastic/integrations
+/x-pack/filebeat/module/zookeeper @elastic/obs-infraobs-integrations
 /x-pack/filebeat/module/zoom @elastic/security-external-integrations
 /x-pack/filebeat/module/zscaler @elastic/security-external-integrations
+/x-pack/filebeat/modules.d/zoom.yml.disabled @elastic/security-external-integrations
 /x-pack/filebeat/processors/decode_cef/ @elastic/security-external-integrations
 /x-pack/heartbeat/ @elastic/uptime
 /x-pack/metricbeat/ @elastic/elastic-agent-data-plane
 /x-pack/metricbeat/docs/ # Listed without an owner to avoid maintaining doc ownership for each input and module.
 /x-pack/metricbeat/module/ @elastic/integrations
+/x-pack/metricbeat/module/activemq @elastic/obs-infraobs-integrations
+/x-pack/metricbeat/module/airflow @elastic/obs-infraobs-integrations
+/x-pack/metricbeat/module/cloudfoundry @elastic/obs-infraobs-integrations
+/x-pack/metricbeat/module/cockroachdb @elastic/obs-infraobs-integrations
 /x-pack/metricbeat/module/containerd/ @elastic/obs-cloudnative-monitoring
+/x-pack/metricbeat/module/coredns @elastic/obs-infraobs-integrations
 /x-pack/metricbeat/module/enterprisesearch @elastic/ent-search-application-backend
+/x-pack/metricbeat/module/ibmmq @elastic/obs-infraobs-integrations
+/x-pack/metricbeat/module/iis @elastic/obs-infraobs-integrations
 /x-pack/metricbeat/module/istio/ @elastic/obs-cloudnative-monitoring
+/x-pack/metricbeat/module/mssql @elastic/obs-infraobs-integrations
+/x-pack/metricbeat/module/oracle @elastic/obs-infraobs-integrations
 /x-pack/metricbeat/module/prometheus/ @elastic/obs-cloudnative-monitoring
+/x-pack/metricbeat/module/redisenterprise @elastic/obs-infraobs-integrations
+/x-pack/metricbeat/module/sql @elastic/obs-infraobs-integrations
+/x-pack/metricbeat/module/statsd @elastic/obs-infraobs-integrations
 /x-pack/metricbeat/module/stan/ @elastic/obs-cloudnative-monitoring
+/x-pack/metricbeat/module/tomcat @elastic/obs-infraobs-integrations
 /x-pack/osquerybeat/ @elastic/security-asset-management
 /x-pack/packetbeat/ @elastic/security-external-integrations
 /x-pack/winlogbeat/ @elastic/security-external-integrations

.github/dependabot.yml

@@ -1,15 +1,64 @@
 ---
 version: 2
+# This section is segmented by the responsible GitHub teams in order
+# to make it clear who is responsible for reviewing.
 updates:
-  - package-ecosystem: "gomod"
-    directory: "/"
+  - package-ecosystem: gomod
+    directory: /
     schedule:
-      interval: "daily"
+      interval: daily
     labels:
       - automation
+      - dependabot
       - Team:Elastic-Agent-Data-Plane
     allow:
-      - dependency-name: "github.com/elastic/*"
+      - dependency-name: github.com/elastic/elastic-agent-autodiscover
+      - dependency-name: github.com/elastic/elastic-agent-client/*
+      - dependency-name: github.com/elastic/elastic-agent-libs
+      - dependency-name: github.com/elastic/elastic-agent-shipper-client
+      - dependency-name: github.com/elastic/elastic-agent-system-metrics
+      - dependency-name: github.com/elastic/go-concert
+      - dependency-name: github.com/elastic/go-elasticsearch/*
+      - dependency-name: github.com/elastic/go-licenser
+      - dependency-name: github.com/elastic/go-lookslike
+      - dependency-name: github.com/elastic/go-lumber
+      - dependency-name: github.com/elastic/go-structform
+      - dependency-name: github.com/elastic/go-sysinfo
+      - dependency-name: github.com/elastic/go-ucfg
+      - dependency-name: github.com/elastic/gosigar
+      - dependency-name: go.elastic.co/apm/*
+      - dependency-name: go.elastic.co/ecszap
+      - dependency-name: go.elastic.co/go-licence-detector
     reviewers:
-      - "elastic/elastic-agent-data-plane"
-    open-pull-requests-limit: 10
+      - elastic/elastic-agent-data-plane
+    open-pull-requests-limit: 2
+  - package-ecosystem: gomod
+    directory: /
+    schedule:
+      interval: daily
+    labels:
+      - automation
+      - dependabot
+      - Team:Security-External Integrations
+    allow:
+      # Skip github.com/elastic/mito because it requires documentation updates.
+      - dependency-name: github.com/elastic/go-libaudit/*
+      - dependency-name: github.com/elastic/go-perf
+      - dependency-name: github.com/elastic/go-seccomp-bpf
+      - dependency-name: github.com/elastic/toutoumomoma
+    reviewers:
+      - elastic/security-external-integrations
+    open-pull-requests-limit: 2
+  - package-ecosystem: gomod
+    directory: /
+    schedule:
+      interval: daily
+    labels:
+      - automation
+      - dependabot
+      - Team:Service-Integrations
+    allow:
+      - dependency-name: github.com/elastic/bayeux
+    reviewers:
+      - elastic/obs-infraobs-integrations
+    open-pull-requests-limit: 2

.github/workflows/post-dependabot.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: check for modified NOTICE.txt
         id: notice-check
-        run: echo "modified=$(if git diff-index --quiet HEAD -- NOTICE.txt; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT
+        run: echo "modified=$(if git status --porcelain --untracked-files=no | grep -q -E ' NOTICE.txt$'; then echo "true"; else echo "false"; fi)" >> $GITHUB_OUTPUT
 
       - name: commit NOTICE.txt
         if: steps.notice-check.outputs.modified == 'true'

.go-version

@@ -1 +1 @@
-1.19.9
+1.19.10

.golangci.yml

@@ -108,7 +108,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.19.9"
+    go: "1.19.10"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -126,19 +126,19 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.19.9"
+    go: "1.19.10"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.19.9"
+    go: "1.19.10"
     # Disabled:
     # ST1005: error strings should not be capitalized
     checks: ["all", "-ST1005"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.19.9"
+    go: "1.19.10"
 
   gosec:
     excludes:

CHANGELOG-developer.next.asciidoc

@@ -81,6 +81,8 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
 - Fix the integration testcase docker port mapping for sql and oracle modules {pull}34221[34221]
 - Fix the ingest pipeline for mysql slowlog to parse schema name with dash {pull}34371[34372]
 - Fix the multiple host support for mongodb module {pull}34624[34624]
+- Skip HTTPJSON flakey test. {issue}34929[34929] {pull}35138[35138]
+- Fix ingest pipeline for panw module to parse url scheme correctly {pull}35757[35757]
 
 ==== Added
 
@@ -144,6 +146,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
 - Add support for `credentials_json` in `gcp` module, all metricsets {pull}29584[29584]
 - Add gcp firestore metricset. {pull}29918[29918]
 - Added TESTING_FILEBEAT_FILEPATTERN option for filebeat module pytests {pull}30103[30103]
+- Improve tests files with shorter statements. {pull}35667[35667]
 - Add gcp dataproc metricset. {pull}30008[30008]
 - Add Github action for linting
 - Add regex support for drop_fields processor.
@@ -154,8 +157,13 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
 - Add the file path of the instance lock on the error when it's is already locked {pull}33788[33788]
 - Add DropFields processor to js API {pull}33458[33458]
 - Add support for different folders when testing data {pull}34467[34467]
+- Add logging of metric registration in inputmon. {pull}35647[35647]
+- Add Okta API package for entity analytics. {pull}35478[35478]
+- Add benchmarking to HTTPJSON input testing. {pull}35138[35138]
+- Allow non-AWS endpoints for testing Filebeat awss3 input. {issue}35496[35496] {pull}35520[35520]
 
 ==== Deprecated
 
 - Deprecated the `common.Float` type. {issue}28279[28279] {pull}28280[28280]
 - Deprecate Beat generators. {pull}28814[28814]
+- Remove garbled PE executable test from auditbeat FIM module testing. {issue}35705[35705] {pull}35724[35724]