Skip to content

Commit

Permalink
Merge branch 'master' into backport/master/pr-25846
Browse files Browse the repository at this point in the history
  • Loading branch information
dedemorton committed Jun 28, 2021
2 parents 33237d0 + 7ca5909 commit 2817bc7
Show file tree
Hide file tree
Showing 76 changed files with 3,183 additions and 189 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-developer.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,4 @@ The list below covers the major changes between 6.3.0 and 7.0.0-alpha2 only.
- Allow/Merge fields.yml overrides {pull}9188[9188]
- Filesets can now define multiple ingest pipelines, with the first one considered as the entry point pipeline. {pull}8914[8914]
- Add `group_measurements_by_instance` option to windows perfmon metricset. {pull}8688[8688]
- Bump ECS version to 1.10.0. {issue}25734[25734]
5 changes: 5 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix ILM alias creation when write alias exists and initial index does not exist {pull}26143[26143]
- Omit full index template from errors that occur while loading the template. {pull}25743[25743]
- In the script processor, the `decode_xml` and `decode_xml_wineventlog` processors are now available as `DecodeXML` and `DecodeXMLWineventlog` respectively.
- Fix encoding errors when using the disk queue on nested data with multi-byte characters {pull}26484[26484]

*Auditbeat*

Expand Down Expand Up @@ -495,6 +496,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Update config in `windows.yml` file. {issue}23027[23027]{pull}23327[23327]
- Fix metric grouping for windows/perfmon module {issue}23489[23489] {pull}23505[23505]
- Major refactor of system/cpu and system/core metrics. {pull}25771[25771]
- Fix GCP Project ID being ingested as `cloud.account.id` in `gcp.billing` module {issue}26357[26357] {pull}26412[26412]

*Packetbeat*

Expand Down Expand Up @@ -817,6 +819,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Update PanOS module to parse HIP Match logs. {issue}24350[24350] {pull}25686[25686]
- Support MongoDB 4.4 in filebeat's MongoDB module. {issue}20501[20501] {pull}24774[24774]
- Enhance GCP module to populate orchestrator.* fields for GKE / K8S logs {pull}25368[25368]
- Add log_group_name_prefix config into aws-cloudwatch input. {pull}26187[26187]
- Move Filebeat azure module to GA. {pull}26114[26114] {pull}26168[26168]
- http_endpoint: Support multiple documents in a single request by POSTing an array or NDJSON format. {pull}25764[25764]
- Make `filestream` input GA. {pull}26127[26127]
Expand All @@ -833,13 +836,15 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Added dataset `anomalithreatstream` to the `threatintel` module to ingest indicators from Anomali ThreatStream {pull}26350[26350]
- Add support for `copytruncate` method when rotating input logs with an external tool in `filestream` input. {pull}23457[23457]
- Add `uri_parts` and `user_agent` ingest processors to `aws.elb` module. {issue}26435[26435] {pull}26441[26441]
- Added dataset `recordedfuture` to the `threatintel` module to ingest indicators from Recorded Future Connect API {pull}26481[26481]

*Heartbeat*

- Add mime type detection for http responses. {pull}22976[22976]

*Journalbeat*

- Suppress too many bad message error logs when reading from corrupted journal for 5 seconds. {pull}26224[26224]

*Metricbeat*

Expand Down
4 changes: 2 additions & 2 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6133,11 +6133,11 @@ This Agreement is governed by the laws of the State of New York and the intellec

--------------------------------------------------------------------------------
Dependency : github.com/elastic/ecs
Version: v1.8.0
Version: v1.10.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/ecs@v1.8.0/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/ecs@v1.10.0/LICENSE.txt:


Apache License
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/include/fields.go

Large diffs are not rendered by default.

171 changes: 171 additions & 0 deletions filebeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -152208,6 +152208,17 @@ example: Montreal

--

*`threatintel.indicator.geo.continent_name`*::
+
--
Name of the continent.

type: keyword

example: North America

--

*`threatintel.indicator.geo.country_iso_code`*::
+
--
Expand Down Expand Up @@ -153643,6 +153654,166 @@ type: keyword

--

[float]
=== recordedfuture

Fields for Recorded Future Threat Intel



[float]
=== entity

Entity that represents a threat.



*`threatintel.recordedfuture.entity.id`*::
+
--
Entity ID.


type: keyword

example: ip:192.0.2.13

--

*`threatintel.recordedfuture.entity.name`*::
+
--
Entity name. Value for the entity.


type: keyword

example: 192.0.2.13

--

*`threatintel.recordedfuture.entity.type`*::
+
--
Entity type.


type: keyword

example: IpAddress

--

*`threatintel.recordedfuture.intelCard`*::
+
--
Link to the Recorded Future Intelligence Card for to this indicator.


type: keyword

--

*`threatintel.recordedfuture.ip_range`*::
+
--
Range of IPs for this indicator.


type: ip_range

example: 192.0.2.0/16

--

[float]
=== risk

Risk fields.



*`threatintel.recordedfuture.risk.criticality`*::
+
--
Risk criticality (0-4).


type: byte

--

*`threatintel.recordedfuture.risk.criticalityLabel`*::
+
--
Risk criticality label. One of None, Unusual, Suspicious, Malicious, Very Malicious.


type: keyword

--

*`threatintel.recordedfuture.risk.evidenceDetails`*::
+
--
Risk's evidence details.


type: flattened

--

*`threatintel.recordedfuture.risk.score`*::
+
--
Risk score (0-99).


type: short

--

*`threatintel.recordedfuture.risk.riskString`*::
+
--
Number of Risk Rules observed as a factor of total number of rules.


type: keyword

example: 1/54

--

*`threatintel.recordedfuture.risk.riskSummary`*::
+
--
Risk summary.


type: keyword

example: 1 of 54 Risk Rules currently observed.

--

*`threatintel.recordedfuture.risk.riskSummary.text`*::
+
--
type: text

--

*`threatintel.recordedfuture.risk.rules`*::
+
--
Number of rules observed.


type: long

--

[[exported-fields-tomcat]]
== Apache Tomcat fields

Expand Down
1 change: 0 additions & 1 deletion filebeat/docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
:beat_default_index_prefix: {beatname_lc}
:beat_kib_app: {kib} Logs
:has_ml_jobs: yes
:has_central_config:
:has_solutions:
:ignores_max_retries:
:has_docker_label_ex:
Expand Down
Loading

0 comments on commit 2817bc7

Please sign in to comment.