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

Remove experimental flags and mark most of the AWS provider trigger stable. #10564

Merged
merged 2 commits into from
Feb 5, 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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Functionbeat*

- Mark Functionbeat as GA. {pull}10564[10564]

- Correctly normalize Cloudformation resource name. {issue}10087[10087]
- Functionbeat can now deploy a function for Kinesis. {10116}10116[10116]
- Allow functionbeat to use the keystore. {issue}9009[9009]
Expand Down
4 changes: 3 additions & 1 deletion x-pack/functionbeat/docs/overview.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
deploy on your serverless environment to collect events generated by cloud
services and ship the events to {es}.

The beta version supports deploying {beatname_uc} as an AWS Lambda service and
This version supports deploying {beatname_uc} as an AWS Lambda service and
responds to the triggers defined for the following event sources:

* https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/WhatIsCloudWatchLogs.html[CloudWatch Logs]
* https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/welcome.html[Amazon Simple Queue Service (SQS)]
* https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/welcome.html[Amazon Simple Queue Service (SQS)]
* https://docs.aws.amazon.com/kinesis/latest/APIReference/Welcome.html[Kinesis]

include::{libbeat-dir}/docs/shared-libbeat-description.asciidoc[]

4 changes: 0 additions & 4 deletions x-pack/functionbeat/docs/page_header.html

This file was deleted.

2 changes: 2 additions & 0 deletions x-pack/functionbeat/provider/aws/api_gateway_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/aws/aws-lambda-go/lambda"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/x-pack/functionbeat/core"
"github.com/elastic/beats/x-pack/functionbeat/provider"
Expand All @@ -32,6 +33,7 @@ type APIGatewayProxy struct {

// NewAPIGatewayProxy creates a new function to receives events from the web api gateway.
func NewAPIGatewayProxy(provider provider.Provider, config *common.Config) (provider.Function, error) {
cfgwarn.Experimental("The api_gateway_proxy trigger is experimental.")
return &APIGatewayProxy{log: logp.NewLogger("api gateway proxy")}, nil
}

Expand Down
8 changes: 4 additions & 4 deletions x-pack/functionbeat/provider/aws/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (
var Bundle = provider.MustCreate(
"aws",
provider.NewDefaultProvider("aws", NewCLI),
feature.NewDetails("AWS Lambda", "listen to events on AWS lambda", feature.Experimental),
feature.NewDetails("AWS Lambda", "listen to events on AWS lambda", feature.Stable),
).MustAddFunction("cloudwatch_logs",
NewCloudwatchLogs,
feature.NewDetails(
"Cloudwatch Logs trigger",
"receive events from cloudwatch logs.",
feature.Experimental,
feature.Stable,
),
).MustAddFunction("api_gateway_proxy",
NewAPIGatewayProxy,
Expand All @@ -33,13 +33,13 @@ var Bundle = provider.MustCreate(
feature.NewDetails(
"Kinesis trigger",
"receive events from a Kinesis stream",
feature.Experimental,
feature.Stable,
),
).MustAddFunction("sqs",
NewSQS,
feature.NewDetails(
"SQS trigger",
"receive events from a SQS queue",
feature.Experimental,
feature.Stable,
),
).Bundle()