From 4cc119f5fb0110a797eb6610f8d125c4cafe4245 Mon Sep 17 00:00:00 2001 From: Andres Rodriguez Date: Wed, 13 Oct 2021 08:23:08 +0200 Subject: [PATCH 1/3] Forward port 7.15.1 changelog to 7.x (#28373) * docs: Prepare Changelog for 7.15.1 (#28345) * docs: Close changelog for 7.15.1 * Review and cleanup * Apply suggestions from code review Co-authored-by: DeDe Morton Co-authored-by: Andres Rodriguez Co-authored-by: Andres Rodriguez Co-authored-by: DeDe Morton (cherry picked from commit d56807904250dfc20f7b994af6f3a999c2339892) * Cleanup and review Co-authored-by: Elastic Machine --- CHANGELOG.asciidoc | 15 +++++++++++++++ CHANGELOG.next.asciidoc | 5 +---- libbeat/docs/release.asciidoc | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 219018ce38c4..fccbdae11240 100644 --- a/CHANGELOG.asciidoc +++ b/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] diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 6387549bf457..aeda1c64968b 100644 --- a/CHANGELOG.next.asciidoc +++ b/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] *Heartbeat* diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc index ae42b66e0ef6..702993f178a3 100644 --- a/libbeat/docs/release.asciidoc +++ b/libbeat/docs/release.asciidoc @@ -8,6 +8,7 @@ This section summarizes the changes in each release. Also read <> for more detail about changes that affect upgrade. +* <> * <> * <> * <> From f3c8c558d2d202bf87dc4664746d968b97ada1b2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 11:28:51 +0200 Subject: [PATCH 2/3] [7.x](backport #28366) [Metricbeat] gcp.billing: uniform metricset's fields (#28384) Co-authored-by: endorama <526307+endorama@users.noreply.github.com> --- .../module/gcp/billing/_meta/fields.yml | 26 +++++++++---------- x-pack/metricbeat/module/gcp/fields.go | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/x-pack/metricbeat/module/gcp/billing/_meta/fields.yml b/x-pack/metricbeat/module/gcp/billing/_meta/fields.yml index 56608ad00a77..e326f8f7a2cd 100644 --- a/x-pack/metricbeat/module/gcp/billing/_meta/fields.yml +++ b/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. diff --git a/x-pack/metricbeat/module/gcp/fields.go b/x-pack/metricbeat/module/gcp/fields.go index 1d12942e9eb3..4300858a6e5b 100644 --- a/x-pack/metricbeat/module/gcp/fields.go +++ b/x-pack/metricbeat/module/gcp/fields.go @@ -19,5 +19,5 @@ func init() { // AssetGcp returns asset data. // This is the base64 encoded zlib format compressed contents of module/gcp. func AssetGcp() string { - return "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" + return "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" } From 527bf422a7346243e67f3bc06b79e6d607779471 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 13 Oct 2021 08:10:55 -0400 Subject: [PATCH 3/3] [Automation] Update elastic stack version to 7.16.0-86000c2d for testing (#28380) Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- testing/environments/snapshot-oss.yml | 6 +++--- testing/environments/snapshot.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/environments/snapshot-oss.yml b/testing/environments/snapshot-oss.yml index d5beded736f8..6eae40ed069a 100644 --- a/testing/environments/snapshot-oss.yml +++ b/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 diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml index 6339f6c490ae..0da8a5b5034b 100644 --- a/testing/environments/snapshot.yml +++ b/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