Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
bb1bcb8
Make memqueue.Broker internal (now memqueue.broker) (#16667)
faec Feb 27, 2020
4caba2d
[docs] Add skeleton files for 7.7 release highlights and breaking cha…
dedemorton Feb 27, 2020
96100df
[Metricbeat] Add vpc metricset for aws module (#16111)
Feb 27, 2020
eae073d
Update cisco.asciidoc (#16434)
dedemorton Feb 28, 2020
31800af
Fix wording in dev guide (#16497)
dedemorton Feb 28, 2020
25ac6ba
Added NetBeat (#12612)
Feb 28, 2020
9524e4a
Close files earlier when generating fields files (#16681)
jsoriano Feb 28, 2020
96bebe4
[Metricbeat] Add new module for Redis Enterprise (#16482)
mtojek Feb 28, 2020
d0cc078
Adding missing metricset to list (#16401)
ycombinator Feb 28, 2020
8be4589
Add metricbeat iis module (#15059)
narph Feb 28, 2020
c28bf95
Update testing environments to latest version (#16439)
dedemorton Feb 28, 2020
906e115
Add abbreviated titles for a cleaner nav (#16537)
dedemorton Feb 28, 2020
a45f125
Update haproxy.asciidoc (#16324)
maireanu Feb 28, 2020
1710a80
[docs] Add example to the dissect docs (#16588)
dedemorton Feb 28, 2020
297fde4
Fix a formatting issues in the configuration related to ca_sha256 (#1…
ph Feb 28, 2020
fa289ce
[docs] Fix regexp example (#16694)
dedemorton Feb 28, 2020
31b9426
[libbeat] rename queue.Eventer -> queue.ACKListener (#16691)
faec Feb 28, 2020
0d9bd4f
Rerun mage fmt update for metricbeat (#16698)
Feb 29, 2020
eadcac8
Revert "Update haproxy.asciidoc (#16324)" (#16702)
Feb 29, 2020
755227d
[Libbeat] Use *logp.Logger in libbeat processors (#16654)
Mar 2, 2020
e935b26
Add "mechanism" in output.kafka to support SCRAM-SHA-512 and SCRAM-…
zvictorino Mar 2, 2020
ab84afc
Agent required changes for building the agent artifacts (#16624)
ph Mar 2, 2020
a25903b
Vendor Agent dependencies (#16616)
ph Mar 2, 2020
342f0e0
Improve ECS categorization field mappings in iis module (#16618)
leehinman Mar 2, 2020
07b03a7
Add cloudfoundry module to metricbeat (#16671)
blakerouse Mar 2, 2020
e7f9335
Improve ECS categorization field mapping in kafka module (#16645)
leehinman Mar 2, 2020
95626b8
Go modules (#15853)
kvch Mar 3, 2020
cdadced
Wait for emitted metrics (#16721)
mtojek Mar 3, 2020
d89675f
Add container azure metricset (#16421)
narph Mar 3, 2020
10ed037
Add documentation for tags_filter and tags (#16731)
Mar 3, 2020
8b54797
Fix imports for previous PR (#16756)
narph Mar 3, 2020
4076211
[Filebeat] Improve ECS categorization field mappings in kibana module…
leehinman Mar 3, 2020
f02943c
Merge branch 'master' into feature-new-registry-file
Mar 3, 2020
b147544
Update import paths to v7
Mar 3, 2020
bcbbfdd
Update vendor
Mar 3, 2020
8f205da
v2 interfaces
Feb 27, 2020
4cbc053
Add compatibility layer for v2
Feb 27, 2020
4b4f88d
Update go-concert
Feb 28, 2020
079c382
Add LoaderTable and ConfigsLoader
Feb 28, 2020
50147a1
add license headers
Feb 28, 2020
cac79a5
fix build
Feb 28, 2020
04cdeca
remove ChanCanceller. Functionality will be provided by go-concert
Feb 28, 2020
56232f4
make type field configurable
Feb 28, 2020
d10b75b
add v2.tnsninput
Feb 28, 2020
3945359
add ErrPluginWithoutName
Feb 28, 2020
780c801
add v2.RegistryTree
Feb 28, 2020
dc5b06a
update tnsninput with RegistryTree
Feb 28, 2020
e18c278
add package exclinput
Feb 28, 2020
9ede664
fix some merge errors
Mar 3, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
33 changes: 17 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,23 +148,24 @@ jobs:
stage: test

# Generators
- os: linux
env: TARGETS="-C generator/metricbeat test test-package"
go: $TRAVIS_GO_VERSION
stage: test
- os: linux
env: TARGETS="-C generator/beat test test-package"
go: $TRAVIS_GO_VERSION
stage: test
# Temporarily disable generator jobs
#- os: linux
# env: TARGETS="-C generator/_templates/metricbeat test test-package"
# go: $TRAVIS_GO_VERSION
# stage: test
#- os: linux
# env: TARGETS="-C generator/_templates/beat test test-package"
# go: $TRAVIS_GO_VERSION
# stage: test

- os: osx
env: TARGETS="-C generator/metricbeat test"
go: $TRAVIS_GO_VERSION
stage: test
- os: osx
env: TARGETS="-C generator/beat test"
go: $TRAVIS_GO_VERSION
stage: test
#- os: osx
# env: TARGETS="-C generator/_templates/metricbeat test"
# go: $TRAVIS_GO_VERSION
# stage: test
#- os: osx
# env: TARGETS="-C generator/_templates/beat test"
# go: $TRAVIS_GO_VERSION
# stage: test

# Kubernetes
- os: linux
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG-developer.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
- Move light modules to OSS. {pull}14369[14369]
- Deprecate test flags, `generate` and `update_expected`, in favor of `data`. {pull}15292[15292]
- Python 3 is required now to run python tests and tools. {pull}14798[14798]
- The type `memqueue.Broker` is no longer exported; instead of `memqueue.NewBroker`, call `memqueue.NewQueue` (which provides the same public interface). {pull}16667[16667]
- `queue.Eventer` has been renamed to `queue.ACKListener` {pull}16691[16691]

==== Bugfixes

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ processing events. (CVE-2019-17596) See https://www.elastic.co/community/securit
- Release cloudwatch, s3_daily_storage, s3_request, sqs and rds metricset as GA. {pull}14114[14114] {issue}14059[14059]
- Add `elasticsearch/enrich` metricset. {pull}14243[14243] {issue}14221[14221]
- Add new dashboards for Azure vms, vm guest metrics, vm scale sets {pull}14000[14000]
- Add vpc metricset for aws module. {pull}16111[16111] {issue}14854[14854]

*Functionbeat*

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Made `logstash-xpack` module once again have parity with internally-collected Logstash monitoring data. {pull}16198[16198]
- Change sqs metricset to use average as statistic method. {pull}16438[16438]
- Revert changes in `docker` module: add size flag to docker.container. {pull}16600[16600]
- Fix imports after PR was merged before rebase. {pull}16756[16756]

*Packetbeat*

Expand Down Expand Up @@ -149,8 +150,11 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Improve ECS field mappings in aws module. {issue}16154[16154] {pull}16307[16307]
- Improve ECS categorization field mappings in googlecloud module. {issue}16030[16030] {pull}16500[16500]
- Improve ECS field mappings in haproxy module. {issue}16162[16162] {pull}16529[16529]
- Improve ECS categorization field mappings in kibana module. {issue}16168[16168] {pull}16652[16652]
- Improve the decode_cef processor by reducing the number of memory allocations. {pull}16587[16587]
- Add `cloudfoundry` input to send events from Cloud Foundry. {pull}16586[16586]
- Improve ECS categorization field mappings in iis module. {issue}16165[16165] {pull}16618[16618]
- Improve ECS categorization field mapping in kafka module. {issue}16167[16167] {pull}16645[16645]

*Heartbeat*

Expand Down Expand Up @@ -189,10 +193,13 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add support for NATS 2.1. {pull}16317[16317]
- Add Load Balancing metricset to GCP {pull}15559[15559]
- Add support for Dropwizard metrics 4.1. {pull}16332[16332]
- Add azure container metricset in order to monitor containers. {issue}15751[15751] {pull}16421[16421]
- Improve the `haproxy` module to support metrics exposed via HTTPS. {issue}14579[14579] {pull}16333[16333]
- Add filtering option for prometheus collector. {pull}16420[16420]
- Add metricsets based on Ceph Manager Daemon to the `ceph` module. {issue}7723[7723] {pull}16254[16254]
- Release `statsd` module as GA. {pull}16447[16447] {issue}14280[14280]
- Add `cloudfoundry` module to send events from Cloud Foundry. {pull}16671[16671]
- Add `redisenterprise` module. {pull}16482[16482] {issue}15269[15269]

*Packetbeat*

Expand Down
92 changes: 53 additions & 39 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,19 @@ pipeline {
makeTarget("Auditbeat x-pack Linux", "-C x-pack/auditbeat testsuite")
}
}
stage('Auditbeat x-pack'){
agent { label 'ubuntu && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
expression {
return env.BUILD_AUDITBEAT_XPACK != "false"
}
}
steps {
makeTarget("Auditbeat x-pack Linux", "-C x-pack/auditbeat testsuite")
}
}
stage('Libbeat'){
agent { label 'ubuntu && immutable' }
options { skipDefaultCheckout() }
Expand Down Expand Up @@ -459,44 +472,45 @@ pipeline {
}
}
}
stage('Generators'){
agent { label 'ubuntu && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
expression {
return env.BUILD_GENERATOR != "false"
}
}
stages {
stage('Generators Metricbeat Linux'){
steps {
makeTarget("Generators Metricbeat Linux", "-C generator/metricbeat test")
makeTarget("Generators Metricbeat Linux", "-C generator/metricbeat test-package")
}
}
stage('Generators Beat Linux'){
steps {
makeTarget("Generators Beat Linux", "-C generator/beat test")
makeTarget("Generators Beat Linux", "-C generator/beat test-package")
}
}
stage('Generators Metricbeat Mac OS X'){
agent { label 'macosx' }
options { skipDefaultCheckout() }
steps {
makeTarget("Generators Metricbeat Mac OS X", "-C generator/metricbeat test")
}
}
stage('Generators Beat Mac OS X'){
agent { label 'macosx' }
options { skipDefaultCheckout() }
steps {
makeTarget("Generators Beat Mac OS X", "-C generator/beat test")
}
}
}
}
// Temporarily disable generator jobs
//stage('Generators'){
// agent { label 'ubuntu && immutable' }
// options { skipDefaultCheckout() }
// when {
// beforeAgent true
// expression {
// return env.BUILD_GENERATOR != "false"
// }
// }
// stages {
// stage('Generators Metricbeat Linux'){
// steps {
// makeTarget("Generators Metricbeat Linux", "-C generator/_templates/metricbeat test")
// makeTarget("Generators Metricbeat Linux", "-C generator/_templates/metricbeat test-package")
// }
// }
// stage('Generators Beat Linux'){
// steps {
// makeTarget("Generators Beat Linux", "-C generator/_templates/beat test")
// makeTarget("Generators Beat Linux", "-C generator/_templates/beat test-package")
// }
// }
// stage('Generators Metricbeat Mac OS X'){
// agent { label 'macosx' }
// options { skipDefaultCheckout() }
// steps {
// makeTarget("Generators Metricbeat Mac OS X", "-C generator/_templates/metricbeat test")
// }
// }
// stage('Generators Beat Mac OS X'){
// agent { label 'macosx' }
// options { skipDefaultCheckout() }
// steps {
// makeTarget("Generators Beat Mac OS X", "-C generator/_templates/beat test")
// }
// }
// }
//}
stage('Kubernetes'){
agent { label 'ubuntu && immutable' }
options { skipDefaultCheckout() }
Expand Down Expand Up @@ -672,7 +686,7 @@ def loadConfigEnvVars(){
"^x-pack/functionbeat/.*",
"^x-pack/libbeat/.*",
])
env.BUILD_GENERATOR = isChanged(["^generator/.*"])
//env.BUILD_GENERATOR = isChanged(["^generator/.*"])
env.BUILD_HEARTBEAT = isChanged(["^heartbeat/.*"])
env.BUILD_HEARTBEAT_XPACK = isChanged([
"^heartbeat/.*",
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ clean: mage
@$(MAKE) -C generator clean
@-mage -clean

# Cleans up the vendor directory from unnecessary files
# This should always be run after updating the dependencies
.PHONY: clean-vendor
clean-vendor:
@sh script/clean_vendor.sh

.PHONY: check
check: python-env
@$(foreach var,$(PROJECTS) dev-tools $(PROJECTS_XPACK_MAGE),$(MAKE) -C $(var) check || exit 1;)
Expand All @@ -95,6 +89,7 @@ check: python-env
@# Validate that all updates were committed
@$(MAKE) update
@$(MAKE) check-headers
go mod tidy
@git diff | cat
@git update-index --refresh
@git diff-index --exit-code HEAD --
Expand Down
Loading