From 28951c119bb9fbbab891bd8a95cea2ecb24d4f9d Mon Sep 17 00:00:00 2001 From: Lei Qiu Date: Fri, 3 Apr 2020 15:21:11 -0700 Subject: [PATCH 1/2] =?UTF-8?q?Remove=20migrationVersion=20map=207.7.0=20r?= =?UTF-8?q?eference=20from=20Kibana=20dashboard=20file=20to=20avoid=20back?= =?UTF-8?q?ward=20compat=E2=80=A6=20(#17425)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove 7.7.0 reference from Kibana dashboard to avoid backward compatibility issues. * Update CHANGELOG.next.asciidoc (cherry picked from commit 334c590334591aadc73f32aa5a15ab5c36f50d07) --- CHANGELOG.next.asciidoc | 2 ++ .../7/dashboard/749203a0-67b1-11ea-a76f-bf44814e437d.json | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index a1570118b07..569fbb16df4 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -137,6 +137,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fixed MySQL slowlog module causing "regular expression has redundant nested repeat operator" warning in Elasticsearch. {issue}17086[17086] {pull}17156[17156] - Fix `elasticsearch.audit` data ingest pipeline to be more forgiving with date formats found in Elasticsearch audit logs. {pull}17406[17406] - CEF: Fixed decoding errors caused by trailing spaces in messages. {pull}17253[17253] +- Fixed activemq module causing "regular expression has redundant nested repeat operator" warning in Elasticsearch. {pull}17428[17428] +- Remove migrationVersion map 7.7.0 reference from Kibana dashboard file to fix backward compatibility issues. {pull}17425[17425] *Heartbeat* diff --git a/x-pack/filebeat/module/okta/_meta/kibana/7/dashboard/749203a0-67b1-11ea-a76f-bf44814e437d.json b/x-pack/filebeat/module/okta/_meta/kibana/7/dashboard/749203a0-67b1-11ea-a76f-bf44814e437d.json index 0d61b5acfaf..657fe970da9 100644 --- a/x-pack/filebeat/module/okta/_meta/kibana/7/dashboard/749203a0-67b1-11ea-a76f-bf44814e437d.json +++ b/x-pack/filebeat/module/okta/_meta/kibana/7/dashboard/749203a0-67b1-11ea-a76f-bf44814e437d.json @@ -189,9 +189,6 @@ } }, "id": "281ca660-67b1-11ea-a76f-bf44814e437d", - "migrationVersion": { - "map": "7.7.0" - }, "references": [ { "id": "filebeat-*", From 9d0d91a653c7726a2503cead4fa76eaccf55a902 Mon Sep 17 00:00:00 2001 From: Ray Qiu Date: Fri, 3 Apr 2020 15:38:03 -0700 Subject: [PATCH 2/2] Fix cherrypick script error in CHANGELOG.next.asciidoc --- CHANGELOG.next.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 569fbb16df4..45b0f406351 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -137,7 +137,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fixed MySQL slowlog module causing "regular expression has redundant nested repeat operator" warning in Elasticsearch. {issue}17086[17086] {pull}17156[17156] - Fix `elasticsearch.audit` data ingest pipeline to be more forgiving with date formats found in Elasticsearch audit logs. {pull}17406[17406] - CEF: Fixed decoding errors caused by trailing spaces in messages. {pull}17253[17253] -- Fixed activemq module causing "regular expression has redundant nested repeat operator" warning in Elasticsearch. {pull}17428[17428] - Remove migrationVersion map 7.7.0 reference from Kibana dashboard file to fix backward compatibility issues. {pull}17425[17425] *Heartbeat*