+
+### Invoke Dapr Application Methods
+* Allows users to select a Dapr application found in the tree view "Applications" and invoke GET/POST methods by name.
+* Allows users to specify an optional payload for POST methods
+
+
+### Publish Events to Dapr Applications
+* You can publish events to running applications you select in the "Applications" tree view.
+* Allows you to specify both the topic and an optional payload.
+
+ 
+
+
+## Telemetry
+
+### Data Collection
+
+The software may collect information about you and your use of the software and send it to Microsoft. Microsoft may use this information to provide services and improve our products and services. You may turn off the telemetry as described in the repository. There are also some features in the software that may enable you and Microsoft to collect data from users of your applications. If you use these features, you must comply with applicable law, including providing appropriate notices to users of your applications together with a copy of Microsoft's privacy statement. Microsoft's privacy statement is located at https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and use in the help documentation and privacy statement. Your use of the software operates as your consent to these practices.
+
+### Disabling Telemetry
+If you don’t wish to send usage data to Microsoft, you can set the telemetry.enableTelemetry setting to false.
+
+
+## Additional Resources
+
+### Debuggin Multiple Dapr Applications At The Same Time
+Using the VS Code extension you can debug multiple Dapr applications at the same time with [Multi-target debugging](https://code.visualstudio.com/docs/editor/debugging#_multitarget-debugging)
+
+### Dapr Community Call Demonstration
+Watch this [video](https://www.youtube.com/watch?v=OtbYCBt9C34&t=85) on how to use the Dapr VS Code extension:
+
\ No newline at end of file
diff --git a/daprdocs/content/en/developing-applications/ides/vscode.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
similarity index 67%
rename from daprdocs/content/en/developing-applications/ides/vscode.md
rename to daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
index c165829d1..746c75f53 100644
--- a/daprdocs/content/en/developing-applications/ides/vscode.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
@@ -1,64 +1,11 @@
---
type: docs
-title: "Visual Studio Code integrations with Dapr"
-linkTitle: "Visual Studio Code"
-weight: 1000
-description: "Information on how to develop and run Dapr applications in VS Code"
+title: "Visual Studio Code manual configuration"
+linkTitle: "Visual Studio Code manual configuration"
+weight: 30000
+description: "Information on how to setup Visual Studio Code debugging manually"
---
-## Extension
-
-Dapr offers a *preview* [Dapr Visual Studio Code extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-dapr) for local development and debugging of your Dapr applications.
-
-Open in VSCode
-
-### Feature overview
-- Scaffold Dapr task, launch, and component assets
- 
-- View running Dapr applications
-
-- Invoke Dapr application methods
-
-- Publish events to Dapr applications
-
-
-#### Example
-Watch this [video](https://www.youtube.com/watch?v=OtbYCBt9C34&t=85) on how to use the Dapr VS Code extension:
-
-
-## Remote Dev Containers
-
-The Visual Studio Code Remote Containers extension lets you use a Docker container as a full-featured development environment enabling you to [develop inside a container](https://code.visualstudio.com/docs/remote/containers) without installing any additional frameworks or packages to your local filesystem.
-
-Dapr has pre-built Docker remote containers for each of the language SDKs. You can pick the one of your choice for a ready made environment. Note these pre-built containers automatically update to the latest Dapr release.
-
-### Setup a remote dev container
-
-#### Prerequisites
-- [Docker Desktop](https://www.docker.com/products/docker-desktop)
-- [Visual Studio Code](https://code.visualstudio.com/)
-- [VSCode Remote Development extension pack](https://aka.ms/vscode-remote/download/extension)
-
-#### Create remote Dapr container
-1. Open your application workspace in VS Code
-2. In the command command palette (ctrl+shift+p) type and select `Remote-Containers: Add Development Container Configuration Files...`
- 
-3. Type `dapr` to filter the list to available Dapr remote containers and choose the language container that matches your application. Note you may need to select `Show All Definitions...`
- 
-4. Follow the prompts to rebuild your application in container.
- 
-
-#### Example
-Watch this [video](https://www.youtube.com/watch?v=D2dO4aGpHcg&t=120) on how to use the Dapr VS Code Remote Containers with your application.
-
-
-## Troubleshooting
-
-### Debugging multiple Dapr applications at the same time
-Using the VS Code extension you can debug multiple Dapr applications at the same time with [Multi-target debugging](https://code.visualstudio.com/docs/editor/debugging#_multitarget-debugging)
-
-
-### Manually configuring Visual Studio Code for debugging with daprd
If instead of using the Dapr VS Code extension you wish to configure a project to use Dapr in the [tasks.json](https://code.visualstudio.com/Docs/editor/tasks) and [launch.json](https://code.visualstudio.com/Docs/editor/debugging) files these are the manual steps.
When developing Dapr applications, you typically use the dapr cli to start your daprized service similar to this:
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md
new file mode 100644
index 000000000..3ba86cdf9
--- /dev/null
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md
@@ -0,0 +1,31 @@
+---
+type: docs
+title: "Visual Studio Code Remote Dev Containers"
+linkTitle: "Visual Studio Code remote dev containers"
+weight: 20000
+description: "Information on how to setup a remote dev environment"
+---
+
+The Visual Studio Code Remote Containers extension lets you use a Docker container as a full-featured development environment enabling you to [develop inside a container](https://code.visualstudio.com/docs/remote/containers) without installing any additional frameworks or packages to your local filesystem.
+
+Dapr has pre-built Docker remote containers for each of the language SDKs. You can pick the one of your choice for a ready made environment. Note these pre-built containers automatically update to the latest Dapr release.
+
+### Setup a remote dev container
+
+#### Prerequisites
+- [Docker Desktop](https://www.docker.com/products/docker-desktop)
+- [Visual Studio Code](https://code.visualstudio.com/)
+- [VSCode Remote Development extension pack](https://aka.ms/vscode-remote/download/extension)
+
+#### Create remote Dapr container
+1. Open your application workspace in VS Code
+2. In the command command palette (ctrl+shift+p) type and select `Remote-Containers: Add Development Container Configuration Files...`
+
+3. Type `dapr` to filter the list to available Dapr remote containers and choose the language container that matches your application. Note you may need to select `Show All Definitions...`
+
+4. Follow the prompts to rebuild your application in container.
+
+
+#### Example
+Watch this [video](https://www.youtube.com/watch?v=D2dO4aGpHcg&t=120) on how to use the Dapr VS Code Remote Containers with your application.
+
\ No newline at end of file
From 61559e9ab9bf7edee29c897f2cde845a8c8d7835 Mon Sep 17 00:00:00 2001
From: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
Date: Tue, 29 Jun 2021 12:28:06 -0400
Subject: [PATCH 02/34] Added changes to the reformatting of the VS Code
Changes are based on comments received.
---
.../ides/visual-studio-code/_index.md | 4 ++--
.../ides/visual-studio-code/vscode-dapr-extension.md | 12 ++++++------
.../vscode-manual-configuration.md | 4 ++--
.../vscode-remote-dev-containers.md | 10 +++++-----
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/_index.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/_index.md
index de374e4bf..42aba5db5 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/_index.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/_index.md
@@ -1,7 +1,7 @@
---
type: docs
-title: "Visual Studio Code"
+title: "Visual Studio Code integration with Dapr"
linkTitle: "Visual Studio Code"
weight: 1000
-description: "Information on how to develop and run Dapr applications in VS Code"
+description: "How to develop and run Dapr applications in Visual Studio Code"
---
\ No newline at end of file
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
index bcbf97bba..be07df115 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
@@ -3,7 +3,7 @@ type: docs
title: "Dapr Visual Studio Code extension overview"
linkTitle: "Overview"
weight: 10000
-description: "Information on how to develop and run Dapr applications with the Dapr extension"
+description: "How to develop and run Dapr applications with the Dapr extension"
---
@@ -11,13 +11,13 @@ Dapr offers a *preview* [Dapr Visual Studio Code extension](https://marketplace.
Open in VSCode
-## Features Overview
+## Features
-### Scaffold Dapr Tasks
+### Scaffold Dapr tasks
* Helps scaffold VS Code task.json and launch.json configurations needed to debug your application within the Dapr environment.
* Requires an already existing launch.json files to be found in the VS Code workspace.
-* Example NodeJS App:
+* Example NodeJS app:
Before scaffolding version of launch.json configurations:
@@ -84,7 +84,7 @@ After scaffolding task.json:
}
```
-### Scaffold Dapr Components
+### Scaffold Dapr components
* Generates the Dapr component assets needed for general Dapr applications.
* Provides a Component folder in your VS Code workspace that contains pubsub, statestore and a zipkin yaml file.
* Example pubsub file:
@@ -108,7 +108,7 @@ spec:
-### Invoke Dapr Application Methods
+### Invoke Dapr application methods
* Allows users to select a Dapr application found in the tree view "Applications" and invoke GET/POST methods by name.
* Allows users to specify an optional payload for POST methods
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
index 746c75f53..7a27a4ef6 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
@@ -1,7 +1,7 @@
---
type: docs
-title: "Visual Studio Code manual configuration"
-linkTitle: "Visual Studio Code manual configuration"
+title: "Visual Studio Code manual debugging configuration"
+linkTitle: "Manual debugging configuration"
weight: 30000
description: "Information on how to setup Visual Studio Code debugging manually"
---
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md
index 3ba86cdf9..d3409a88e 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md
@@ -1,12 +1,12 @@
---
type: docs
-title: "Visual Studio Code Remote Dev Containers"
-linkTitle: "Visual Studio Code remote dev containers"
+title: "Visual Studio Code remote dev containers"
+linkTitle: "Remote dev containers"
weight: 20000
-description: "Information on how to setup a remote dev environment"
+description: "How to setup a remote dev container environment with Dapr"
---
-The Visual Studio Code Remote Containers extension lets you use a Docker container as a full-featured development environment enabling you to [develop inside a container](https://code.visualstudio.com/docs/remote/containers) without installing any additional frameworks or packages to your local filesystem.
+The Visual Studio Code [Remote Containers extension](https://code.visualstudio.com/docs/remote/containers) lets you use a Docker container as a full-featured development environment without installing any additional frameworks or packages to your local filesystem.
Dapr has pre-built Docker remote containers for each of the language SDKs. You can pick the one of your choice for a ready made environment. Note these pre-built containers automatically update to the latest Dapr release.
@@ -19,7 +19,7 @@ Dapr has pre-built Docker remote containers for each of the language SDKs. You c
#### Create remote Dapr container
1. Open your application workspace in VS Code
-2. In the command command palette (ctrl+shift+p) type and select `Remote-Containers: Add Development Container Configuration Files...`
+2. In the command command palette (`CTRL+SHIFT+P`) type and select `Remote-Containers: Add Development Container Configuration Files...`
3. Type `dapr` to filter the list to available Dapr remote containers and choose the language container that matches your application. Note you may need to select `Show All Definitions...`
From e964f66fd9822e00df8d616ddd0c4b091cfbc8fb Mon Sep 17 00:00:00 2001
From: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
Date: Tue, 29 Jun 2021 12:36:01 -0400
Subject: [PATCH 03/34] Revised grammer on manual configuration and remote dev
containers
Revised based on comments
---
.../vscode-dapr-extension.md | 28 ++++++++-----------
.../vscode-manual-configuration.md | 8 ++++--
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
index be07df115..49d1847ab 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
@@ -103,9 +103,8 @@ spec:
value: ""
```
-### View Running Dapr Applications
-* Adds a view container specifically for Dapr applications which when selected displays a tree view called "Applications" which shows locally-running Dapr applications.
-
+### View running Dapr applications
+* The Applications view shows Dapr applications running locally on your machine.
### Invoke Dapr application methods
@@ -113,28 +112,25 @@ spec:
* Allows users to specify an optional payload for POST methods
-### Publish Events to Dapr Applications
-* You can publish events to running applications you select in the "Applications" tree view.
-* Allows you to specify both the topic and an optional payload.
-
+### Publish events to Dapr applications
+* Within the Applications view, users can right-click and publish messages to a running Dapr application, specifying the topic and payload.
+Users can also publish messages to all running applications.
## Telemetry
-### Data Collection
+### Data collection
-The software may collect information about you and your use of the software and send it to Microsoft. Microsoft may use this information to provide services and improve our products and services. You may turn off the telemetry as described in the repository. There are also some features in the software that may enable you and Microsoft to collect data from users of your applications. If you use these features, you must comply with applicable law, including providing appropriate notices to users of your applications together with a copy of Microsoft's privacy statement. Microsoft's privacy statement is located at https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and use in the help documentation and privacy statement. Your use of the software operates as your consent to these practices.
+The software may collect information about you and your use of the software and send it to Microsoft. Microsoft may use this information to provide services and improve our products and services. You may turn off the telemetry as described [in the repository](https://github.com/microsoft/vscode-dapr). There are also some features in the software that may enable you and Microsoft to collect data from users of your applications. If you use these features, you must comply with applicable law, including providing appropriate notices to users of your applications together with a copy of Microsoft's privacy statement. Microsoft's privacy statement is located at https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and use in the help documentation and privacy statement. Your use of the software operates as your consent to these practices.
### Disabling Telemetry
-If you don’t wish to send usage data to Microsoft, you can set the telemetry.enableTelemetry setting to false.
+If you don’t wish to send usage data to Microsoft, you can set the `telemetry.enableTelemetry` setting to `false`. Learn more in the VSCode [FAQ](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting).
+## Additional resources
-## Additional Resources
-
-### Debuggin Multiple Dapr Applications At The Same Time
-Using the VS Code extension you can debug multiple Dapr applications at the same time with [Multi-target debugging](https://code.visualstudio.com/docs/editor/debugging#_multitarget-debugging)
-
-### Dapr Community Call Demonstration
+### Debugging multiple Dapr applications at the same time
+Using the VS Code extension, you can debug multiple Dapr applications at the same time with [Multi-target debugging](https://code.visualstudio.com/docs/editor/debugging#_multitarget-debugging).
+### Community call demo
Watch this [video](https://www.youtube.com/watch?v=OtbYCBt9C34&t=85) on how to use the Dapr VS Code extension:
\ No newline at end of file
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
index 7a27a4ef6..30c15ab6c 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
@@ -3,12 +3,14 @@ type: docs
title: "Visual Studio Code manual debugging configuration"
linkTitle: "Manual debugging configuration"
weight: 30000
-description: "Information on how to setup Visual Studio Code debugging manually"
+description: "How to manually setup Visual Studio Code debugging"
---
-If instead of using the Dapr VS Code extension you wish to configure a project to use Dapr in the [tasks.json](https://code.visualstudio.com/Docs/editor/tasks) and [launch.json](https://code.visualstudio.com/Docs/editor/debugging) files these are the manual steps.
+The [Dapr VSCode extension]({{< ref vscode-dapr-extension.md >}}) automates the setup of [VSCode debugging](https://code.visualstudio.com/Docs/editor/debugging).
-When developing Dapr applications, you typically use the dapr cli to start your daprized service similar to this:
+If instead you wish to manually configure the `[tasks.json](https://code.visualstudio.com/Docs/editor/tasks)` and `[launch.json](https://code.visualstudio.com/Docs/editor/debugging)` files to use Dapr, these are the steps.
+
+When developing Dapr applications, you typically use the Dapr cli to start your daprized service similar to this:
```bash
dapr run --app-id nodeapp --app-port 3000 --dapr-http-port 3500 app.js
From 1808dde10bd24ede889a3028d306d235017a1e29 Mon Sep 17 00:00:00 2001
From: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
Date: Tue, 29 Jun 2021 12:37:47 -0400
Subject: [PATCH 04/34] Removed unnecessary wording
---
.../ides/visual-studio-code/vscode-manual-configuration.md | 2 --
1 file changed, 2 deletions(-)
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
index 30c15ab6c..437155dd5 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
@@ -26,8 +26,6 @@ One approach to attaching the debugger to your service is to first run daprd wit
Using the [tasks.json](https://code.visualstudio.com/Docs/editor/tasks) and [launch.json](https://code.visualstudio.com/Docs/editor/debugging) files in Visual Studio Code, you can simplify the process and request that VS Code kick off the daprd process prior to launching the debugger.
-Let's get started!
-
#### Modifying launch.json configurations to include a preLaunchTask
In your [launch.json](https://code.visualstudio.com/Docs/editor/debugging) file add a [preLaunchTask](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) for each configuration that you want daprd launched. The [preLaunchTask](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) will reference tasks that you define in your tasks.json file. Here is an example for both Node and .NET Core. Notice the [preLaunchTasks](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) referenced: daprd-web and daprd-leaderboard.
From dafe094ffaa87c1506c358d293a25fe9d280d11b Mon Sep 17 00:00:00 2001
From: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
Date: Wed, 30 Jun 2021 14:29:22 -0400
Subject: [PATCH 05/34] Revision on JSON Snippets Shown
Cut down the JSON shown to users in the VS Code Dapr section and renamed link title
---
.../vscode-dapr-extension.md | 46 ++-----------------
1 file changed, 3 insertions(+), 43 deletions(-)
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
index 49d1847ab..728602edc 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
@@ -1,7 +1,7 @@
---
type: docs
title: "Dapr Visual Studio Code extension overview"
-linkTitle: "Overview"
+linkTitle: "Dapr extension"
weight: 10000
description: "How to develop and run Dapr applications with the Dapr extension"
---
@@ -19,37 +19,8 @@ Dapr offers a *preview* [Dapr Visual Studio Code extension](https://marketplace.
* Requires an already existing launch.json files to be found in the VS Code workspace.
* Example NodeJS app:
-
-Before scaffolding version of launch.json configurations:
+After scaffolding the launch.json should contain similar snippets:
```json
-{
- "version": "0.2.0",
- "configurations": [
- {
- "type": "pwa-node",
- "request": "launch",
- "name": "Launch Program",
- "skipFiles": [
- "
### Invoke Dapr application methods
From 311abba65f2b0d7244637eaeea417ecec771080e Mon Sep 17 00:00:00 2001
From: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
Date: Mon, 12 Jul 2021 11:24:29 -0400
Subject: [PATCH 12/34] Update
daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
Co-authored-by: Aaron Crawfis
### Publish events to Dapr applications
-* Within the Applications view, users can right-click and publish messages to a running Dapr application, specifying the topic and payload.
-Users can also publish messages to all running applications.
-
+Within the Applications view, users can right-click and publish messages to a running Dapr application, specifying the topic and payload.
+
+Users can also publish messages to all running applications.
+
+
## Telemetry
From 46fd2593507ed3d31040a90043d0fccd8942242f Mon Sep 17 00:00:00 2001
From: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
Date: Mon, 12 Jul 2021 11:24:37 -0400
Subject: [PATCH 13/34] Update
daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
Co-authored-by: Aaron Crawfis
-### Invoke Dapr application methods
-* Allows users to select a Dapr application found in the tree view "Applications" and invoke GET/POST methods by name.
-* Allows users to specify an optional payload for POST methods
+### Invoke Dapr applications
+
+Within the Applications view, users can right-click and invoke Dapr apps via GET or POST methods, optionally specifying a payload.
+
### Publish events to Dapr applications
From c0aa9808c3e0ba5e68f2752d740304a87d2f33ee Mon Sep 17 00:00:00 2001
From: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
Date: Mon, 12 Jul 2021 11:25:08 -0400
Subject: [PATCH 17/34] Update
daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
Co-authored-by: Aaron Crawfis
-
-## Telemetry
-
-### Data collection
-
-The software may collect information about you and your use of the software and send it to Microsoft. Microsoft may use this information to provide services and improve our products and services. You may turn off the telemetry as described [in the repository](https://github.com/microsoft/vscode-dapr). There are also some features in the software that may enable you and Microsoft to collect data from users of your applications. If you use these features, you must comply with applicable law, including providing appropriate notices to users of your applications together with a copy of Microsoft's privacy statement. Microsoft's privacy statement is located at https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and use in the help documentation and privacy statement. Your use of the software operates as your consent to these practices.
-
-### Disabling Telemetry
-
-If you don’t wish to send usage data to Microsoft, you can set the `telemetry.enableTelemetry` setting to `false`. Learn more in the VSCode [FAQ](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting).
-
## Additional resources
### Debugging multiple Dapr applications at the same time
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
index b1a03835a..ad57dc7de 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
+++ b/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
@@ -16,12 +16,6 @@ When developing Dapr applications, you typically use the Dapr cli to start your
dapr run --app-id nodeapp --app-port 3000 --dapr-http-port 3500 app.js
```
-This will generate the components yaml files (if they don't exist) so that your service can interact with the local redis container. This is great when you are just getting started but what if you want to attach a debugger to your service and step through the code? This is where you can use the dapr runtime (daprd) to help facilitate this.
-
-{{% alert title="Note" color="primary" %}}
-The dapr runtime (daprd) will not automatically generate the components yaml files for Redis. These will need to be created manually or you will need to run the dapr cli (dapr) once in order to have them created automatically.
-{{% /alert %}}
-
One approach to attaching the debugger to your service is to first run daprd with the correct arguments from the command line and then launch your code and attach the debugger. While this is a perfectly acceptable solution, it does require a few extra steps and some instruction to developers who might want to clone your repo and hit the "play" button to begin debugging.
Using the [tasks.json](https://code.visualstudio.com/Docs/editor/tasks) and [launch.json](https://code.visualstudio.com/Docs/editor/debugging) files in Visual Studio Code, you can simplify the process and request that VS Code kick off the daprd process prior to launching the debugger.
From 8e4e85717af6609f8b8d9c58a01ed7660299752a Mon Sep 17 00:00:00 2001
From: Lorenzo Montanari
-
+
diff --git a/daprdocs/content/en/developing-applications/sdks/_index.md b/daprdocs/content/en/developing-applications/sdks/_index.md
index 2ad84d08b..88848a8c7 100644
--- a/daprdocs/content/en/developing-applications/sdks/_index.md
+++ b/daprdocs/content/en/developing-applications/sdks/_index.md
@@ -34,7 +34,7 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho
| [.NET]({{< ref dotnet >}}) | Stable | ✔ | [ASP.NET Core]({{< ref dotnet-aspnet >}}) | ✔ |
| [Python]({{< ref python >}}) | Stable | ✔ | [gRPC]({{< ref python-grpc.md >}}) | [FastAPI]({{< ref python-fastapi.md >}})
[Flask]({{< ref python-flask.md >}}) | | [Java](https://github.com/dapr/java-sdk) | Stable | ✔ | Spring Boot | ✔ | -| [Go](https://github.com/dapr/go-sdk) | Stable | ✔ | ✔ | | +| [Go]({{< ref go >}}) | Stable | ✔ | ✔ | | | [PHP]({{< ref php >}}) | Stable | ✔ | ✔ | ✔ | | [C++](https://github.com/dapr/cpp-sdk) | In development | ✔ | | | [Rust](https://github.com/dapr/rust-sdk) | In development | ✔ | | | From 40fd8cb5287a1217931b3914ae55333c4bc030d0 Mon Sep 17 00:00:00 2001 From: Nick Greenfield
Date: Wed, 14 Jul 2021 15:40:53 -0700
Subject: [PATCH 27/34] Add Bridge to Kubernetes linke from Kubernetes overview
page
---
.../en/operations/hosting/kubernetes/kubernetes-overview.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
index d6e9cde72..36e5efe72 100644
--- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
@@ -50,3 +50,4 @@ Dapr is tested and supported on the following versions of Kubernetes.
- [Upgrade Dapr on a Kubernetes cluster]({{< ref kubernetes-upgrade >}})
- [Production guidelines for Dapr on Kubernetes]({{< ref kubernetes-production.md >}})
- [Dapr Kubernetes Quickstart](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes)
+- [Use Bridge to Kubernetes to debug Dapr apps locally, while connected to your Kubernetes cluster]({{< ref bridge-to-kubernetes >}})
From 669fa54b10ede7895f335800cc86b00348dfdb05 Mon Sep 17 00:00:00 2001
From: jasonviviano <83607984+jasonviviano@users.noreply.github.com>
Date: Thu, 15 Jul 2021 10:37:03 -0400
Subject: [PATCH 28/34] Fixed vscode link and updated information on manual.
---
.../ides/{visual-studio-code => vscode}/_index.md | 0
.../vscode-dapr-extension.md | 0
.../vscode-manual-configuration.md | 8 ++++----
.../vscode-remote-dev-containers.md | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
rename daprdocs/content/en/developing-applications/ides/{visual-studio-code => vscode}/_index.md (100%)
rename daprdocs/content/en/developing-applications/ides/{visual-studio-code => vscode}/vscode-dapr-extension.md (100%)
rename daprdocs/content/en/developing-applications/ides/{visual-studio-code => vscode}/vscode-manual-configuration.md (83%)
rename daprdocs/content/en/developing-applications/ides/{visual-studio-code => vscode}/vscode-remote-dev-containers.md (85%)
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/_index.md b/daprdocs/content/en/developing-applications/ides/vscode/_index.md
similarity index 100%
rename from daprdocs/content/en/developing-applications/ides/visual-studio-code/_index.md
rename to daprdocs/content/en/developing-applications/ides/vscode/_index.md
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md b/daprdocs/content/en/developing-applications/ides/vscode/vscode-dapr-extension.md
similarity index 100%
rename from daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-dapr-extension.md
rename to daprdocs/content/en/developing-applications/ides/vscode/vscode-dapr-extension.md
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md b/daprdocs/content/en/developing-applications/ides/vscode/vscode-manual-configuration.md
similarity index 83%
rename from daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
rename to daprdocs/content/en/developing-applications/ides/vscode/vscode-manual-configuration.md
index ad57dc7de..c2585e180 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-manual-configuration.md
+++ b/daprdocs/content/en/developing-applications/ides/vscode/vscode-manual-configuration.md
@@ -22,7 +22,7 @@ Using the [tasks.json](https://code.visualstudio.com/Docs/editor/tasks) and [lau
#### Modifying launch.json configurations to include a preLaunchTask
-In your [launch.json](https://code.visualstudio.com/Docs/editor/debugging) file add a [preLaunchTask](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) for each configuration that you want daprd launched. The [preLaunchTask](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) will reference tasks that you define in your tasks.json file. Here is an example for both Node and .NET Core. Notice the [preLaunchTasks](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) referenced: daprd-web and daprd-leaderboard.
+In your [launch.json](https://code.visualstudio.com/Docs/editor/debugging) file add a [preLaunchTask](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) for each configuration that you want daprd launched. The [preLaunchTask](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) references tasks that you define in your tasks.json file. Here is an example for both Node and .NET Core. Notice the [preLaunchTasks](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) referenced: daprd-web and daprd-leaderboard.
```json
{
@@ -64,17 +64,17 @@ In your [launch.json](https://code.visualstudio.com/Docs/editor/debugging) file
#### Adding daprd tasks to tasks.json
-You will need to define a task and problem matcher for daprd in your [tasks.json](https://code.visualstudio.com/Docs/editor/tasks) file. Here are two examples (both referenced via the [preLaunchTask](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) members above). Notice that in the case of the .NET Core daprd task (daprd-leaderboard) there is also a [dependsOn](https://code.visualstudio.com/Docs/editor/tasks#_compound-tasks) member that references the build task to ensure the latest code is being run/debugged. The [problemMatcher](https://code.visualstudio.com/Docs/editor/tasks#_defining-a-problem-matcher) is used so that VSCode can understand when the daprd process is up and running.
+You need to define a task and problem matcher for daprd in your [tasks.json](https://code.visualstudio.com/Docs/editor/tasks) file. Here are two examples (both referenced via the [preLaunchTask](https://code.visualstudio.com/Docs/editor/debugging#_launchjson-attributes) members above). Notice that in the case of the .NET Core daprd task (daprd-leaderboard) there is also a [dependsOn](https://code.visualstudio.com/Docs/editor/tasks#_compound-tasks) member that references the build task to ensure the latest code is being run/debugged. The [problemMatcher](https://code.visualstudio.com/Docs/editor/tasks#_defining-a-problem-matcher) is used so that VSCode can understand when the daprd process is up and running.
Let's take a quick look at the args that are being passed to the daprd command.
-* -app-id -- the id (how you will locate it via service invocation) of your microservice
+* -app-id -- the id (how you locate it via service invocation) of your microservice
* -app-port -- the port number that your application code is listening on
* -dapr-http-port -- the http port for the dapr api
* -dapr-grpc-port -- the grpc port for the dapr api
* -placement-host-address -- the location of the placement service (this should be running in docker as it was created when you installed dapr and ran ```dapr init```)
->Note: You will need to ensure that you specify different http/grpc (-dapr-http-port and -dapr-grpc-port) ports for each daprd task that you create, otherwise you will run into port conflicts when you attempt to launch the second configuration.
+>Note: You need to ensure that you specify different http/grpc (-dapr-http-port and -dapr-grpc-port) ports for each daprd task that you create, otherwise you run into port conflicts when you attempt to launch the second configuration.
```json
{
diff --git a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md b/daprdocs/content/en/developing-applications/ides/vscode/vscode-remote-dev-containers.md
similarity index 85%
rename from daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md
rename to daprdocs/content/en/developing-applications/ides/vscode/vscode-remote-dev-containers.md
index d3409a88e..3235d30b1 100644
--- a/daprdocs/content/en/developing-applications/ides/visual-studio-code/vscode-remote-dev-containers.md
+++ b/daprdocs/content/en/developing-applications/ides/vscode/vscode-remote-dev-containers.md
@@ -1,6 +1,6 @@
---
type: docs
-title: "Visual Studio Code remote dev containers"
+title: "Developing Dapr applications with remote dev containers"
linkTitle: "Remote dev containers"
weight: 20000
description: "How to setup a remote dev container environment with Dapr"
@@ -8,7 +8,7 @@ description: "How to setup a remote dev container environment with Dapr"
The Visual Studio Code [Remote Containers extension](https://code.visualstudio.com/docs/remote/containers) lets you use a Docker container as a full-featured development environment without installing any additional frameworks or packages to your local filesystem.
-Dapr has pre-built Docker remote containers for each of the language SDKs. You can pick the one of your choice for a ready made environment. Note these pre-built containers automatically update to the latest Dapr release.
+Dapr has pre-built Docker remote containers for NodeJS and C#. You can pick the one of your choice for a ready made environment. Note these pre-built containers automatically update to the latest Dapr release.
### Setup a remote dev container
From 0b41e17c31e8d0d469320af99afbcd7ceab2fdd0 Mon Sep 17 00:00:00 2001
From: Long Dai
Date: Fri, 16 Jul 2021 01:05:21 -0700
Subject: [PATCH 29/34] fix some typo
Signed-off-by: Long Dai
---
.../w3c-tracing/w3c-tracing-overview.md | 2 +-
.../building-blocks/pubsub/pubsub-scopes.md | 2 +-
.../en/developing-applications/ides/intellij.md | 2 +-
.../integrations/gRPC-integration.md | 2 +-
.../en/operations/configuration/invoke-allowlist.md | 4 ++--
.../en/operations/configuration/secret-scope.md | 2 +-
.../hosting/self-hosted/self-hosted-with-docker.md | 2 +-
.../en/operations/monitoring/metrics/grafana.md | 2 +-
.../en/operations/troubleshooting/common_issues.md | 2 +-
.../components-reference/supported-bindings/http.md | 6 +++---
.../supported-bindings/zeebe-command.md | 2 +-
.../supported-middleware/middleware-opa.md | 2 +-
.../supported-pubsub/setup-rabbitmq.md | 2 +-
.../supported-secret-stores/envvar-secret-store.md | 2 +-
.../supported-secret-stores/hashicorp-vault.md | 2 +-
.../setup-azure-tablestorage.md | 2 +-
.../supported-state-stores/setup-mongodb.md | 2 +-
.../supported-state-stores/setup-zookeeper.md | 2 +-
daprdocs/static/docs/azm-config-map.yaml | 12 ++++++------
19 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md b/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md
index 56ca62057..db89c0cd5 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-overview.md
@@ -72,7 +72,7 @@ In these scenarios Dapr does some of the work for you and you need to either cre
To understand how to extract the trace headers from a response and add the trace headers into a request, see the [how to use trace context]({{< ref w3c-tracing >}}) article.
2. You have chosen to generate your own trace context headers.
-This is much more unusual. There may be occassions where you specifically chose to add W3C trace headers into a service call, for example if you have an existing application that does not currently use Dapr. In this case Dapr still propagates the trace context headers for you. If you decide to generate trace headers yourself, there are three ways this can be done :
+This is much more unusual. There may be occasions where you specifically chose to add W3C trace headers into a service call, for example if you have an existing application that does not currently use Dapr. In this case Dapr still propagates the trace context headers for you. If you decide to generate trace headers yourself, there are three ways this can be done :
1. You can use the industry standard OpenCensus/OpenTelemetry SDKs to generate trace headers and pass these trace headers to a Dapr enabled service. This is the preferred recommendation.
diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md
index 9b12cf5c9..e3a055d20 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-scopes.md
@@ -32,7 +32,7 @@ To use this topic scoping three metadata properties can be set for a pub/sub com
- `spec.metadata.allowedTopics`
- A comma-separated list of allowed topics for all applications.
- If `allowedTopics` is not set (default behavior), all topics are valid. `subscriptionScopes` and `publishingScopes` still take place if present.
- - `publishingScopes` or `subscriptionScopes` can be used in conjuction with `allowedTopics` to add granular limitations
+ - `publishingScopes` or `subscriptionScopes` can be used in conjunction with `allowedTopics` to add granular limitations
These metadata properties can be used for all pub/sub components. The following examples use Redis as pub/sub component.
diff --git a/daprdocs/content/en/developing-applications/ides/intellij.md b/daprdocs/content/en/developing-applications/ides/intellij.md
index 80bc755e5..1bd3bf6e7 100644
--- a/daprdocs/content/en/developing-applications/ides/intellij.md
+++ b/daprdocs/content/en/developing-applications/ides/intellij.md
@@ -80,7 +80,7 @@ Add a new `
diff --git a/daprdocs/content/en/developing-applications/integrations/gRPC-integration.md b/daprdocs/content/en/developing-applications/integrations/gRPC-integration.md
index 4386cb529..c48bc0f73 100644
--- a/daprdocs/content/en/developing-applications/integrations/gRPC-integration.md
+++ b/daprdocs/content/en/developing-applications/integrations/gRPC-integration.md
@@ -177,7 +177,7 @@ func (s *server) ListInputBindings(ctx context.Context, in *empty.Empty) (*pb.Li
}, nil
}
-// This method gets invoked every time a new event is fired from a registerd binding. The message carries the binding name, a payload and optional metadata
+// This method gets invoked every time a new event is fired from a registered binding. The message carries the binding name, a payload and optional metadata
func (s *server) OnBindingEvent(ctx context.Context, in *pb.BindingEventRequest) (*pb.BindingEventResponse, error) {
fmt.Println("Invoked from binding")
return &pb.BindingEventResponse{}, nil
diff --git a/daprdocs/content/en/operations/configuration/invoke-allowlist.md b/daprdocs/content/en/operations/configuration/invoke-allowlist.md
index e685e238f..bdae45310 100644
--- a/daprdocs/content/en/operations/configuration/invoke-allowlist.md
+++ b/daprdocs/content/en/operations/configuration/invoke-allowlist.md
@@ -8,7 +8,7 @@ description: "Restrict what operations *calling* applications can perform, via s
Access control enables the configuration of policies that restrict what operations *calling* applications can perform, via service invocation, on the *called* application. To limit access to a called applications from specific operations and HTTP verbs from the calling applications, you can define an access control policy specification in configuration.
-An access control policy is specified in configuration and be applied to Dapr sidecar for the *called* application. Example access policies are shown below and access to the called app is based on the matched policy action. You can provide a default global action for all calling applications and if no access control policy is specified, the default behavior is to allow all calling applicatons to access to the called app.
+An access control policy is specified in configuration and be applied to Dapr sidecar for the *called* application. Example access policies are shown below and access to the called app is based on the matched policy action. You can provide a default global action for all calling applications and if no access control policy is specified, the default behavior is to allow all calling applications to access to the called app.
Watch this [video](https://youtu.be/j99RN_nxExA?t=1108) on how to apply access control list for service invocation.
@@ -194,7 +194,7 @@ spec:
## Hello world examples
These examples show how to apply access control to the [hello world](https://github.com/dapr/quickstarts#quickstarts) quickstart samples where a python app invokes a node.js app.
-Access control lists rely on the Dapr [Sentry service]({{< ref "security-concept.md" >}}) to generate the TLS certificates with a SPIFFE id for authentication, which means the Sentry service either has to be running locally or deployed to your hosting enviroment such as a Kubernetes cluster.
+Access control lists rely on the Dapr [Sentry service]({{< ref "security-concept.md" >}}) to generate the TLS certificates with a SPIFFE id for authentication, which means the Sentry service either has to be running locally or deployed to your hosting environment such as a Kubernetes cluster.
The nodeappconfig example below shows how to **deny** access to the `neworder` method from the `pythonapp`, where the python app is in the `myDomain` trust domain and `default` namespace. The nodeapp is in the `public` trust domain.
diff --git a/daprdocs/content/en/operations/configuration/secret-scope.md b/daprdocs/content/en/operations/configuration/secret-scope.md
index 99603718e..a937f56e5 100644
--- a/daprdocs/content/en/operations/configuration/secret-scope.md
+++ b/daprdocs/content/en/operations/configuration/secret-scope.md
@@ -96,7 +96,7 @@ spec:
This example defines configuration for secret store named vault. The default access to the secret store is `deny`, whereas some secrets are accessible by the application based on the `allowedSecrets` list. Follow [these instructions]({{< ref configuration-overview.md >}}) to apply configuration to the sidecar.
-### Scenario 3: Deny access to certain senstive secrets in a secret store
+### Scenario 3: Deny access to certain sensitive secrets in a secret store
Define the following `config.yaml`:
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 b69b48ac0..4dcd439b4 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
@@ -99,7 +99,7 @@ Each container will receive a unique IP on that network and be able to communica
[Docker Compose](https://docs.docker.com/compose/) can be used to define multi-container application configurations. If you wish to run multiple apps with Dapr sidecars locally without Kubernetes then it is recommended to use a Docker Compose definition (`docker-compose.yml`).
-The syntax and tooling of Docker Compose is outside the scope of this article, however, it is recommended you refer to the [offical Docker documentation](https://docs.docker.com/compose/) for further details.
+The syntax and tooling of Docker Compose is outside the scope of this article, however, it is recommended you refer to the [official Docker documentation](https://docs.docker.com/compose/) for further details.
In order to run your applications using Dapr and Docker Compose you'll need to define the sidecar pattern in your `docker-compose.yml`. For example:
diff --git a/daprdocs/content/en/operations/monitoring/metrics/grafana.md b/daprdocs/content/en/operations/monitoring/metrics/grafana.md
index 8dd5c2c32..0b64a7316 100644
--- a/daprdocs/content/en/operations/monitoring/metrics/grafana.md
+++ b/daprdocs/content/en/operations/monitoring/metrics/grafana.md
@@ -156,7 +156,7 @@ First you need to connect Prometheus as a data source to Grafana.
1. Find the dashboard that you imported and enjoy
- 
+
{{% alert title="Tip" color="primary" %}}
Hover your mouse over the `i` in the corner to the description of each chart:
diff --git a/daprdocs/content/en/operations/troubleshooting/common_issues.md b/daprdocs/content/en/operations/troubleshooting/common_issues.md
index 1a7718858..9a802effa 100644
--- a/daprdocs/content/en/operations/troubleshooting/common_issues.md
+++ b/daprdocs/content/en/operations/troubleshooting/common_issues.md
@@ -223,6 +223,6 @@ In order for mDNS to function properly, ensure `Micorosft Content Filter` is ina
- Type `mdatp system-extension network-filter disable` and hit enter.
- Enter your account password.
-Microsoft Content Filter is disbaled when the output is "Success".
+Microsoft Content Filter is disabled when the output is "Success".
> Some organizations will re-enable the filter from time to time. If you repeatedly encounter app-id values missing, first check to see if the filter has been re-enabled before doing more extensive troubleshooting.
diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/http.md b/daprdocs/content/en/reference/components-reference/supported-bindings/http.md
index 474c4e9c5..f1d32550f 100644
--- a/daprdocs/content/en/reference/components-reference/supported-bindings/http.md
+++ b/daprdocs/content/en/reference/components-reference/supported-bindings/http.md
@@ -31,9 +31,9 @@ spec:
## Binding support
-This component supports **output binding** with the folowing [HTTP methods/verbs](https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html):
+This component supports **output binding** with the following [HTTP methods/verbs](https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html):
-- `create` : For backward compatability and treated like a post
+- `create` : For backward compatibility and treated like a post
- `get` : Read data/records
- `head` : Identical to get except that the server does not return a response body
- `post` : Typically used to create records or send commands
@@ -133,7 +133,7 @@ To send data to the HTTP endpoint, invoke the HTTP binding with a `POST`, `PUT`,
{{% alert title="Note" color="primary" %}}
Any metadata field that starts with a capital letter is passed as a request header.
-For example, the default content type is `application/json; charset=utf-8`. This can be overriden be setting the `Content-Type` metadata field.
+For example, the default content type is `application/json; charset=utf-8`. This can be overridden be setting the `Content-Type` metadata field.
{{% /alert %}}
```json
diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/zeebe-command.md b/daprdocs/content/en/reference/components-reference/supported-bindings/zeebe-command.md
index 48cb639e7..9947f7963 100644
--- a/daprdocs/content/en/reference/components-reference/supported-bindings/zeebe-command.md
+++ b/daprdocs/content/en/reference/components-reference/supported-bindings/zeebe-command.md
@@ -497,7 +497,7 @@ To perform a `fail-job` operation, invoke the Zeebe command binding with a `POST
"data": {
"jobKey": 2251799813685739,
"retries": 5,
- "errorMessage": "some error occured"
+ "errorMessage": "some error occurred"
},
"metadata": {},
"operation": "fail-job"
diff --git a/daprdocs/content/en/reference/components-reference/supported-middleware/middleware-opa.md b/daprdocs/content/en/reference/components-reference/supported-middleware/middleware-opa.md
index 1c10e6026..54b042284 100644
--- a/daprdocs/content/en/reference/components-reference/supported-middleware/middleware-opa.md
+++ b/daprdocs/content/en/reference/components-reference/supported-middleware/middleware-opa.md
@@ -99,7 +99,7 @@ This middleware supplies a [`HTTPRequest`](#httprequest) as input.
### HTTPRequest
-The `HTTPRequest` input contains all the revelant information about an incoming HTTP Request except it's body.
+The `HTTPRequest` input contains all the relevant information about an incoming HTTP Request except it's body.
```go
type Input struct {
diff --git a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-rabbitmq.md b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-rabbitmq.md
index b16a9392e..99191d4bc 100644
--- a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-rabbitmq.md
+++ b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-rabbitmq.md
@@ -51,7 +51,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
| deletedWhenUnused | N | Whether or not the queue should be configured to [auto-delete](https://www.rabbitmq.com/queues.html) Defaults to `"true"` | `"true"`, `"false"`
| autoAck | N | Whether or not the queue consumer should [auto-ack](https://www.rabbitmq.com/confirms.html) messages. Defaults to `"false"` | `"true"`, `"false"`
| deliveryMode | N | Persistence mode when publishing messages. Defaults to `"0"`. RabbitMQ treats `"2"` as persistent, all other numbers as non-persistent | `"0"`, `"2"`
-| requeueInFailure | N | Whether or not to requeue when sending a [negative acknolwedgement](https://www.rabbitmq.com/nack.html) in case of a failure. Defaults to `"false"` | `"true"`, `"false"`
+| requeueInFailure | N | Whether or not to requeue when sending a [negative acknowledgement](https://www.rabbitmq.com/nack.html) in case of a failure. Defaults to `"false"` | `"true"`, `"false"`
| prefetchCount | N | Number of messages to [prefetch](https://www.rabbitmq.com/consumer-prefetch.html). Consider changing this to a non-zero value for production environments. Defaults to `"0"`, which means that all available messages will be pre-fetched. | `"2"`
| reconnectWait | N | How long to wait (in seconds) before reconnecting if a connection failure occurs | `"0"`
| concurrencyMode | N | `parallel` is the default, and allows processing multiple messages in parallel (limited by the `app-max-concurrency` annotation, if configured). Set to `single` to disable parallel processing. In most situations there's no reason to change this. | `parallel`, `single`
diff --git a/daprdocs/content/en/reference/components-reference/supported-secret-stores/envvar-secret-store.md b/daprdocs/content/en/reference/components-reference/supported-secret-stores/envvar-secret-store.md
index bbb09d9cb..f5073bdbc 100644
--- a/daprdocs/content/en/reference/components-reference/supported-secret-stores/envvar-secret-store.md
+++ b/daprdocs/content/en/reference/components-reference/supported-secret-stores/envvar-secret-store.md
@@ -30,6 +30,6 @@ spec:
```
## Related Links
- [Secrets building block]({{< ref secrets >}})
-- [How-To: Retreive a secret]({{< ref "howto-secrets.md" >}})
+- [How-To: Retrieve a secret]({{< ref "howto-secrets.md" >}})
- [How-To: Reference secrets in Dapr components]({{< ref component-secrets.md >}})
- [Secrets API reference]({{< ref secrets_api.md >}})
\ No newline at end of file
diff --git a/daprdocs/content/en/reference/components-reference/supported-secret-stores/hashicorp-vault.md b/daprdocs/content/en/reference/components-reference/supported-secret-stores/hashicorp-vault.md
index 180e2d882..c342ba908 100644
--- a/daprdocs/content/en/reference/components-reference/supported-secret-stores/hashicorp-vault.md
+++ b/daprdocs/content/en/reference/components-reference/supported-secret-stores/hashicorp-vault.md
@@ -56,7 +56,7 @@ The above example uses secrets as plain strings. It is recommended to use a loca
| tlsServerName | N | TLS config server name | `"tls-server"` |
| vaultTokenMountPath | Y | Path to file containing token | `"path/to/file"` |
| vaultToken | Y | [Token](https://learn.hashicorp.com/tutorials/vault/tokens) for authentication within Vault. | `"tokenValue"` |
-| vaultKVPrefix | N | The prefix in vault. Defautls to `"dapr"` | `"dapr"`, `"myprefix"` |
+| vaultKVPrefix | N | The prefix in vault. Defaults to `"dapr"` | `"dapr"`, `"myprefix"` |
## Setup Hashicorp Vault instance
diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-tablestorage.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-tablestorage.md
index afa4a20c5..42f881cb4 100644
--- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-tablestorage.md
+++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-tablestorage.md
@@ -79,7 +79,7 @@ will create the following record in a table:
## Concurrency
-Azure Table Storage state concurrency is achieved by using `ETag`s according to [the official documenation]( https://docs.microsoft.com/en-us/azure/storage/common/storage-concurrency#managing-concurrency-in-table-storage).
+Azure Table Storage state concurrency is achieved by using `ETag`s according to [the official documentation]( https://docs.microsoft.com/en-us/azure/storage/common/storage-concurrency#managing-concurrency-in-table-storage).
## Related links
diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mongodb.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mongodb.md
index 255b604f3..ea9759464 100644
--- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mongodb.md
+++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mongodb.md
@@ -63,7 +63,7 @@ If you wish to use MongoDB as an actor store, append the following to the yaml.
| collectionName | N | The name of the collection to use. Defaults to `"daprCollection"` | `"daprCollection"`
| writeconcern | N | The write concern to use | `"majority"`
| readconcern | N | The read concern to use | `"majority"`, `"local"`,`"available"`, `"linearizable"`, `"snapshot"`
-| operationTimeout | N | The timeout for the operation. Defautls to `"5s"` | `"5s"`
+| operationTimeout | N | The timeout for the operation. Defaults to `"5s"` | `"5s"`
## Setup MongoDB
diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-zookeeper.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-zookeeper.md
index 0a4d98c17..6e4ef0d42 100644
--- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-zookeeper.md
+++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-zookeeper.md
@@ -44,7 +44,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
| servers | Y | Comma delimited list of servers | `"zookeeper.default.svc.cluster.local:2181"`
| sessionTimeout | Y | The session timeout value | `"5s"`
| maxBufferSize | N | The maximum size of buffer. Defaults to `"1048576"` | `"1048576"`
-| maxConnBufferSize | N | The maximum size of connection buffer. Defautls to `"1048576`" | `"1048576"`
+| maxConnBufferSize | N | The maximum size of connection buffer. Defaults to `"1048576`" | `"1048576"`
| keyPrefixPath | N | The key prefix path in Zookeeper. No default | `"dapr"`
## Setup Zookeeper
diff --git a/daprdocs/static/docs/azm-config-map.yaml b/daprdocs/static/docs/azm-config-map.yaml
index 3b1adb133..3a35e8e3d 100644
--- a/daprdocs/static/docs/azm-config-map.yaml
+++ b/daprdocs/static/docs/azm-config-map.yaml
@@ -12,12 +12,12 @@ data:
# Any errors related to config map settings can be found in the KubeMonAgentEvents table in the Log Analytics workspace that the cluster is sending data to.
[log_collection_settings]
[log_collection_settings.stdout]
- # In the absense of this configmap, default value for enabled is true
+ # In the absence of this configmap, default value for enabled is true
enabled = true
# exclude_namespaces setting holds good only if enabled is set to true
# kube-system log collection is disabled by default in the absence of 'log_collection_settings.stdout' setting. If you want to enable kube-system, remove it from the following setting.
# If you want to continue to disable kube-system log collection keep this namespace in the following setting and add any other namespace you want to disable log collection to the array.
- # In the absense of this configmap, default value for exclude_namespaces = ["kube-system"]
+ # In the absence of this configmap, default value for exclude_namespaces = ["kube-system"]
exclude_namespaces = ["kube-system"]
[log_collection_settings.stderr]
# Default value for enabled is true
@@ -25,17 +25,17 @@ data:
# exclude_namespaces setting holds good only if enabled is set to true
# kube-system log collection is disabled by default in the absence of 'log_collection_settings.stderr' setting. If you want to enable kube-system, remove it from the following setting.
# If you want to continue to disable kube-system log collection keep this namespace in the following setting and add any other namespace you want to disable log collection to the array.
- # In the absense of this cofigmap, default value for exclude_namespaces = ["kube-system"]
+ # In the absence of this cofigmap, default value for exclude_namespaces = ["kube-system"]
exclude_namespaces = ["kube-system"]
[log_collection_settings.env_var]
- # In the absense of this configmap, default value for enabled is true
+ # In the absence of this configmap, default value for enabled is true
enabled = true
[log_collection_settings.enrich_container_logs]
- # In the absense of this configmap, default value for enrich_container_logs is false
+ # In the absence of this configmap, default value for enrich_container_logs is false
enabled = true
# When this is enabled (enabled = true), every container log entry (both stdout & stderr) will be enriched with container Name & container Image
[log_collection_settings.collect_all_kube_events]
- # In the absense of this configmap, default value for collect_all_kube_events is false
+ # In the absence of this configmap, default value for collect_all_kube_events is false
# When the setting is set to false, only the kube events with !normal event type will be collected
enabled = false
# When this is enabled (enabled = true), all kube events including normal events will be collected
From 565378441f4e68a0044f9bbdf6a7660073b57cbb Mon Sep 17 00:00:00 2001
From: Nick Greenfield
Date: Fri, 16 Jul 2021 15:29:29 -0700
Subject: [PATCH 30/34] Ensure MiniKube start command works by removing
Kubernetes version and authorization params
---
.../en/operations/hosting/kubernetes/cluster/setup-minikube.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md
index 8222d7f0b..ef1d0110d 100644
--- a/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md
@@ -31,7 +31,7 @@ minikube config set vm-driver [driver_name]
Use 1.13.x or newer version of Kubernetes with `--kubernetes-version`
```bash
-minikube start --cpus=4 --memory=4096 --kubernetes-version=1.16.2 --extra-config=apiserver.authorization-mode=RBAC
+minikube start --cpus=4 --memory=4096
```
3. Enable dashboard and ingress addons
From 2bd4b10085e7bc7f0260377aba3fa10b921fc305 Mon Sep 17 00:00:00 2001
From: greenie-msft <56556602+greenie-msft@users.noreply.github.com>
Date: Wed, 21 Jul 2021 12:26:02 -0700
Subject: [PATCH 31/34] Clarify path to secrets file in getting started guides
(#1585)
* Clarify path to secrets file in getting started guides
* Clarify path to local secret store
Co-authored-by: Ori Zohar
Co-authored-by: Aaron Crawfis
---
.../building-blocks/secrets/howto-secrets.md | 3 +++
daprdocs/content/en/getting-started/get-started-component.md | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md b/daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md
index de8e1d221..4ada756ba 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md
@@ -42,6 +42,9 @@ spec:
Make sure to replace `` with the path to the JSON file you just created.
+>Note: the path to the secret store JSON is relative to where you call `dapr run` from.
+
+
To configure a different kind of secret store see the guidance on [how to configure a secret store]({{}}) and review [supported secret stores]({{}}) to see specific details required for different secret store solutions.
## Get a secret
diff --git a/daprdocs/content/en/getting-started/get-started-component.md b/daprdocs/content/en/getting-started/get-started-component.md
index 6781bac40..a8e05dc5a 100644
--- a/daprdocs/content/en/getting-started/get-started-component.md
+++ b/daprdocs/content/en/getting-started/get-started-component.md
@@ -55,7 +55,7 @@ spec:
value: ":"
```
-You can see that the above file definition has a `type: secretstores.local.file` which tells Dapr to use the local file component as a secret store. The metadata fields provide component specific information needed to work with this component (in this case, the path to the secret store JSON)
+You can see that the above file definition has a `type: secretstores.local.file` which tells Dapr to use the local file component as a secret store. The metadata fields provide component specific information needed to work with this component (in this case, the path to the secret store JSON is relative to where you call `dapr run` from.)
## Step 3: Run the Dapr sidecar
From b01c969335ee5772999915243bdaccd225dc4aa0 Mon Sep 17 00:00:00 2001
From: sk593
Date: Thu, 22 Jul 2021 15:02:20 -0500
Subject: [PATCH 32/34] added arguments and annotations spec
---
.../howto-invoke-discover-services.md | 2 +-
.../configuration/configuration-overview.md | 2 +-
.../configuration/increase-request-size.md | 2 +-
.../kubernetes/kubernetes-annotations.md | 38 -------------
.../hosting/kubernetes/kubernetes-overview.md | 2 +-
.../kubernetes/kubernetes-production.md | 2 +-
.../self-hosted/self-hosted-overview.md | 2 +-
.../troubleshooting/common_issues.md | 2 +-
.../arguments-annotations-overview.md | 54 +++++++++++++++++++
.../content/en/reference/cli/cli-overview.md | 2 +-
daprdocs/content/en/reference/cli/dapr-run.md | 2 +-
11 files changed, 63 insertions(+), 47 deletions(-)
delete mode 100644 daprdocs/content/en/operations/hosting/kubernetes/kubernetes-annotations.md
create mode 100644 daprdocs/content/en/reference/arguments-annotations-overview.md
diff --git a/daprdocs/content/en/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md b/daprdocs/content/en/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md
index 91022eb00..0c21d7dbb 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/service-invocation/howto-invoke-discover-services.md
@@ -57,7 +57,7 @@ spec:
dapr.io/app-port: "5000"
...
```
-*If your app uses an SSL connection, you can tell Dapr to invoke your app over an insecure SSL connection with the `app-ssl: "true"` annotation (full list [here]({{< ref kubernetes-annotations.md >}}))*
+*If your app uses an SSL connection, you can tell Dapr to invoke your app over an insecure SSL connection with the `app-ssl: "true"` annotation (full list [here]({{< ref arguments-annotations-overview.md >}}))*
{{% /codetab %}}
diff --git a/daprdocs/content/en/operations/configuration/configuration-overview.md b/daprdocs/content/en/operations/configuration/configuration-overview.md
index e027eda25..5059a8d58 100644
--- a/daprdocs/content/en/operations/configuration/configuration-overview.md
+++ b/daprdocs/content/en/operations/configuration/configuration-overview.md
@@ -37,7 +37,7 @@ A Dapr sidecar can apply a specific configuration by using a ```dapr.io/config``
dapr.io/app-port: "3000"
dapr.io/config: "myappconfig"
```
-Note: There are more [Kubernetes annotations]({{< ref "kubernetes-annotations.md" >}}) available to configure the Dapr sidecar on activation by sidecar Injector system service.
+Note: There are more [Kubernetes annotations]({{< ref "arguments-annotations-overview.md" >}}) available to configure the Dapr sidecar on activation by sidecar Injector system service.
### Sidecar configuration settings
diff --git a/daprdocs/content/en/operations/configuration/increase-request-size.md b/daprdocs/content/en/operations/configuration/increase-request-size.md
index a71eff13f..118dfaa3a 100644
--- a/daprdocs/content/en/operations/configuration/increase-request-size.md
+++ b/daprdocs/content/en/operations/configuration/increase-request-size.md
@@ -57,4 +57,4 @@ spec:
{{< /tabs >}}
## Related links
-- [Dapr Kubernetes pod annotations spec]({{< ref kubernetes-annotations.md >}})
+- [Dapr Kubernetes pod annotations spec]({{< ref arguments-annotations-overview.md >}})
diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-annotations.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-annotations.md
deleted file mode 100644
index 454434820..000000000
--- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-annotations.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-type: docs
-title: "Dapr Kubernetes pod annotations spec"
-linkTitle: "Kubernetes annotations"
-weight: 50000
-description: "The available annotations available when configuring Dapr in your Kubernetes environment"
----
-
-The following table shows all the supported pod Spec annotations supported by Dapr.
-
-| Annotation | Description |
-|---------------------------------------------------|-------------|
-| `dapr.io/enabled` | Setting this paramater to `true` injects the Dapr sidecar into the pod
-| `dapr.io/app-port` | This parameter tells Dapr which port your application is listening on
-| `dapr.io/app-id` | The unique ID of the application. Used for service discovery, state encapsulation and the pub/sub consumer ID
-| `dapr.io/log-level` | Sets the log level for the Dapr sidecar. Allowed values are `debug`, `info`, `warn`, `error`. Default is `info`
-| `dapr.io/config` | Tells Dapr which Configuration CRD to use
-| `dapr.io/log-as-json` | Setting this parameter to `true` outputs logs in JSON format. Default is `false`
-| `dapr.io/enable-profiling` | Setting this paramater to `true` starts the Dapr profiling server on port `7777`. Default is `false`
-| `dapr.io/api-token-secret` | Tells Dapr which Kubernetes secret to use for token based API authentication. By default this is not set.
-| `dapr.io/app-protocol` | Tells Dapr which protocol your application is using. Valid options are `http` and `grpc`. Default is `http`
-| `dapr.io/app-max-concurrency` | Limit the concurrency of your application. A valid value is any number larger than `0`
-| `dapr.io/app-ssl` | Tells Dapr to invoke the app over an insecure SSL connection. Applies to both HTTP and gRPC. Traffic between your app and the Dapr sidecar is encrypted with a certificate issued by a non-trusted certificate authority, which is considered insecure. Default is `false`.
-| `dapr.io/metrics-port` | Sets the port for the sidecar metrics server. Default is `9090`
-| `dapr.io/sidecar-cpu-limit` | Maximum amount of CPU that the Dapr sidecar can use. See valid values [here](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/). By default this is not set
-| `dapr.io/sidecar-memory-limit` | Maximum amount of Memory that the Dapr sidecar can use. See valid values [here](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/). By default this is not set
-| `dapr.io/sidecar-cpu-request` | Amount of CPU that the Dapr sidecar requests. See valid values [here](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/). By default this is not set
-| `dapr.io/sidecar-memory-request` | Amount of Memory that the Dapr sidecar requests .See valid values [here](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/). By default this is not set
-| `dapr.io/sidecar-liveness-probe-delay-seconds` | Number of seconds after the sidecar container has started before liveness probe is initiated. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
-| `dapr.io/sidecar-liveness-probe-timeout-seconds` | Number of seconds after which the sidecar liveness probe times out. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
-| `dapr.io/sidecar-liveness-probe-period-seconds` | How often (in seconds) to perform the sidecar liveness probe. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `6`
-| `dapr.io/sidecar-liveness-probe-threshold` | When the sidecar liveness probe fails, Kubernetes will try N times before giving up. In this case, the Pod will be marked Unhealthy. Read more about `failureThreshold` [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
-| `dapr.io/sidecar-readiness-probe-delay-seconds` | Number of seconds after the sidecar container has started before readiness probe is initiated. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
-| `dapr.io/sidecar-readiness-probe-timeout-seconds` | Number of seconds after which the sidecar readiness probe times out. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
-| `dapr.io/sidecar-readiness-probe-period-seconds` | How often (in seconds) to perform the sidecar readiness probe. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `6`
-| `dapr.io/sidecar-readiness-probe-threshold` | When the sidecar readiness probe fails, Kubernetes will try N times before giving up. In this case, the Pod will be marked Unready. Read more about `failureThreshold` [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
-| `dapr.io/http-max-request-size` | Increasing max size of request body http and grpc servers parameter in MB to handle uploading of big files. Default is `4` MB
-| `dapr.io/env` | List of environment variable to be injected into the sidecar. Strings consisting of key=value pairs separated by a comma.
diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
index 36e5efe72..397bc1d7a 100644
--- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
@@ -22,7 +22,7 @@ Read [this guide]({{< ref kubernetes-deploy.md >}}) to learn how to deploy Dapr
## Adding Dapr to a Kubernetes deployment
-Deploying and running a Dapr enabled application into your Kubernetes cluster is as simple as adding a few annotations to the deployment schemes. To give your service an `id` and `port` known to Dapr, turn on tracing through configuration and launch the Dapr sidecar container, you annotate your Kubernetes deployment like this. For more information check [dapr annotations]({{< ref kubernetes-annotations.md >}})
+Deploying and running a Dapr enabled application into your Kubernetes cluster is as simple as adding a few annotations to the deployment schemes. To give your service an `id` and `port` known to Dapr, turn on tracing through configuration and launch the Dapr sidecar container, you annotate your Kubernetes deployment like this. For more information check [dapr annotations]({{< ref arguments-annotations-overview.md >}})
```yml
annotations:
diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md
index a3d2695b5..1a4f2b875 100644
--- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md
@@ -35,7 +35,7 @@ The following Dapr control plane deployments are optional:
## Sidecar resource settings
-To set the resource assignments for the Dapr sidecar, see the annotations [here]({{< ref "kubernetes-annotations.md" >}}).
+To set the resource assignments for the Dapr sidecar, see the annotations [here]({{< ref "arguments-annotations-overview.md" >}}).
The specific annotations related to resource constraints are:
- `dapr.io/sidecar-cpu-limit`
diff --git a/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-overview.md b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-overview.md
index 9077cc9ee..49a417b9f 100644
--- a/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-overview.md
+++ b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-overview.md
@@ -23,7 +23,7 @@ The `dapr-placement` service is responsible for managing the actor distribution
## Launching applications with Dapr
-You can use the [`dapr run` CLI command]({{< ref dapr-run.md >}}) to a Dapr sidecar process along with your application.
+You can use the [`dapr run` CLI command]({{< ref dapr-run.md >}}) to a Dapr sidecar process along with your application. Additional arguments and flags can be found [here]({{< ref arguments-annotations-overview.md >}}).
## Name resolution
diff --git a/daprdocs/content/en/operations/troubleshooting/common_issues.md b/daprdocs/content/en/operations/troubleshooting/common_issues.md
index 9a802effa..230c1d135 100644
--- a/daprdocs/content/en/operations/troubleshooting/common_issues.md
+++ b/daprdocs/content/en/operations/troubleshooting/common_issues.md
@@ -91,7 +91,7 @@ The most common cause of this failure is that a component (such as a state store
To diagnose the root cause:
-- Significantly increase the liveness probe delay - [link]({{< ref "kubernetes-annotations.md" >}})
+- Significantly increase the liveness probe delay - [link]({{< ref "arguments-annotations-overview.md" >}})
- Set the log level of the sidecar to debug - [link]({{< ref "logs-troubleshooting.md#setting-the-sidecar-log-level" >}})
- Watch the logs for meaningful information - [link]({{< ref "logs-troubleshooting.md#viewing-logs-on-kubernetes" >}})
diff --git a/daprdocs/content/en/reference/arguments-annotations-overview.md b/daprdocs/content/en/reference/arguments-annotations-overview.md
new file mode 100644
index 000000000..bbc66814a
--- /dev/null
+++ b/daprdocs/content/en/reference/arguments-annotations-overview.md
@@ -0,0 +1,54 @@
+---
+type: docs
+title: "Dapr arguments and annotations for daprd, CLI, and Kubernetes"
+linkTitle: "Arguments and annotations"
+description: "The arguments and annotations available when configuring Dapr in different environments"
+weight: 300
+aliases:
+ - "/operations/hosting/kubernetes/kubernetes-annotations/"
+---
+
+The following table shows all the annotations supported by Dapr. This table is meant to help users understand the equivalent options for running Dapr sidecars in different contexts--via the [CLI]({{< ref cli-overview.md >}}) directly, via daprd, or on [Kubernetes]({{< ref kubernetes-overview.md >}}) via annotations.
+
+| daprd | dapr CLI | CLI shorthand | K8s annotations | Description
+|----- | ------- | -----------| ----------| ------------ | ------------ |
+| `--allowed-origins` | not supported | | not supported | Allowed HTTP origins (default "*") |
+| `--app-id` | `--app-id` | `-i` | `dapr.io/app-id` | The unique ID of the application. Used for service discovery, state encapsulation and the pub/sub consumer ID |
+| `--app-port` | `--app-port` | `-p` | `dapr.io/app-port` | This parameter tells Dapr which port your application is listening on |
+| `--app-ssl` | `--app-ssl` | | `dapr.io/app-ssl` | Sets the URI scheme of the app to https and attempts an SSL connection |
+| `--components-path` | `--components-path` | `-d` | not supported | Path for components directory. If empty, components will not be loaded. |
+| `--config` | `--config` | `-c` | `dapr.io/config` | Tells Dapr which Configuration CRD to use |
+| `--control-plane-address` | not supported | | not supported | Address for a Dapr control plane |
+| `--dapr-grpc-port` | `--dapr-grpc-port` | | not supported | gRPC port for the Dapr API to listen on (default "50001") |
+| `--dapr-http-port` | `--dapr-http-port` | | not supported | The HTTP port for the Dapr API |
+|` --dapr-http-max-request-size` | --dapr-http-max-request-size | | `dapr.io/http-max-request-size` | Increasing max size of request body http and grpc servers parameter in MB to handle uploading of big files. Default is `4` MB |
+| not supported | `--image` | | not supported
+| `--internal-grpc-port` | not supported | | not supported | gRPC port for the Dapr Internal API to listen on |
+| `--enable-metrics` | not supported | | configuration spec | Enable prometheus metric (default true) |
+| `--enable-mtls` | not supported | | configuration spec | Enables automatic mTLS for daprd to daprd communication channels |
+| `--enable-profiling` | `--enable-profiling` | | `dapr.io/enable-profiling` | Enable profiling |
+| `--log-as-json` | not supported | | `dapr.io/log-as-json` | Setting this parameter to `true` outputs logs in JSON format. Default is `false` |
+| `--log-level` | `--log-level` | | `dapr.io/log-level` | Sets the log level for the Dapr sidecar. Allowed values are `debug`, `info`, `warn`, `error`. Default is `info` |
+| `--app-max-concurrency` | `--app-max-concurrency` | | `dapr.io/app-max-concurrency` | Limit the concurrency of your application. A valid value is any number larger than `0`
+| `--metrics-port` | `--metrics-port` | | `dapr.io/metrics-port` | Sets the port for the sidecar metrics server. Default is `9090` |
+| `--mode` | not supported | | not supported | Runtime mode for Dapr (default "standalone") |
+| `--placement-address` | `--placement-address` | | not supported | Addresses for Dapr Actor Placement servers |
+| `--profiling-port` | `--profiling-port` | | not supported | The port for the profile server (default "7777") |
+| `--app-protocol` | `--app-protocol` | `-P` | `dapr.io/app-protocol` | Tells Dapr which protocol your application is using. Valid options are `http` and `grpc`. Default is `http` |
+| `--sentry-address` | `--sentry-address` | | not supported | Address for the Sentry CA service |
+| `--version` | `--version` | `-v` | not supported | Prints the runtime version |
+| not supported | not supported | | `dapr.io/enabled` | Setting this paramater to true injects the Dapr sidecar into the pod |
+| not supported | not supported | | `dapr.io/api-token-secret` | Tells Dapr which Kubernetes secret to use for token based API authentication. By default this is not set |
+| not supported | not supported | | `dapr.io/sidecar-cpu-limit` | Maximum amount of CPU that the Dapr sidecar can use. See valid values [here](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/). By default this is not set
+| not supported | not supported | | `dapr.io/sidecar-memory-limit` | Maximum amount of Memory that the Dapr sidecar can use. See valid values [here](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/). By default this is not set
+| not supported | not supported | | `dapr.io/sidecar-cpu-request` | Amount of CPU that the Dapr sidecar requests. See valid values [here](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/). By default this is not set
+| not supported | not supported | | `dapr.io/sidecar-memory-request` | Amount of Memory that the Dapr sidecar requests .See valid values [here](https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/). By default this is not set
+| not supported | not supported | | `dapr.io/sidecar-liveness-probe-delay-seconds` | Number of seconds after the sidecar container has started before liveness probe is initiated. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
+| not supported | not supported | | `dapr.io/sidecar-liveness-probe-timeout-seconds` | Number of seconds after which the sidecar liveness probe times out. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
+| not supported | not supported | | `dapr.io/sidecar-liveness-probe-period-seconds` | How often (in seconds) to perform the sidecar liveness probe. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `6`
+| not supported | not supported | | `dapr.io/sidecar-liveness-probe-threshold` | When the sidecar liveness probe fails, Kubernetes will try N times before giving up. In this case, the Pod will be marked Unhealthy. Read more about `failureThreshold` [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
+| not supported | not supported | | `dapr.io/sidecar-readiness-probe-delay-seconds` | Number of seconds after the sidecar container has started before readiness probe is initiated. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
+| not supported | not supported | | `dapr.io/sidecar-readiness-probe-timeout-seconds` | Number of seconds after which the sidecar readiness probe times out. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
+| not supported | not supported | | `dapr.io/sidecar-readiness-probe-period-seconds` | How often (in seconds) to perform the sidecar readiness probe. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `6`
+| not supported | not supported | | `dapr.io/sidecar-readiness-probe-threshold` | When the sidecar readiness probe fails, Kubernetes will try N times before giving up. In this case, the Pod will be marked Unready. Read more about `failureThreshold` [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
+| not supported | not supported | | `dapr.io/env` | List of environment variable to be injected into the sidecar. Strings consisting of key=value pairs separated by a comma.
\ No newline at end of file
diff --git a/daprdocs/content/en/reference/cli/cli-overview.md b/daprdocs/content/en/reference/cli/cli-overview.md
index 12497fed6..661dc7a22 100644
--- a/daprdocs/content/en/reference/cli/cli-overview.md
+++ b/daprdocs/content/en/reference/cli/cli-overview.md
@@ -50,7 +50,7 @@ Use "dapr [command] --help" for more information about a command.
## Command Reference
-You can learn more about each Dapr command from the links below.
+You can learn more about each Dapr command from the links below. A full list comparing daprd, CLI, and Kubernetes arguments/annotations can be found [here]({{< ref "arguments-annotations-overview.md" >}}).
- [`dapr completion`]({{< ref dapr-completion.md >}})
- [`dapr components`]({{< ref dapr-components.md >}})
diff --git a/daprdocs/content/en/reference/cli/dapr-run.md b/daprdocs/content/en/reference/cli/dapr-run.md
index fb48c9c7e..cfeedee1e 100644
--- a/daprdocs/content/en/reference/cli/dapr-run.md
+++ b/daprdocs/content/en/reference/cli/dapr-run.md
@@ -7,7 +7,7 @@ description: "Detailed information on the run CLI command"
## Description
-Run Dapr and (optionally) your application side by side.
+Run Dapr and (optionally) your application side by side. A full list comparing daprd arguments, CLI arguments, and Kubernetes annotations can be found [here]({{< ref arguments-annotations-overview.md >}}).
## Supported platforms
From 8c18cc399c9167596a4090dcedb96fa0e260ecee Mon Sep 17 00:00:00 2001
From: Shruthi Kumar
Date: Thu, 22 Jul 2021 17:52:20 -0500
Subject: [PATCH 33/34] Update
daprdocs/content/en/reference/arguments-annotations-overview.md
Co-authored-by: Ori Zohar
---
.../content/en/reference/arguments-annotations-overview.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daprdocs/content/en/reference/arguments-annotations-overview.md b/daprdocs/content/en/reference/arguments-annotations-overview.md
index bbc66814a..a428b73cc 100644
--- a/daprdocs/content/en/reference/arguments-annotations-overview.md
+++ b/daprdocs/content/en/reference/arguments-annotations-overview.md
@@ -8,7 +8,7 @@ aliases:
- "/operations/hosting/kubernetes/kubernetes-annotations/"
---
-The following table shows all the annotations supported by Dapr. This table is meant to help users understand the equivalent options for running Dapr sidecars in different contexts--via the [CLI]({{< ref cli-overview.md >}}) directly, via daprd, or on [Kubernetes]({{< ref kubernetes-overview.md >}}) via annotations.
+This table is meant to help users understand the equivalent options for running Dapr sidecars in different contexts--via the [CLI]({{< ref cli-overview.md >}}) directly, via daprd, or on [Kubernetes]({{< ref kubernetes-overview.md >}}) via annotations.
| daprd | dapr CLI | CLI shorthand | K8s annotations | Description
|----- | ------- | -----------| ----------| ------------ | ------------ |
@@ -51,4 +51,4 @@ The following table shows all the annotations supported by Dapr. This table is m
| not supported | not supported | | `dapr.io/sidecar-readiness-probe-timeout-seconds` | Number of seconds after which the sidecar readiness probe times out. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
| not supported | not supported | | `dapr.io/sidecar-readiness-probe-period-seconds` | How often (in seconds) to perform the sidecar readiness probe. Read more [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `6`
| not supported | not supported | | `dapr.io/sidecar-readiness-probe-threshold` | When the sidecar readiness probe fails, Kubernetes will try N times before giving up. In this case, the Pod will be marked Unready. Read more about `failureThreshold` [here](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes). Default is `3`
-| not supported | not supported | | `dapr.io/env` | List of environment variable to be injected into the sidecar. Strings consisting of key=value pairs separated by a comma.
\ No newline at end of file
+| not supported | not supported | | `dapr.io/env` | List of environment variable to be injected into the sidecar. Strings consisting of key=value pairs separated by a comma.
From 5b4cebb068941ed4b8bff84345441aad3f8c7539 Mon Sep 17 00:00:00 2001
From: sk593
Date: Thu, 22 Jul 2021 17:54:04 -0500
Subject: [PATCH 34/34] removed link
---
daprdocs/content/en/reference/cli/cli-overview.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daprdocs/content/en/reference/cli/cli-overview.md b/daprdocs/content/en/reference/cli/cli-overview.md
index 661dc7a22..a7192bddb 100644
--- a/daprdocs/content/en/reference/cli/cli-overview.md
+++ b/daprdocs/content/en/reference/cli/cli-overview.md
@@ -50,7 +50,7 @@ Use "dapr [command] --help" for more information about a command.
## Command Reference
-You can learn more about each Dapr command from the links below. A full list comparing daprd, CLI, and Kubernetes arguments/annotations can be found [here]({{< ref "arguments-annotations-overview.md" >}}).
+You can learn more about each Dapr command from the links below.
- [`dapr completion`]({{< ref dapr-completion.md >}})
- [`dapr components`]({{< ref dapr-components.md >}})
[Flask]({{< ref python-flask.md >}}) | | [Java](https://github.com/dapr/java-sdk) | Stable | ✔ | Spring Boot | ✔ | -| [Go](https://github.com/dapr/go-sdk) | Stable | ✔ | ✔ | | +| [Go]({{< ref go >}}) | Stable | ✔ | ✔ | | | [PHP]({{< ref php >}}) | Stable | ✔ | ✔ | ✔ | | [C++](https://github.com/dapr/cpp-sdk) | In development | ✔ | | | [Rust](https://github.com/dapr/rust-sdk) | In development | ✔ | | | From 40fd8cb5287a1217931b3914ae55333c4bc030d0 Mon Sep 17 00:00:00 2001 From: Nick Greenfield
+
{{% alert title="Tip" color="primary" %}}
Hover your mouse over the `i` in the corner to the description of each chart:
diff --git a/daprdocs/content/en/operations/troubleshooting/common_issues.md b/daprdocs/content/en/operations/troubleshooting/common_issues.md
index 1a7718858..9a802effa 100644
--- a/daprdocs/content/en/operations/troubleshooting/common_issues.md
+++ b/daprdocs/content/en/operations/troubleshooting/common_issues.md
@@ -223,6 +223,6 @@ In order for mDNS to function properly, ensure `Micorosft Content Filter` is ina
- Type `mdatp system-extension network-filter disable` and hit enter.
- Enter your account password.
-Microsoft Content Filter is disbaled when the output is "Success".
+Microsoft Content Filter is disabled when the output is "Success".
> Some organizations will re-enable the filter from time to time. If you repeatedly encounter app-id values missing, first check to see if the filter has been re-enabled before doing more extensive troubleshooting.
diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/http.md b/daprdocs/content/en/reference/components-reference/supported-bindings/http.md
index 474c4e9c5..f1d32550f 100644
--- a/daprdocs/content/en/reference/components-reference/supported-bindings/http.md
+++ b/daprdocs/content/en/reference/components-reference/supported-bindings/http.md
@@ -31,9 +31,9 @@ spec:
## Binding support
-This component supports **output binding** with the folowing [HTTP methods/verbs](https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html):
+This component supports **output binding** with the following [HTTP methods/verbs](https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html):
-- `create` : For backward compatability and treated like a post
+- `create` : For backward compatibility and treated like a post
- `get` : Read data/records
- `head` : Identical to get except that the server does not return a response body
- `post` : Typically used to create records or send commands
@@ -133,7 +133,7 @@ To send data to the HTTP endpoint, invoke the HTTP binding with a `POST`, `PUT`,
{{% alert title="Note" color="primary" %}}
Any metadata field that starts with a capital letter is passed as a request header.
-For example, the default content type is `application/json; charset=utf-8`. This can be overriden be setting the `Content-Type` metadata field.
+For example, the default content type is `application/json; charset=utf-8`. This can be overridden be setting the `Content-Type` metadata field.
{{% /alert %}}
```json
diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/zeebe-command.md b/daprdocs/content/en/reference/components-reference/supported-bindings/zeebe-command.md
index 48cb639e7..9947f7963 100644
--- a/daprdocs/content/en/reference/components-reference/supported-bindings/zeebe-command.md
+++ b/daprdocs/content/en/reference/components-reference/supported-bindings/zeebe-command.md
@@ -497,7 +497,7 @@ To perform a `fail-job` operation, invoke the Zeebe command binding with a `POST
"data": {
"jobKey": 2251799813685739,
"retries": 5,
- "errorMessage": "some error occured"
+ "errorMessage": "some error occurred"
},
"metadata": {},
"operation": "fail-job"
diff --git a/daprdocs/content/en/reference/components-reference/supported-middleware/middleware-opa.md b/daprdocs/content/en/reference/components-reference/supported-middleware/middleware-opa.md
index 1c10e6026..54b042284 100644
--- a/daprdocs/content/en/reference/components-reference/supported-middleware/middleware-opa.md
+++ b/daprdocs/content/en/reference/components-reference/supported-middleware/middleware-opa.md
@@ -99,7 +99,7 @@ This middleware supplies a [`HTTPRequest`](#httprequest) as input.
### HTTPRequest
-The `HTTPRequest` input contains all the revelant information about an incoming HTTP Request except it's body.
+The `HTTPRequest` input contains all the relevant information about an incoming HTTP Request except it's body.
```go
type Input struct {
diff --git a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-rabbitmq.md b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-rabbitmq.md
index b16a9392e..99191d4bc 100644
--- a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-rabbitmq.md
+++ b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-rabbitmq.md
@@ -51,7 +51,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
| deletedWhenUnused | N | Whether or not the queue should be configured to [auto-delete](https://www.rabbitmq.com/queues.html) Defaults to `"true"` | `"true"`, `"false"`
| autoAck | N | Whether or not the queue consumer should [auto-ack](https://www.rabbitmq.com/confirms.html) messages. Defaults to `"false"` | `"true"`, `"false"`
| deliveryMode | N | Persistence mode when publishing messages. Defaults to `"0"`. RabbitMQ treats `"2"` as persistent, all other numbers as non-persistent | `"0"`, `"2"`
-| requeueInFailure | N | Whether or not to requeue when sending a [negative acknolwedgement](https://www.rabbitmq.com/nack.html) in case of a failure. Defaults to `"false"` | `"true"`, `"false"`
+| requeueInFailure | N | Whether or not to requeue when sending a [negative acknowledgement](https://www.rabbitmq.com/nack.html) in case of a failure. Defaults to `"false"` | `"true"`, `"false"`
| prefetchCount | N | Number of messages to [prefetch](https://www.rabbitmq.com/consumer-prefetch.html). Consider changing this to a non-zero value for production environments. Defaults to `"0"`, which means that all available messages will be pre-fetched. | `"2"`
| reconnectWait | N | How long to wait (in seconds) before reconnecting if a connection failure occurs | `"0"`
| concurrencyMode | N | `parallel` is the default, and allows processing multiple messages in parallel (limited by the `app-max-concurrency` annotation, if configured). Set to `single` to disable parallel processing. In most situations there's no reason to change this. | `parallel`, `single`
diff --git a/daprdocs/content/en/reference/components-reference/supported-secret-stores/envvar-secret-store.md b/daprdocs/content/en/reference/components-reference/supported-secret-stores/envvar-secret-store.md
index bbb09d9cb..f5073bdbc 100644
--- a/daprdocs/content/en/reference/components-reference/supported-secret-stores/envvar-secret-store.md
+++ b/daprdocs/content/en/reference/components-reference/supported-secret-stores/envvar-secret-store.md
@@ -30,6 +30,6 @@ spec:
```
## Related Links
- [Secrets building block]({{< ref secrets >}})
-- [How-To: Retreive a secret]({{< ref "howto-secrets.md" >}})
+- [How-To: Retrieve a secret]({{< ref "howto-secrets.md" >}})
- [How-To: Reference secrets in Dapr components]({{< ref component-secrets.md >}})
- [Secrets API reference]({{< ref secrets_api.md >}})
\ No newline at end of file
diff --git a/daprdocs/content/en/reference/components-reference/supported-secret-stores/hashicorp-vault.md b/daprdocs/content/en/reference/components-reference/supported-secret-stores/hashicorp-vault.md
index 180e2d882..c342ba908 100644
--- a/daprdocs/content/en/reference/components-reference/supported-secret-stores/hashicorp-vault.md
+++ b/daprdocs/content/en/reference/components-reference/supported-secret-stores/hashicorp-vault.md
@@ -56,7 +56,7 @@ The above example uses secrets as plain strings. It is recommended to use a loca
| tlsServerName | N | TLS config server name | `"tls-server"` |
| vaultTokenMountPath | Y | Path to file containing token | `"path/to/file"` |
| vaultToken | Y | [Token](https://learn.hashicorp.com/tutorials/vault/tokens) for authentication within Vault. | `"tokenValue"` |
-| vaultKVPrefix | N | The prefix in vault. Defautls to `"dapr"` | `"dapr"`, `"myprefix"` |
+| vaultKVPrefix | N | The prefix in vault. Defaults to `"dapr"` | `"dapr"`, `"myprefix"` |
## Setup Hashicorp Vault instance
diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-tablestorage.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-tablestorage.md
index afa4a20c5..42f881cb4 100644
--- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-tablestorage.md
+++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-azure-tablestorage.md
@@ -79,7 +79,7 @@ will create the following record in a table:
## Concurrency
-Azure Table Storage state concurrency is achieved by using `ETag`s according to [the official documenation]( https://docs.microsoft.com/en-us/azure/storage/common/storage-concurrency#managing-concurrency-in-table-storage).
+Azure Table Storage state concurrency is achieved by using `ETag`s according to [the official documentation]( https://docs.microsoft.com/en-us/azure/storage/common/storage-concurrency#managing-concurrency-in-table-storage).
## Related links
diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mongodb.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mongodb.md
index 255b604f3..ea9759464 100644
--- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mongodb.md
+++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mongodb.md
@@ -63,7 +63,7 @@ If you wish to use MongoDB as an actor store, append the following to the yaml.
| collectionName | N | The name of the collection to use. Defaults to `"daprCollection"` | `"daprCollection"`
| writeconcern | N | The write concern to use | `"majority"`
| readconcern | N | The read concern to use | `"majority"`, `"local"`,`"available"`, `"linearizable"`, `"snapshot"`
-| operationTimeout | N | The timeout for the operation. Defautls to `"5s"` | `"5s"`
+| operationTimeout | N | The timeout for the operation. Defaults to `"5s"` | `"5s"`
## Setup MongoDB
diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-zookeeper.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-zookeeper.md
index 0a4d98c17..6e4ef0d42 100644
--- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-zookeeper.md
+++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-zookeeper.md
@@ -44,7 +44,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
| servers | Y | Comma delimited list of servers | `"zookeeper.default.svc.cluster.local:2181"`
| sessionTimeout | Y | The session timeout value | `"5s"`
| maxBufferSize | N | The maximum size of buffer. Defaults to `"1048576"` | `"1048576"`
-| maxConnBufferSize | N | The maximum size of connection buffer. Defautls to `"1048576`" | `"1048576"`
+| maxConnBufferSize | N | The maximum size of connection buffer. Defaults to `"1048576`" | `"1048576"`
| keyPrefixPath | N | The key prefix path in Zookeeper. No default | `"dapr"`
## Setup Zookeeper
diff --git a/daprdocs/static/docs/azm-config-map.yaml b/daprdocs/static/docs/azm-config-map.yaml
index 3b1adb133..3a35e8e3d 100644
--- a/daprdocs/static/docs/azm-config-map.yaml
+++ b/daprdocs/static/docs/azm-config-map.yaml
@@ -12,12 +12,12 @@ data:
# Any errors related to config map settings can be found in the KubeMonAgentEvents table in the Log Analytics workspace that the cluster is sending data to.
[log_collection_settings]
[log_collection_settings.stdout]
- # In the absense of this configmap, default value for enabled is true
+ # In the absence of this configmap, default value for enabled is true
enabled = true
# exclude_namespaces setting holds good only if enabled is set to true
# kube-system log collection is disabled by default in the absence of 'log_collection_settings.stdout' setting. If you want to enable kube-system, remove it from the following setting.
# If you want to continue to disable kube-system log collection keep this namespace in the following setting and add any other namespace you want to disable log collection to the array.
- # In the absense of this configmap, default value for exclude_namespaces = ["kube-system"]
+ # In the absence of this configmap, default value for exclude_namespaces = ["kube-system"]
exclude_namespaces = ["kube-system"]
[log_collection_settings.stderr]
# Default value for enabled is true
@@ -25,17 +25,17 @@ data:
# exclude_namespaces setting holds good only if enabled is set to true
# kube-system log collection is disabled by default in the absence of 'log_collection_settings.stderr' setting. If you want to enable kube-system, remove it from the following setting.
# If you want to continue to disable kube-system log collection keep this namespace in the following setting and add any other namespace you want to disable log collection to the array.
- # In the absense of this cofigmap, default value for exclude_namespaces = ["kube-system"]
+ # In the absence of this cofigmap, default value for exclude_namespaces = ["kube-system"]
exclude_namespaces = ["kube-system"]
[log_collection_settings.env_var]
- # In the absense of this configmap, default value for enabled is true
+ # In the absence of this configmap, default value for enabled is true
enabled = true
[log_collection_settings.enrich_container_logs]
- # In the absense of this configmap, default value for enrich_container_logs is false
+ # In the absence of this configmap, default value for enrich_container_logs is false
enabled = true
# When this is enabled (enabled = true), every container log entry (both stdout & stderr) will be enriched with container Name & container Image
[log_collection_settings.collect_all_kube_events]
- # In the absense of this configmap, default value for collect_all_kube_events is false
+ # In the absence of this configmap, default value for collect_all_kube_events is false
# When the setting is set to false, only the kube events with !normal event type will be collected
enabled = false
# When this is enabled (enabled = true), all kube events including normal events will be collected
From 565378441f4e68a0044f9bbdf6a7660073b57cbb Mon Sep 17 00:00:00 2001
From: Nick Greenfield