Merge branch '7.x' into mergify/bp/7.x/pr-28352

CHANGELOG.asciidoc

@@ -3,6 +3,21 @@
 :issue: https://github.com/elastic/beats/issues/
 :pull: https://github.com/elastic/beats/pull/
 
+[[release-notes-7.15.1]]
+=== Beats version 7.15.1
+https://github.com/elastic/beats/compare/v7.15.0...v7.15.1[View commits]
+
+==== Bugfixes
+
+*Filebeat*
+
+- Update Sophos xg module pipeline to deal with missing `date` and `time` fields. {pull}27834[27834]
+- sophos/xg fileset: Add missing pipeline for System Health logs. {pull}27827[27827] {issue}27826[27826]
+
+*Metricbeat*
+
+- Add support for kube-state-metrics v2.0.0. {pull}27552[27552]
+
 [[release-notes-7.15.0]]
 === Beats version 7.15.0
 https://github.com/elastic/beats/compare/v7.14.2...v7.15.0[View commits]

CHANGELOG.next.asciidoc

@@ -43,7 +43,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Disable the option of running --machine-learning on its own. {pull}20241[20241]
 - Fix PANW field spelling "veredict" to "verdict" on event.action {pull}18808[18808]
 - Add support for GMT timezone offsets in `decode_cef`. {pull}20993[20993]
-- Fix initialization of http client in Cloudfoundry input. {issue}28271[28271] {pull}28277[28277]
 
 *Heartbeat*
 
@@ -60,7 +59,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix ECS compliance of user.id field in system/users  metricset {pull}19019[19019]
 - Remove "invalid zero" metrics on Windows and Darwin, don't report linux-only memory and diskio metrics when running under agent. {pull}21457[21457]
 - Add Linux pressure metricset {pull}27355[27355]
-- Add support for kube-state-metrics v2.0.0 {pull}27552[27552]
 - Add User-Agent header to HTTP requests. {issue}18160[18160] {pull}27509[27509]
 - Errors should be thrown as errors. Metricsets inside Metricbeat will now throw errors as the `error` log level. {pull}27804[27804]
 
@@ -194,11 +192,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Drop aws.vpcflow.pkt_srcaddr and aws.vpcflow.pkt_dstaddr when equal to "-". {pull}22721[22721] {issue}22716[22716]
 - Improve Cisco ASA/FTD parsing of messages - better support for identity FW messages. Change network.bytes, source.bytes, and destination.bytes to long from integer since value can exceed integer capacity.  Add descriptions for various processors for easier pipeline editing in Kibana UI. {pull}23766[23766]
 - Update indentation for azure filebeat configuration. {pull}26604[26604]
-- Update Sophos xg module pipeline to deal with missing `date` and `time` fields. {pull}27834[27834]
-- sophos/xg fileset: Add missing pipeline for System Health logs. {pull}27827[27827] {issue}27826[27826]
 - Tolerate faults when Windows Event Log session is interrupted {issue}27947[27947] {pull}28191[28191]
 - Add support for username in cisco asa security negotiation logs {pull}26975[26975]
 - Relax time parsing and capture group and session type in Cisco ASA module {issue}24710[24710] {pull}28325[28325]
+- Fix initialization of http client in Cloudfoundry input. {issue}28271[28271] {pull}28277[28277]
 - Correctly track bytes read when max_bytes is exceeded. {issue}28317[28317] {pull}28352[28352]
 
 *Heartbeat*

libbeat/docs/release.asciidoc

@@ -8,6 +8,7 @@ This section summarizes the changes in each release. Also read
 <<breaking-changes>> for more detail about changes that affect
 upgrade.
 
+* <<release-notes-7.15.1>>
 * <<release-notes-7.15.0>>
 * <<release-notes-7.14.2>>
 * <<release-notes-7.14.1>>

testing/environments/snapshot-oss.yml

@@ -3,7 +3,7 @@
 version: '2.3'
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.16.0-76e5f71e-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.16.0-86000c2d-SNAPSHOT
     healthcheck:
       test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
       retries: 300
@@ -17,7 +17,7 @@ services:
     - "indices.id_field_data.enabled=true"
 
   logstash:
-    image: docker.elastic.co/logstash/logstash-oss:7.16.0-76e5f71e-SNAPSHOT
+    image: docker.elastic.co/logstash/logstash-oss:7.16.0-86000c2d-SNAPSHOT
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
       retries: 600
@@ -27,7 +27,7 @@ services:
     - ./docker/logstash/pki:/etc/pki:ro
 
   kibana:
-    image: docker.elastic.co/kibana/kibana-oss:7.16.0-76e5f71e-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana-oss:7.16.0-86000c2d-SNAPSHOT
     healthcheck:
       test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
       retries: 600

testing/environments/snapshot.yml

@@ -3,7 +3,7 @@
 version: '2.3'
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.16.0-76e5f71e-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.16.0-86000c2d-SNAPSHOT
     healthcheck:
       test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"]
       retries: 300
@@ -24,7 +24,7 @@ services:
     - "ingest.geoip.downloader.enabled=false"
 
   logstash:
-    image: docker.elastic.co/logstash/logstash:7.16.0-76e5f71e-SNAPSHOT
+    image: docker.elastic.co/logstash/logstash:7.16.0-86000c2d-SNAPSHOT
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
       retries: 600
@@ -34,7 +34,7 @@ services:
       - ./docker/logstash/pki:/etc/pki:ro
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.16.0-76e5f71e-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:7.16.0-86000c2d-SNAPSHOT
     healthcheck:
       test: ["CMD-SHELL", "curl -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"]
       retries: 600

x-pack/metricbeat/module/gcp/billing/_meta/fields.yml

@@ -1,17 +1,17 @@
 - name: billing
+  description: Google Cloud Billing metrics
   release: beta
   type: group
-  description: Google Cloud Billing metrics
   fields:
-    - name: cost_type
-      type: keyword
-      description: Cost types include regular, tax, adjustment, and rounding_error.
-    - name: invoice_month
-      type: keyword
-      description: Billing report month.
-    - name: project_id
-      type: keyword
-      description: Project ID of the billing report belongs to.
-    - name: total
-      type: float
-      description: Total billing amount.
+  - name: cost_type
+    type: keyword
+    description: Cost types include regular, tax, adjustment, and rounding_error.
+  - name: invoice_month
+    type: keyword
+    description: Billing report month.
+  - name: project_id
+    type: keyword
+    description: Project ID of the billing report belongs to.
+  - name: total
+    type: float
+    description: Total billing amount.