From 61b82aa6e5a1da03a6404faffd0b007706a9125f Mon Sep 17 00:00:00 2001 From: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com> Date: Tue, 25 Feb 2025 22:33:42 -0500 Subject: [PATCH] Upmerge 02/25 (#4555) * update self-hosted-with-docker docs Increase tmpfs size to prevent "no space left on device" error Signed-off-by: fvanzee <5238563+fvanzee@users.noreply.github.com> * Update deprecated exporter (#4543) Co-authored-by: Uncensored * docs: also restart sidecar-injector Signed-off-by: Joey Freeland * Update daprdocs/content/en/operations/security/mtls.md Co-authored-by: Mark Fussell Signed-off-by: Joey Freeland <30938344+jfreeland@users.noreply.github.com> * Update mtls.md Updating the dapr init -k command Signed-off-by: Mark Fussell * update kafka bulk metadata options Signed-off-by: Gallardot * fix missing tabs end Signed-off-by: Gallardot --------- Signed-off-by: fvanzee <5238563+fvanzee@users.noreply.github.com> Signed-off-by: Joey Freeland Signed-off-by: Joey Freeland <30938344+jfreeland@users.noreply.github.com> Signed-off-by: Mark Fussell Signed-off-by: Gallardot Signed-off-by: Hannah Hunter Co-authored-by: fvanzee <> Co-authored-by: Vladimir Damov <37113660+vdamov@users.noreply.github.com> Co-authored-by: Uncensored Co-authored-by: Joey Freeland Co-authored-by: Joey Freeland <30938344+jfreeland@users.noreply.github.com> Co-authored-by: Mark Fussell Co-authored-by: Gallardot --- .../self-hosted/self-hosted-with-docker.md | 2 +- daprdocs/content/en/operations/security/mtls.md | 15 +++++++++------ .../supported-pubsub/setup-apache-kafka.md | 5 +++-- .../open-telemetry-collector-jaeger.yaml | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md index 78f0e2c75..700acc776 100644 --- a/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md +++ b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md @@ -149,7 +149,7 @@ services: - type: tmpfs target: /data tmpfs: - size: "10000" + size: "64m" networks: hello-dapr: null diff --git a/daprdocs/content/en/operations/security/mtls.md b/daprdocs/content/en/operations/security/mtls.md index 0acdbcb51..b471783c0 100644 --- a/daprdocs/content/en/operations/security/mtls.md +++ b/daprdocs/content/en/operations/security/mtls.md @@ -231,6 +231,8 @@ kubectl rollout restart -n deployment/dapr-sentry ```bash kubectl rollout restart deploy/dapr-operator -n kubectl rollout restart statefulsets/dapr-placement-server -n +kubectl rollout restart deploy/dapr-sidecar-injector -n +kubectl rollout restart deploy/dapr-scheduler-server -n ``` 4. Restart your Dapr applications to pick up the latest trust bundle. @@ -332,12 +334,13 @@ Example: dapr status -k NAME NAMESPACE HEALTHY STATUS REPLICAS VERSION AGE CREATED - dapr-sentry dapr-system True Running 1 1.7.0 17d 2022-03-15 09:29.45 - dapr-dashboard dapr-system True Running 1 0.9.0 17d 2022-03-15 09:29.45 - dapr-sidecar-injector dapr-system True Running 1 1.7.0 17d 2022-03-15 09:29.45 - dapr-operator dapr-system True Running 1 1.7.0 17d 2022-03-15 09:29.45 - dapr-placement-server dapr-system True Running 1 1.7.0 17d 2022-03-15 09:29.45 -⚠ Dapr root certificate of your Kubernetes cluster expires in 2 days. Expiry date: Mon, 04 Apr 2022 15:01:03 UTC. + dapr-operator dapr-system True Running 1 1.15.0 4m 2025-02-19 17:36.26 + dapr-placement-server dapr-system True Running 1 1.15.0 4m 2025-02-19 17:36.27 + dapr-dashboard dapr-system True Running 1 0.15.0 4m 2025-02-19 17:36.27 + dapr-sentry dapr-system True Running 1 1.15.0 4m 2025-02-19 17:36.26 + dapr-scheduler-server dapr-system True Running 3 1.15.0 4m 2025-02-19 17:36.27 + dapr-sidecar-injector dapr-system True Running 1 1.15.0 4m 2025-02-19 17:36.26 +⚠ Dapr root certificate of your Kubernetes cluster expires in 2 days. Expiry date: Mon, 04 Apr 2025 15:01:03 UTC. Please see docs.dapr.io for certificate renewal instructions to avoid service interruptions. ``` diff --git a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md index 503500ca8..203d81a76 100644 --- a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md +++ b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md @@ -459,8 +459,8 @@ Apache Kafka supports the following bulk metadata options: | Configuration | Default | |----------|---------| -| `maxBulkAwaitDurationMs` | `10000` (10s) | -| `maxBulkSubCount` | `80` | +| `maxAwaitDurationMs` | `10000` (10s) | +| `maxMessagesCount` | `80` | ## Per-call metadata fields @@ -540,6 +540,7 @@ app.include_router(router) ``` {{% /codetab %}} + {{< /tabs >}} ## Receiving message headers with special characters diff --git a/daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml b/daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml index d8c0fe293..dac909542 100644 --- a/daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml +++ b/daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml @@ -19,8 +19,8 @@ data: zpages: endpoint: :55679 exporters: - logging: - loglevel: debug + debug: + verbosity: detailed # Depending on where you want to export your trace, use the # correct OpenTelemetry trace exporter here. #