Skip to content

Commit e42dee4

Browse files
authored
Merge branch 'main' into dapr-state-store-clickhouse
2 parents b5c9503 + 685ab52 commit e42dee4

File tree

12 files changed

+71
-38
lines changed

12 files changed

+71
-38
lines changed

.github/infrastructure/docker-compose-coherence.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
environment:
55
- coherence.management.http=all
66
- coherence.management.http.port=30000
7-
- Dcoherence.health.http.port=6676
7+
- coherence.health.http.port=6676
88
- coherence.wka=127.0.0.1
99
ports:
1010
- 30000:30000

bindings/zeebe/command/metadata.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ metadata:
4646
type: string
4747
- name: gatewayKeepAlive
4848
required: false
49-
description: Sets how often keep alive messages should be sent to the gateway. Defaults to 45 seconds
49+
description: Sets how often keep alive messages should be sent to the gateway.
5050
example: "45s"
5151
type: duration
52+
default: "45s"
5253
- name: usePlainTextConnection
5354
required: false
5455
description: Whether to use a plain text connection or not

bindings/zeebe/jobworker/metadata.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ metadata:
2020
type: string
2121
- name: gatewayKeepAlive
2222
required: false
23-
description: Sets how often keep alive messages should be sent to the gateway. Defaults to 45 seconds
23+
description: Sets how often keep alive messages should be sent to the gateway.
2424
example: "45s"
2525
type: duration
26+
default: "45s"
2627
- name: usePlainTextConnection
2728
required: false
2829
description: Whether to use a plain text connection or not
@@ -40,39 +41,44 @@ metadata:
4041
type: string
4142
- name: workerTimeout
4243
required: false
43-
description: A job returned after this call will not be activated by another call until the timeout has been reached; defaults to 5 minutes
44+
description: A job returned after this call will not be activated by another call until the timeout has been reached.
4445
example: "5m"
4546
type: duration
4647
- name: requestTimeout
4748
required: false
4849
description: The request will be completed when at least one job is activated or after the requestTimeout. If the requestTimeout = 0, a default timeout is used. If the requestTimeout < 0, long polling is disabled and the request is completed immediately, even when no job is activated. Defaults to 10 seconds
4950
example: "30s"
5051
type: duration
52+
default: "10s"
5153
- name: jobType
5254
required: true
5355
description: the job type, as defined in the BPMN process (e.g. <zeebe:taskDefinition type=\"fetch-products\" />)
5456
example: "fetch-products"
5557
type: string
5658
- name: maxJobsActive
5759
required: false
58-
description: Set the maximum number of jobs which will be activated for this worker at the same time. Defaults to 32
60+
description: Set the maximum number of jobs which will be activated for this worker at the same time.
5961
example: "32"
6062
type: number
63+
default: "32"
6164
- name: concurrency
6265
required: false
63-
description: The maximum number of concurrent spawned goroutines to complete jobs. Defaults to 4
66+
description: The maximum number of concurrent spawned goroutines to complete jobs.
6467
example: "4"
68+
default: "4"
6569
type: number
6670
- name: pollInterval
6771
required: false
68-
description: Set the maximal interval between polling for new jobs. Defaults to 100 milliseconds
72+
description: Set the maximal interval between polling for new jobs.
6973
example: "100ms"
7074
type: duration
75+
default: "100ms"
7176
- name: pollThreshold
7277
required: false
73-
description: Set the threshold of buffered activated jobs before polling for new jobs, i.e. threshold * maxJobsActive. Defaults to 0.3
78+
description: Set the threshold of buffered activated jobs before polling for new jobs, i.e. threshold * maxJobsActive.
7479
example: "0.3"
7580
type: number
81+
default: "0.3"
7682
- name: fetchVariables
7783
required: false
7884
description: A list of variables to fetch as the job variables; if empty, all visible variables at the time of activation for the scope of the job will be returned

conversation/anthropic/metadata.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ metadata:
2424
- name: model
2525
required: false
2626
description: |
27-
The Anthropic LLM to use. Defaults to claude-3-5-sonnet-20240620
27+
The Anthropic LLM to use.
2828
type: string
2929
example: 'claude-3-5-sonnet-20240620'
30+
default: 'claude-3-5-sonnet-20240620'
3031
- name: cacheTTL
3132
required: false
3233
description: |

conversation/googleai/metadata.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ metadata:
2424
- name: model
2525
required: false
2626
description: |
27-
The GoogleAI LLM to use. Defaults to gemini-1.5-flash
27+
The GoogleAI LLM to use.
2828
type: string
2929
example: 'gemini-2.0-flash'
30+
default: 'gemini-2.0-flash'
3031
- name: cacheTTL
3132
required: false
3233
description: |

conversation/huggingface/metadata.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ metadata:
2424
- name: model
2525
required: false
2626
description: |
27-
The Huggingface model to use. Uses OpenAI-compatible API. Defaults to deepseek-ai/DeepSeek-R1-Distill-Qwen-32B
27+
The Huggingface model to use. Uses OpenAI-compatible API.
2828
type: string
2929
example: 'deepseek-ai/DeepSeek-R1-Distill-Qwen-32B'
30+
default: 'deepseek-ai/DeepSeek-R1-Distill-Qwen-32B'
3031
- name: endpoint
3132
required: false
3233
description: |

conversation/mistral/metadata.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ metadata:
2424
- name: model
2525
required: false
2626
description: |
27-
The Mistral LLM to use. Defaults to open-mistral-7b
27+
The Mistral LLM to use.
2828
type: string
2929
example: 'open-mistral-7b'
30+
default: 'open-mistral-7b'
3031
- name: cacheTTL
3132
required: false
3233
description: |

conversation/ollama/metadata.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ metadata:
1212
- name: model
1313
required: false
1414
description: |
15-
The Ollama LLM to use. Defaults to llama3.2:latest
15+
The Ollama LLM to use.
1616
type: string
1717
example: 'llama3.2:latest'
18+
default: 'llama3.2:latest'
1819
- name: cacheTTL
1920
required: false
2021
description: |

conversation/openai/metadata.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ metadata:
2424
- name: model
2525
required: false
2626
description: |
27-
The OpenAI LLM to use. Defaults to gpt-4o
27+
The OpenAI LLM to use.
2828
type: string
2929
example: 'gpt-4-turbo'
30+
default: 'gpt-4o'
3031
- name: endpoint
3132
required: false
3233
description: |

pubsub/redis/metadata.yaml

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ metadata:
4646
- name: enableTLS
4747
required: false
4848
description: |
49-
If the Redis instance supports TLS, can be configured to be enabled or disabled. Defaults to "false".
49+
If the Redis instance supports TLS, can be configured to be enabled or disabled.
5050
example: "false"
5151
type: bool
52+
default: "false"
5253
- name: clientCert
5354
required: false
5455
description: Client certificate for Redis host. No Default. Can be secretKeyRef to use a secret reference
@@ -62,38 +63,44 @@ metadata:
6263
- name: redeliverInterval
6364
required: false
6465
description: |
65-
The interval between checking for pending messages to redelivery. Defaults to "60s". "0" disables redelivery.
66+
The interval between checking for pending messages to redelivery. "0" disables redelivery.
6667
example: "30s"
68+
default: "60s"
6769
type: duration
6870
- name: processingTimeout
6971
required: false
7072
description: |
71-
The amount time a message must be pending before attempting to redeliver it. Defaults to "15s". "0" disables redelivery.
73+
The amount time a message must be pending before attempting to redeliver it. "0" disables redelivery.
7274
example: "30s"
7375
type: duration
76+
default: "15s"
7477
- name: queueDepth
7578
required: false
7679
description: |
77-
The size of the message queue for processing. Defaults to "100".
80+
The size of the message queue for processing.
7881
example: "1000"
82+
default: "100"
7983
type: number
8084
- name: concurrency
8185
required: false
8286
description: |
83-
The number of concurrent workers that are processing messages. Defaults to "10".
87+
The number of concurrent workers that are processing messages.
8488
example: "15"
89+
default: "10"
8590
type: number
8691
- name: redisType
8792
required: false
8893
description: |
89-
The type of redis. There are two valid values, one is "node" for single node mode, the other is "cluster" for redis cluster mode. Defaults to "node".
94+
The type of redis. There are two valid values, one is "node" for single node mode, the other is "cluster" for redis cluster mode.
9095
example: "cluster"
9196
type: string
97+
default: "node"
9298
- name: redisDB
9399
required: false
94100
description: |
95-
Database selected after connecting to redis. If "redisType" is "cluster" this option is ignored. Defaults to "0".
101+
Database selected after connecting to redis. If "redisType" is "cluster" this option is ignored.
96102
example: "0"
103+
default: "0"
97104
type: number
98105
- name: redisMaxRetries
99106
required: false
@@ -103,26 +110,30 @@ metadata:
103110
- name: redisMinRetryInterval
104111
required: false
105112
description: |
106-
Minimum backoff for redis commands between each retry. Default is "8ms"; "-1" disables backoff.
113+
Minimum backoff for redis commands between each retry. "-1" disables backoff.
107114
example: "8ms"
115+
default: "8ms"
108116
type: duration
109117
- name: redisMaxRetryInterval
110118
required: false
111119
description: |
112-
Maximum backoff for redis commands between each retry. Default is "512ms";"-1" disables backoff.
120+
Maximum backoff for redis commands between each retry. "-1" disables backoff.
113121
example: "5s"
122+
default: "512ms"
114123
type: duration
115124
- name: dialTimeout
116125
required: false
117126
description: |
118-
Dial timeout for establishing new connections. Defaults to "5s".
127+
Dial timeout for establishing new connections.
119128
example: "5s"
129+
default: "5s"
120130
type: duration
121131
- name: readTimeout
122132
required: false
123133
description: |
124-
Timeout for socket reads. If reached, redis commands will fail with a timeout instead of blocking. Defaults to "3s", "-1" for no timeout.
134+
Timeout for socket reads. If reached, redis commands will fail with a timeout instead of blocking. "-1" for no timeout.
125135
example: "3s"
136+
default: "3"
126137
type: duration
127138
- name: writeTimeout
128139
required: false
@@ -147,26 +158,30 @@ metadata:
147158
- name: minIdleConns
148159
required: false
149160
description: |
150-
Minimum number of idle connections to keep open in order to avoid the performance degradation associated with creating new connections. Defaults to "0".
161+
Minimum number of idle connections to keep open in order to avoid the performance degradation associated with creating new connections.
151162
example: "2"
163+
default: "0"
152164
type: number
153165
- name: idleCheckFrequency
154166
required: false
155167
description: |
156-
Frequency of idle checks made by idle connections reaper. Default is "1m". "-1" disables idle connections reaper.
168+
Frequency of idle checks made by idle connections reaper. "-1" disables idle connections reaper.
157169
example: "-1"
170+
default: "1m"
158171
type: duration
159172
- name: idleTimeout
160173
required: false
161174
description: |
162-
Amount of time after which the client closes idle connections. Should be less than server's timeout. Default is "5m". "-1" disables idle timeout check.
175+
Amount of time after which the client closes idle connections. Should be less than server's timeout. "-1" disables idle timeout check.
163176
example: "10m"
177+
default: "5m"
164178
type: duration
165179
- name: failover
166180
required: false
167181
description: |
168-
Property to enabled failover configuration. Needs sentinelMasterName to be set. Defaults to "false"
182+
Property to enabled failover configuration. Needs sentinelMasterName to be set.
169183
example: "false"
184+
default: "false"
170185
type: bool
171186
- name: sentinelMasterName
172187
required: false

0 commit comments

Comments
 (0)