Skip to content

Commit

Permalink
[7.7] version bump through beats update (#3842)
Browse files Browse the repository at this point in the history 
* Update beats framework to 36c4ff678d3c

* Update APM Server version
  • Loading branch information
@simitt
simitt authored Jun 3, 2020
1 parent 4950c02 commit 66c0629
Show file tree
Hide file tree
Showing 17 changed files with 559 additions and 564 deletions.
8 changes: 4 additions & 4 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,8 @@ Contents of "LICENSE":

--------------------------------------------------------------------
Dependency: github.com/elastic/beats/v7
Version: v7.0.0
Revision: 8992fa169aaa
Version: v7.7.1
Revision: 36c4ff678d3c
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Expand Down Expand Up @@ -2416,7 +2416,7 @@ Contents of "LICENSE.txt":

--------------------------------------------------------------------
Dependency: golang.org/x/crypto
Revision: c9f3fb736b72
Revision: 06a226fb4e37
License type (autodetected): BSD-3-Clause
Contents of "LICENSE":

Expand Down Expand Up @@ -2552,7 +2552,7 @@ Contents of "LICENSE":

--------------------------------------------------------------------
Dependency: golang.org/x/sys
Revision: 417ce2331b5c
Revision: 6fdc65e7d980
License type (autodetected): BSD-3-Clause
Contents of "LICENSE":

Expand Down
2 changes: 1 addition & 1 deletion ...est_approved/integration/TestRootHandler_AuthorizationMiddleware/Authorized.approved.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"build_date": "0001-01-01T00:00:00Z",
"build_sha": "unknown",
"version": "7.7.1"
"version": "7.7.2"
}
20 changes: 10 additions & 10 deletions beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2017-05-09T15:04:05.999Z",
"agent": {
Expand Down Expand Up @@ -281,7 +281,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"process": {
Expand Down Expand Up @@ -346,7 +346,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2018-08-09T14:59:05.999Z",
"agent": {
Expand Down Expand Up @@ -397,7 +397,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"process": {
Expand Down Expand Up @@ -447,7 +447,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2018-08-09T14:59:05.999Z",
"agent": {
Expand Down Expand Up @@ -494,7 +494,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"process": {
Expand Down Expand Up @@ -544,7 +544,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-01-09T21:40:53.000Z",
"agent": {
Expand Down Expand Up @@ -591,7 +591,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"parent": {
Expand Down Expand Up @@ -647,7 +647,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2018-08-09T15:04:05.999Z",
"agent": {
Expand Down Expand Up @@ -693,7 +693,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"parent": {
Expand Down
16 changes: 8 additions & 8 deletions beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-10-21T11:30:44.929Z",
"agent": {
Expand Down Expand Up @@ -227,7 +227,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"parent": {
Expand Down Expand Up @@ -300,7 +300,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-10-21T11:30:44.929Z",
"agent": {
Expand Down Expand Up @@ -343,7 +343,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"parent": {
Expand Down Expand Up @@ -458,7 +458,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-10-21T11:30:44.929Z",
"agent": {
Expand Down Expand Up @@ -560,7 +560,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"parent": {
Expand Down Expand Up @@ -656,7 +656,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-10-21T11:30:44.929Z",
"agent": {
Expand Down Expand Up @@ -724,7 +724,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"process": {
Expand Down
8 changes: 4 additions & 4 deletions beater/test_approved_es_documents/TestPublishIntegrationMetricsets.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2017-05-30T18:53:42.281Z",
"agent": {
Expand Down Expand Up @@ -50,7 +50,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"process": {
Expand Down Expand Up @@ -110,7 +110,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2017-05-30T18:53:41.364Z",
"agent": {
Expand Down Expand Up @@ -138,7 +138,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"process": {
Expand Down
28 changes: 14 additions & 14 deletions beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-01-09T21:40:53.000Z",
"agent": {
Expand All @@ -30,7 +30,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"processor": {
Expand All @@ -49,7 +49,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-01-09T21:40:53.000Z",
"agent": {
Expand All @@ -76,7 +76,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"processor": {
Expand All @@ -95,7 +95,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-01-09T21:40:53.000Z",
"agent": {
Expand All @@ -122,7 +122,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"processor": {
Expand All @@ -141,7 +141,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-01-09T21:40:53.000Z",
"agent": {
Expand All @@ -159,7 +159,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"parent": {
Expand Down Expand Up @@ -195,7 +195,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2018-08-30T18:53:27.154Z",
"agent": {
Expand All @@ -213,7 +213,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"parent": {
Expand Down Expand Up @@ -246,7 +246,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2019-01-09T21:40:53.000Z",
"agent": {
Expand All @@ -264,7 +264,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"processor": {
Expand Down Expand Up @@ -297,7 +297,7 @@
"beat": "apm-test",
"pipeline": "apm",
"type": "_doc",
"version": "7.7.1"
"version": "7.7.2"
},
"@timestamp": "2017-05-30T18:53:42.281Z",
"agent": {
Expand All @@ -315,7 +315,7 @@
"hostname": "",
"id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
"type": "test-apm-server",
"version": "7.7.1",
"version": "7.7.2",
"version_major": 7
},
"processor": {
Expand Down
Loading

0 comments on commit 66c0629

Please sign in to comment.