Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add google-pubsub input type to Filebeat #12746

Merged
merged 4 commits into from
Jul 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Update Kubernetes deployment manifest to use `container` input. {pull}12632[12632]
- Use correct OS path separator in `add_kubernetes_metadata` to support Windows nodes. {pull}9205[9205]
- Add support for client addresses with port in Apache error logs {pull}12695[12695]
- Add `google-pubsub` input type for consuming messages from a Google Cloud Pub/Sub topic subscription. {pull}12746[12746]
- Add module for ingesting Cisco IOS logs over syslog. {pull}12748[12748]

*Heartbeat*
Expand Down
555 changes: 550 additions & 5 deletions NOTICE.txt

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions dev-tools/generate_notice.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,15 @@ def has_license(folder):

There are two cases accepted:
* The folder contains a LICENSE
* The parent folder contains a LICENSE
* The folder only contains subdirectories AND all these
subdirectories contain a LICENSE
"""

if len(get_licenses(folder)) > 0:
return True, ""
elif len(get_licenses(os.path.join(folder, os.pardir))) > 0: # For go.opencensus.io.
return True, ""

for subdir in os.listdir(folder):
if not os.path.isdir(os.path.join(folder, subdir)):
Expand Down
3 changes: 3 additions & 0 deletions dev-tools/mage/integtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ func runInIntegTestEnv(mageTarget string, test func() error, passThroughEnvVars
// Disable strict.perms because we moust host dirs inside containers
// and the UID/GID won't meet the strict requirements.
"-e", "BEAT_STRICT_PERMS=false",
// compose.EnsureUp needs to know the environment type.
"-e", "STACK_ENVIRONMENT=" + StackEnvironment,
"-e", "TESTING_ENVIRONMENT=" + StackEnvironment,
}
args, err = addUidGidEnvArgs(args)
if err != nil {
Expand Down
4 changes: 3 additions & 1 deletion filebeat/docs/filebeat-options.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ You can configure {beatname_uc} to use the following inputs:
* <<{beatname_lc}-input-tcp>>
* <<{beatname_lc}-input-syslog>>
* <<{beatname_lc}-input-netflow>>

* <<{beatname_lc}-input-google-pubsub>>


include::inputs/input-log.asciidoc[]
Expand All @@ -71,3 +71,5 @@ include::inputs/input-tcp.asciidoc[]
include::inputs/input-syslog.asciidoc[]

include::../../x-pack/filebeat/docs/inputs/input-netflow.asciidoc[]

include::../../x-pack/filebeat/docs/inputs/input-google-pubsub.asciidoc[]
2 changes: 1 addition & 1 deletion libbeat/tests/compose/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func EnsureUpWithTimeout(t *testing.T, timeout int, services ...string) {
for _, service := range services {
err = compose.Start(service)
if err != nil {
t.Fatal(err)
t.Fatal("failed to start service", service, err)
}
}

Expand Down
Loading