You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/09/13 13:39:54 UTC
[camel-kamelets] branch main updated (379bc78 -> 4ff03ac)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git.
from 379bc78 Sync kamelets in Java library
new 9eceb57 AWS S3 Streaming Upload Kamelet: Support also StreamingUploadTimeout parameter
new 9289735 AWS S3 Streaming Upload Kamelet: Support also StreamingUploadTimeout parameter
new fe83945 Regen all
new c43a6fd AWS S3 Streaming Upload Kamelet: Support also StreamingUploadTimeout parameter
new 4ff03ac AWS S3 Streaming Upload Kamelet: Support also StreamingUploadTimeout parameter
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
aws-s3-streaming-upload-sink.kamelet.yaml | 5 +++++
.../ROOT/pages/aws-s3-streaming-upload-sink.adoc | 1 +
.../ROOT/pages/has-header-filter-action.adoc | 1 +
.../ROOT/pages/kafka-not-secured-source.adoc | 1 +
docs/modules/ROOT/pages/kafka-source.adoc | 1 +
docs/modules/ROOT/pages/rabbitmq-source.adoc | 21 +++++++++------------
docs/modules/ROOT/pages/telegram-source.adoc | 4 ++++
.../aws-s3-streaming-upload-sink.kamelet.yaml | 5 +++++
.../bindings/camel-k/rabbitmq-source-binding.yaml | 4 +---
.../bindings/core/rabbitmq-source-binding.yaml | 4 +---
10 files changed, 29 insertions(+), 18 deletions(-)
[camel-kamelets] 05/05: AWS S3 Streaming Upload Kamelet: Support
also StreamingUploadTimeout parameter
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 4ff03ac897bcb2886ec4890136973b315fb84045
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 13 15:38:31 2021 +0200
AWS S3 Streaming Upload Kamelet: Support also StreamingUploadTimeout parameter
---
.../main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
index 2d25ef8..0f57d52 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
@@ -108,5 +108,5 @@ spec:
batchSize: "{{batchSize}}"
namingStrategy: "{{namingStrategy}}"
keyName: "{{keyName}}"
- streamingUploadMode: "{{?streamingUploadTimeout}}"
+ streamingUploadTimeout: "{{?streamingUploadTimeout}}"
[camel-kamelets] 01/05: AWS S3 Streaming Upload Kamelet: Support
also StreamingUploadTimeout parameter
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 9eceb573293d4beac49b8b1e6687d3351b58455b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 13 15:36:00 2021 +0200
AWS S3 Streaming Upload Kamelet: Support also StreamingUploadTimeout parameter
---
aws-s3-streaming-upload-sink.kamelet.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/aws-s3-streaming-upload-sink.kamelet.yaml b/aws-s3-streaming-upload-sink.kamelet.yaml
index e806b74..2d25ef8 100644
--- a/aws-s3-streaming-upload-sink.kamelet.yaml
+++ b/aws-s3-streaming-upload-sink.kamelet.yaml
@@ -75,6 +75,10 @@ spec:
description: The batch size (in bytes) in streaming upload mode
type: int
default: '1000000'
+ streamingUploadTimeout:
+ title: Streaming Upload Timeout
+ description: While streaming upload mode is true, this option set the timeout to complete upload
+ type: long
namingStrategy:
title: Naming Strategy
description: The naming strategy to use in streaming upload mode. There are 2 enums and the value can be one of progressive, random
@@ -104,4 +108,5 @@ spec:
batchSize: "{{batchSize}}"
namingStrategy: "{{namingStrategy}}"
keyName: "{{keyName}}"
+ streamingUploadMode: "{{?streamingUploadTimeout}}"
[camel-kamelets] 04/05: AWS S3 Streaming Upload Kamelet: Support
also StreamingUploadTimeout parameter
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit c43a6fd9f68a6d26340193d9154776338015d9b7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 13 15:37:51 2021 +0200
AWS S3 Streaming Upload Kamelet: Support also StreamingUploadTimeout parameter
---
aws-s3-streaming-upload-sink.kamelet.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/aws-s3-streaming-upload-sink.kamelet.yaml b/aws-s3-streaming-upload-sink.kamelet.yaml
index 2d25ef8..0f57d52 100644
--- a/aws-s3-streaming-upload-sink.kamelet.yaml
+++ b/aws-s3-streaming-upload-sink.kamelet.yaml
@@ -108,5 +108,5 @@ spec:
batchSize: "{{batchSize}}"
namingStrategy: "{{namingStrategy}}"
keyName: "{{keyName}}"
- streamingUploadMode: "{{?streamingUploadTimeout}}"
+ streamingUploadTimeout: "{{?streamingUploadTimeout}}"
[camel-kamelets] 03/05: Regen all
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit fe83945eae4b5bd6373b900e79ca78c063d82fb3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 13 15:36:59 2021 +0200
Regen all
---
.../ROOT/pages/aws-s3-streaming-upload-sink.adoc | 1 +
.../ROOT/pages/has-header-filter-action.adoc | 1 +
.../ROOT/pages/kafka-not-secured-source.adoc | 1 +
docs/modules/ROOT/pages/kafka-source.adoc | 1 +
docs/modules/ROOT/pages/rabbitmq-source.adoc | 21 +++++++++------------
docs/modules/ROOT/pages/telegram-source.adoc | 4 ++++
.../bindings/camel-k/rabbitmq-source-binding.yaml | 4 +---
.../bindings/core/rabbitmq-source-binding.yaml | 4 +---
8 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/docs/modules/ROOT/pages/aws-s3-streaming-upload-sink.adoc b/docs/modules/ROOT/pages/aws-s3-streaming-upload-sink.adoc
index 319a9cf..f316a77 100644
--- a/docs/modules/ROOT/pages/aws-s3-streaming-upload-sink.adoc
+++ b/docs/modules/ROOT/pages/aws-s3-streaming-upload-sink.adoc
@@ -24,6 +24,7 @@ The following table summarizes the configuration options available for the `aws-
| namingStrategy| Naming Strategy| The naming strategy to use in streaming upload mode. There are 2 enums and the value can be one of progressive, random| string| `"progressive"`|
| restartingPolicy| Restarting Policy| The restarting policy to use in streaming upload mode. There are 2 enums and the value can be one of override, lastPart| string| `"lastPart"`|
| streamingUploadMode| Streaming Upload Mode| Setting the Streaming Upload Mode| boolean| `true`|
+| streamingUploadTimeout| Streaming Upload Timeout| While streaming upload mode is true, this option set the timeout to complete upload| long| |
|===
NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/has-header-filter-action.adoc b/docs/modules/ROOT/pages/has-header-filter-action.adoc
index 7cf1775..f1d2349 100644
--- a/docs/modules/ROOT/pages/has-header-filter-action.adoc
+++ b/docs/modules/ROOT/pages/has-header-filter-action.adoc
@@ -14,6 +14,7 @@ The following table summarizes the configuration options available for the `has-
|===
| Property| Name| Description| Type| Default| Example
| *name {empty}* *| Header Name| The header name to evaluate| string| | `"headerName"`
+| value| Header Value| An optional header value to compare the header to| string| | `"headerValue"`
|===
NOTE: Fields marked with ({empty}*) are mandatory.
diff --git a/docs/modules/ROOT/pages/kafka-not-secured-source.adoc b/docs/modules/ROOT/pages/kafka-not-secured-source.adoc
index c782de8..c03ed66 100644
--- a/docs/modules/ROOT/pages/kafka-not-secured-source.adoc
+++ b/docs/modules/ROOT/pages/kafka-not-secured-source.adoc
@@ -18,6 +18,7 @@ The following table summarizes the configuration options available for the `kafk
| allowManualCommit| Allow Manual Commit| Whether to allow doing manual commits| boolean| `false`|
| autoCommitEnable| Auto Commit Enable| If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer| boolean| `true`|
| autoOffsetReset| Auto Offset Reset| What to do when there is no initial offset. There are 3 enums and the value can be one of latest, earliest, none| string| `"latest"`|
+| consumerGroup| Consumer Group| A string that uniquely identifies the group of consumers to which this source belongs| string| | `"my-group-id"`
| pollOnError| Poll On Error Behavior| What to do if kafka threw an exception while polling for new messages. There are 5 enums and the value can be one of DISCARD, ERROR_HANDLER, RECONNECT, RETRY, STOP| string| `"ERROR_HANDLER"`|
|===
diff --git a/docs/modules/ROOT/pages/kafka-source.adoc b/docs/modules/ROOT/pages/kafka-source.adoc
index d58652a..e1b8567 100644
--- a/docs/modules/ROOT/pages/kafka-source.adoc
+++ b/docs/modules/ROOT/pages/kafka-source.adoc
@@ -20,6 +20,7 @@ The following table summarizes the configuration options available for the `kafk
| allowManualCommit| Allow Manual Commit| Whether to allow doing manual commits| boolean| `false`|
| autoCommitEnable| Auto Commit Enable| If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer| boolean| `true`|
| autoOffsetReset| Auto Offset Reset| What to do when there is no initial offset. There are 3 enums and the value can be one of latest, earliest, none| string| `"latest"`|
+| consumerGroup| Consumer Group| A string that uniquely identifies the group of consumers to which this source belongs| string| | `"my-group-id"`
| pollOnError| Poll On Error Behavior| What to do if kafka threw an exception while polling for new messages. There are 5 enums and the value can be one of DISCARD, ERROR_HANDLER, RECONNECT, RETRY, STOP| string| `"ERROR_HANDLER"`|
| saslMechanism| SASL Mechanism| The Simple Authentication and Security Layer (SASL) Mechanism used.| string| `"PLAIN"`|
| securityProtocol| Security Protocol| Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT, SASL_SSL and SSL are supported| string| `"SASL_SSL"`|
diff --git a/docs/modules/ROOT/pages/rabbitmq-source.adoc b/docs/modules/ROOT/pages/rabbitmq-source.adoc
index 996a1c7..1eabb7b 100644
--- a/docs/modules/ROOT/pages/rabbitmq-source.adoc
+++ b/docs/modules/ROOT/pages/rabbitmq-source.adoc
@@ -13,11 +13,12 @@ The following table summarizes the configuration options available for the `rabb
[width="100%",cols="2,^2,3,^2,^2,^3",options="header"]
|===
| Property| Name| Description| Type| Default| Example
-| *addresses {empty}* *| Addresses| Comma separated list of RabbitMQ broker addresses| string| |
+| *addresses {empty}* *| Addresses| Comma separated list of RabbitMQ broker addresses| string| | `"localhost:5672"`
| *exchangeName {empty}* *| Exchange name| The exchange name determines the exchange the queue will be bound to| string| |
-| *password {empty}* *| Password| The password to access the RabbitMQ server| string| |
-| *username {empty}* *| Username| The username to access the RabbitMQ server| string| |
-| portNumber| Port Number| Port of the RabbitMQ server| string| `5672`|
+| password| Password| The password to access the RabbitMQ server| string| |
+| queue| Queue name| The queue to receive messages from| string| |
+| routingKey| Routing Key| The routing key to use when binding a consumer queue to the exchange| string| |
+| username| Username| The username to access the RabbitMQ server| string| |
|===
NOTE: Fields marked with ({empty}*) are mandatory.
@@ -44,10 +45,8 @@ spec:
apiVersion: camel.apache.org/v1alpha1
name: rabbitmq-source
properties:
- addresses: "The Addresses"
+ addresses: "localhost:5672"
exchangeName: "The Exchange name"
- password: "The Password"
- username: "The Username"
sink:
ref:
kind: InMemoryChannel
@@ -72,7 +71,7 @@ The procedure described above can be simplified into a single execution of the `
[source,shell]
----
-kamel bind rabbitmq-source -p "source.addresses=The Addresses" -p "source.exchangeName=The Exchange name" -p "source.password=The Password" -p "source.username=The Username" channel/mychannel
+kamel bind rabbitmq-source -p "source.addresses=localhost:5672" -p "source.exchangeName=The Exchange name" channel/mychannel
----
This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
@@ -95,10 +94,8 @@ spec:
apiVersion: camel.apache.org/v1alpha1
name: rabbitmq-source
properties:
- addresses: "The Addresses"
+ addresses: "localhost:5672"
exchangeName: "The Exchange name"
- password: "The Password"
- username: "The Username"
sink:
ref:
kind: KafkaTopic
@@ -125,7 +122,7 @@ The procedure described above can be simplified into a single execution of the `
[source,shell]
----
-kamel bind rabbitmq-source -p "source.addresses=The Addresses" -p "source.exchangeName=The Exchange name" -p "source.password=The Password" -p "source.username=The Username" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+kamel bind rabbitmq-source -p "source.addresses=localhost:5672" -p "source.exchangeName=The Exchange name" kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
----
This will create the KameletBinding under the hood and apply it to the current namespace in the cluster.
diff --git a/docs/modules/ROOT/pages/telegram-source.adoc b/docs/modules/ROOT/pages/telegram-source.adoc
index 5283d47..bfefbce 100644
--- a/docs/modules/ROOT/pages/telegram-source.adoc
+++ b/docs/modules/ROOT/pages/telegram-source.adoc
@@ -9,6 +9,10 @@ Receive all messages that people send to your Telegram bot.
To create a bot, contact the @botfather account using the Telegram app.
+The source attaches the following headers to the messages:
+
+- `chat-id` / `ce-chat-id`: the ID of the chat where the message comes from
+
== Configuration Options
The following table summarizes the configuration options available for the `telegram-source` Kamelet:
diff --git a/templates/bindings/camel-k/rabbitmq-source-binding.yaml b/templates/bindings/camel-k/rabbitmq-source-binding.yaml
index dd39500..87c2ac2 100644
--- a/templates/bindings/camel-k/rabbitmq-source-binding.yaml
+++ b/templates/bindings/camel-k/rabbitmq-source-binding.yaml
@@ -9,10 +9,8 @@ spec:
apiVersion: camel.apache.org/v1alpha1
name: rabbitmq-source
properties:
- addresses: "The Addresses"
+ addresses: "localhost:5672"
exchangeName: "The Exchange name"
- password: "The Password"
- username: "The Username"
sink:
ref:
kind: KafkaTopic
diff --git a/templates/bindings/core/rabbitmq-source-binding.yaml b/templates/bindings/core/rabbitmq-source-binding.yaml
index 180e242..a01d58e 100644
--- a/templates/bindings/core/rabbitmq-source-binding.yaml
+++ b/templates/bindings/core/rabbitmq-source-binding.yaml
@@ -2,10 +2,8 @@
from:
uri: "kamelet:rabbitmq-source"
parameters:
- addresses: "The Addresses"
+ addresses: "localhost:5672"
exchangeName: "The Exchange name"
- password: "The Password"
- username: "The Username"
steps:
- to:
uri: "log:info"
[camel-kamelets] 02/05: AWS S3 Streaming Upload Kamelet: Support
also StreamingUploadTimeout parameter
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 9289735b102f004ce81cbdde798a93e36de4b26d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 13 15:36:43 2021 +0200
AWS S3 Streaming Upload Kamelet: Support also StreamingUploadTimeout parameter
---
.../resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
index e806b74..2d25ef8 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml
@@ -75,6 +75,10 @@ spec:
description: The batch size (in bytes) in streaming upload mode
type: int
default: '1000000'
+ streamingUploadTimeout:
+ title: Streaming Upload Timeout
+ description: While streaming upload mode is true, this option set the timeout to complete upload
+ type: long
namingStrategy:
title: Naming Strategy
description: The naming strategy to use in streaming upload mode. There are 2 enums and the value can be one of progressive, random
@@ -104,4 +108,5 @@ spec:
batchSize: "{{batchSize}}"
namingStrategy: "{{namingStrategy}}"
keyName: "{{keyName}}"
+ streamingUploadMode: "{{?streamingUploadTimeout}}"