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.

Sign up for GitHub

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

Jump to bottom

Cherry-pick #22156 to 7.10: Fix Google Cloud Function configuration file issues #22158

Merged
merged 1 commit into from
Oct 26, 2020
Merged

Cherry-pick #22156 to 7.10: Fix Google Cloud Function configuration file issues #22158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ field. You can revert this change by configuring tags for the module and omittin
- Do not need Google credentials if not required for the operation. {issue}17329[17329] {pull}21072[21072]
- Fix dependency issues of GCP functions. {issue}20830[20830] {pull}21070[21070]
- Fix catchall bucket config errors by adding more validation. {issue}17572[16282] {pull}20887[16287]
- Fix Google Cloud Function configuration issue. {issue}20864[20864] {pull}22156[22156]

==== Added

Expand Down
4 changes: 4 additions & 0 deletions libbeat/cfgfile/cfgfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,10 @@ func LoadList(file string) ([]*common.Config, error) {
return c, nil
}

func SetConfigPath(path string) {
*configPath = path
}

// GetPathConfig returns ${path.config}. If ${path.config} is not set, ${path.home} is returned.
func GetPathConfig() string {
if *configPath != "" {
Expand Down
1 change: 1 addition & 0 deletions x-pack/functionbeat/provider/gcp/pubsub/pubsub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ func RunPubSub(ctx context.Context, m gpubsub.Message) error {
ConfigOverrides: config.FunctionOverrides,
}

cfgfile.SetConfigPath("/srv/src/pubsub")
cfgfile.ChangeDefaultCfgfileFlag(settings.Name)

return instance.Run(settings, initFunctionbeat(ctx, m))
Expand Down
1 change: 1 addition & 0 deletions x-pack/functionbeat/provider/gcp/storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func RunCloudStorage(ctx context.Context, e gcp.StorageEvent) error {
ConfigOverrides: config.FunctionOverrides,
}

cfgfile.SetConfigPath("/srv/src/storage")
cfgfile.ChangeDefaultCfgfileFlag(settings.Name)

return instance.Run(settings, initFunctionbeat(ctx, e))
Expand Down
3 changes: 3 additions & 0 deletions x-pack/functionbeat/scripts/mage/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ func (Update) VendorBeats() error {
Exclude: []string{
".*_test.go$",
".*.yml",
// XXX GCP function metadata lib must be removed to avoid build failures
// GH issue: https://github.com/googleapis/google-cloud-go/issues/1947
".*cloud.google.com/go.*/functions/metadata.*",
},
}
err = cp.Execute()
Expand Down