-
Notifications
You must be signed in to change notification settings - Fork 4
[FLINK-33139] Add Prometheus Sink Table API #22
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
Open
darenwkt
wants to merge
1
commit into
apache:main
Choose a base branch
from
darenwkt:FLINK-33139
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
################################################################################ | ||
# Licensed to the Apache Software Foundation (ASF) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The ASF licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
################################################################################ | ||
|
||
version: 1.1-SNAPSHOT | ||
variants: | ||
- maven: flink-connector-prometheus | ||
- maven: flink-connector-prometheus-request-signer-amp |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
...flink/connector/prometheus/sink/aws/AmazonManagedPrometheusWriteRequestSignerFactory.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.flink.connector.prometheus.sink.aws; | ||
|
||
import org.apache.flink.connector.aws.util.AWSGeneralUtil; | ||
import org.apache.flink.connector.prometheus.sink.PrometheusRequestSigner; | ||
import org.apache.flink.connector.prometheus.table.PrometheusConfig; | ||
import org.apache.flink.connector.prometheus.table.PrometheusDynamicRequestSignerFactory; | ||
|
||
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; | ||
|
||
import java.util.Properties; | ||
|
||
public class AmazonManagedPrometheusWriteRequestSignerFactory | ||
implements PrometheusDynamicRequestSignerFactory { | ||
public AmazonManagedPrometheusWriteRequestSignerFactory() {} | ||
|
||
@Override | ||
public String requestSignerIdentifer() { | ||
return "amazon-managed-prometheus"; | ||
} | ||
|
||
@Override | ||
public PrometheusRequestSigner getRequestSigner(PrometheusConfig config) { | ||
Properties properties = config.toProperties(); | ||
AWSGeneralUtil.validateAwsConfiguration(properties); | ||
|
||
final AwsCredentialsProvider credentialsProvider = | ||
AWSGeneralUtil.getCredentialsProvider(properties); | ||
final String awsRegion = AWSGeneralUtil.getRegion(properties).toString(); | ||
final String remoteWriteUrl = config.getRemoteWriteEndpointUrl(); | ||
|
||
return new AmazonManagedPrometheusWriteRequestSigner( | ||
remoteWriteUrl, awsRegion, credentialsProvider); | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
...ervices/org.apache.flink.connector.prometheus.table.PrometheusDynamicRequestSignerFactory
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. | ||
# The ASF licenses this file to You under the Apache License, Version 2.0 | ||
# (the "License"); you may not use this file except in compliance with | ||
# the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
org.apache.flink.connector.prometheus.sink.aws.AmazonManagedPrometheusWriteRequestSignerFactory |
68 changes: 68 additions & 0 deletions
68
...k/connector/prometheus/sink/aws/AmazonManagedPrometheusWriteRequestSignerFactoryTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
package org.apache.flink.connector.prometheus.sink.aws; | ||
|
||
import org.apache.flink.configuration.Configuration; | ||
import org.apache.flink.connector.prometheus.sink.PrometheusRequestSigner; | ||
import org.apache.flink.connector.prometheus.table.PrometheusConfig; | ||
|
||
import org.junit.jupiter.api.BeforeEach; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import static org.apache.flink.connector.aws.config.AWSConfigConstants.AWS_REGION; | ||
import static org.apache.flink.connector.prometheus.table.PrometheusConnectorOption.METRIC_REMOTE_WRITE_URL; | ||
import static org.junit.jupiter.api.Assertions.assertEquals; | ||
import static org.junit.jupiter.api.Assertions.assertInstanceOf; | ||
import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
||
class AmazonManagedPrometheusWriteRequestSignerFactoryTest { | ||
private AmazonManagedPrometheusWriteRequestSignerFactory factory; | ||
|
||
@BeforeEach | ||
public void setup() { | ||
factory = new AmazonManagedPrometheusWriteRequestSignerFactory(); | ||
} | ||
|
||
@Test | ||
void testIdentifier() { | ||
assertEquals(factory.requestSignerIdentifer(), "amazon-managed-prometheus"); | ||
} | ||
|
||
@Test | ||
darenwkt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
void testCreateRequestSigner() { | ||
final String endpoint = | ||
"https://aps-workspaces.us-east-1.amazonaws.com/workspaces/abc/api/v1/remote_write"; | ||
final String region = "us-east-1"; | ||
Configuration config = new Configuration(); | ||
config.set(METRIC_REMOTE_WRITE_URL, endpoint); | ||
config.setString(AWS_REGION, region); | ||
|
||
PrometheusRequestSigner requestSigner = | ||
factory.getRequestSigner(new PrometheusConfig(config)); | ||
|
||
assertInstanceOf(AmazonManagedPrometheusWriteRequestSigner.class, requestSigner); | ||
} | ||
|
||
@Test | ||
void testCreateRequestSignerFailsWithInvalidRegion() { | ||
final String endpoint = | ||
"https://aps-workspaces.us-east-1.amazonaws.com/workspaces/abc/api/v1/remote_write"; | ||
final String region = "invalid-region"; | ||
Configuration config = new Configuration(); | ||
config.set(METRIC_REMOTE_WRITE_URL, endpoint); | ||
config.setString(AWS_REGION, region); | ||
|
||
assertThrows( | ||
IllegalArgumentException.class, | ||
() -> factory.getRequestSigner(new PrometheusConfig(config))); | ||
} | ||
|
||
@Test | ||
void testCreateRequestSignerFailsWithInvalidURL() { | ||
Configuration config = new Configuration(); | ||
config.set(METRIC_REMOTE_WRITE_URL, "invalid-endpoint"); | ||
config.setString(AWS_REGION, "us-east-1"); | ||
|
||
assertThrows( | ||
IllegalArgumentException.class, | ||
() -> factory.getRequestSigner(new PrometheusConfig(config))); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd be interested to see how this is used to set up the request signer declaratively in SQL
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Request signer is now a plugin (through Java Service Provider Interface (SPI)), and can be specified by user in the table config (
metric.request-signer
), for example:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please explain "
'sink.batch.max-size' = '2',
'sink.flush-buffer.size' = '1'
have idea what the intend is, just want to confirm...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @georgelza,
'sink.batch.max-size' determines the max size of batch records before flushing it to sink. I would recommend checking the asyncSink FLIP for more details on how it works https://cwiki.apache.org/confluence/display/FLINK/FLIP-171%3A+Async+Sink
Another helpful resource is to check other similar connector and how these config are used https://nightlies.apache.org/flink/flink-docs-master/docs/connectors/table/kinesis/#sink-batch-max-size
When this PR is merged and released, we should have equivalent docs on what each of these config mean as well