Skip to content

Commit 21bfc93

Browse files
authored
Update version, update beats (#3792)
1 parent 22fc92b commit 21bfc93

File tree

16 files changed

+646
-613
lines changed

16 files changed

+646
-613
lines changed

NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
264264
--------------------------------------------------------------------
265265
Dependency: github.com/elastic/beats
266266
Version: 6.8
267-
Revision: 41e998345cea98af2492e633e8dc4b2c9ed352b4
267+
Revision: 4e10965a54359738b64b9ea4b141831affbb8242
268268
License type (autodetected): Apache-2.0
269269
./vendor/github.com/elastic/beats/LICENSE.txt:
270270
--------------------------------------------------------------------

_beats/libbeat/docs/version.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:stack-version: 6.8.3
1+
:stack-version: 6.8.9
22
:doc-branch: 6.8
33
:go-version: 1.10.8
44
:release-state: released

_beats/libbeat/scripts/generate_fields_docs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def document_field(output, field, field_path):
4848
output.write("*`{}`*::\n+\n--\n".format(field["field_path"]))
4949

5050
if "deprecated" in field:
51-
output.write("\ndeprecated[{}]\n\n".format(field["deprecated"]))
51+
output.write("\ndeprecated:[{}]\n\n".format(field["deprecated"]))
5252

5353
if "type" in field:
5454
output.write("type: {}\n\n".format(field["type"]))

_beats/libbeat/tests/system/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ websocket-client==0.47.0
3030
parameterized==0.6.1
3131
jsondiff==1.1.2
3232
semver==2.8.1
33+
deepdiff==3.3.0

_beats/script/build_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ do
3737
params="$params --resource=${resource_dir}"
3838
fi
3939

40-
$docs_dir/build_docs $params --doc "$index" --out "$dest_dir"
40+
$docs_dir/build_docs --direct_html --respect_edit_url_overrides $params --doc "$index" --out "$dest_dir"
4141
done

_beats/testing/environments/latest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version: '2.3'
44
services:
55
elasticsearch:
6-
image: docker.elastic.co/elasticsearch/elasticsearch:7.3.1
6+
image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
77
healthcheck:
88
test: ["CMD", "curl", "-f", "http://localhost:9200"]
99
retries: 300
@@ -16,7 +16,7 @@ services:
1616
- "xpack.security.enabled=false"
1717

1818
logstash:
19-
image: docker.elastic.co/logstash/logstash:7.3.1
19+
image: docker.elastic.co/logstash/logstash:7.6.2
2020
healthcheck:
2121
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
2222
retries: 300
@@ -26,7 +26,7 @@ services:
2626
- ./docker/logstash/pki:/etc/pki:ro
2727

2828
kibana:
29-
image: docker.elastic.co/kibana/kibana:7.3.1
29+
image: docker.elastic.co/kibana/kibana:7.6.2
3030
healthcheck:
3131
test: ["CMD", "curl", "-f", "http://localhost:5601"]
3232
retries: 300

_beats/testing/environments/snapshot-oss.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version: '2.3'
44
services:
55
elasticsearch:
6-
image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.3-SNAPSHOT
6+
image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.9-SNAPSHOT
77
healthcheck:
88
test: ["CMD", "curl", "-f", "http://localhost:9200"]
99
retries: 300
@@ -15,7 +15,7 @@ services:
1515
- "http.host=0.0.0.0"
1616

1717
logstash:
18-
image: docker.elastic.co/logstash/logstash-oss:6.8.3-SNAPSHOT
18+
image: docker.elastic.co/logstash/logstash-oss:6.8.9-SNAPSHOT
1919
healthcheck:
2020
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
2121
retries: 600
@@ -25,7 +25,7 @@ services:
2525
- ./docker/logstash/pki:/etc/pki:ro
2626

2727
kibana:
28-
image: docker.elastic.co/kibana/kibana-oss:6.8.3-SNAPSHOT
28+
image: docker.elastic.co/kibana/kibana-oss:6.8.9-SNAPSHOT
2929
healthcheck:
3030
test: ["CMD-SHELL", 'python -c ''import urllib, json; response = urllib.urlopen("http://localhost:5601/api/status"); data = json.loads(response.read()); exit(1) if data["status"]["overall"]["state"] != "green" else exit(0);''']
3131
retries: 600

_beats/testing/environments/snapshot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version: '2.3'
44
services:
55
elasticsearch:
6-
image: docker.elastic.co/elasticsearch/elasticsearch:6.8.3-SNAPSHOT
6+
image: docker.elastic.co/elasticsearch/elasticsearch:6.8.9-SNAPSHOT
77
healthcheck:
88
test: ["CMD", "curl", "-f", "http://localhost:9200"]
99
retries: 300
@@ -16,7 +16,7 @@ services:
1616
- "xpack.security.enabled=false"
1717

1818
logstash:
19-
image: docker.elastic.co/logstash/logstash:6.8.3-SNAPSHOT
19+
image: docker.elastic.co/logstash/logstash:6.8.9-SNAPSHOT
2020
healthcheck:
2121
test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
2222
retries: 600
@@ -26,7 +26,7 @@ services:
2626
- ./docker/logstash/pki:/etc/pki:ro
2727

2828
kibana:
29-
image: docker.elastic.co/kibana/kibana:6.8.3-SNAPSHOT
29+
image: docker.elastic.co/kibana/kibana:6.8.9-SNAPSHOT
3030
healthcheck:
3131
test: ["CMD-SHELL", 'python -c ''import urllib, json; response = urllib.urlopen("http://localhost:5601/api/status"); data = json.loads(response.read()); exit(1) if data["status"]["overall"]["state"] != "green" else exit(0);''']
3232
retries: 600

vendor/github.com/elastic/beats/NOTICE.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/elastic/beats/libbeat/common/event.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)