Merge branch 'v1.11' into low-application-helath-probe-timeout

daprdocs/content/en/concepts/dapr-services/sidecar.md

@@ -49,25 +49,31 @@ For a detailed list of all available arguments run `daprd --help` or see this [t
    daprd --app-id myapp
    ```
 
-2. Specify the port your application is listening to
+1. Specify the port your application is listening to
 
    ```bash
    daprd --app-id --app-port 5000
    ```
 
-3. If you are using several custom resources and want to specify the location of the resource definition files, use the `--resources-path` argument:
+1. If you are using several custom resources and want to specify the location of the resource definition files, use the `--resources-path` argument:
 
    ```bash
    daprd --app-id myapp --resources-path <PATH-TO-RESOURCES-FILES>
    ```
 
-4. Enable collection of Prometheus metrics while running your app
+1. If you've organized your components and other resources (for example, resiliency policies, subscriptions, or configuration) into separate folders or a shared folder, you can specify multiple resource paths:
+
+   ```bash
+   daprd --app-id myapp --resources-path <PATH-1-TO-RESOURCES-FILES> --resources-path <PATH-2-TO-RESOURCES-FILES>
+   ```
+
+1. Enable collection of Prometheus metrics while running your app
 
    ```bash
    daprd --app-id myapp --enable-metrics
    ```
 
-5. Listen to IPv4 and IPv6 loopback only
+1. Listen to IPv4 and IPv6 loopback only
 
    ```bash
    daprd --app-id myapp --dapr-listen-addresses '127.0.0.1,[::1]'

daprdocs/content/en/operations/resiliency/policies.md

@@ -8,7 +8,7 @@ description: "Configure resiliency policies for timeouts, retries, and circuit b
 
 Define timeouts, retries, and circuit breaker policies under `policies`. Each policy is given a name so you can refer to them from the `targets` section in the resiliency spec. 
 
-> Note: Dapr offers default retries for specific APIs. [See here]({{< ref "#override-default-retries" >}}) to learn how you can overwrite default retry logic with user defined retry policies.
+> Note: Dapr offers default retries for specific APIs. [See here]({{< ref "#overriding-default-retries" >}}) to learn how you can overwrite default retry logic with user defined retry policies.
 
 ## Timeouts
 
@@ -299,4 +299,4 @@ The table below is a break down of which policies are applied when attempting to
 
 Try out one of the Resiliency quickstarts:
 - [Resiliency: Service-to-service]({{< ref resiliency-serviceinvo-quickstart.md >}})
-- [Resiliency: State Management]({{< ref resiliency-state-quickstart.md >}})
+- [Resiliency: State Management]({{< ref resiliency-state-quickstart.md >}})

daprdocs/content/en/reference/cli/dapr-run.md

@@ -27,7 +27,7 @@ dapr run [flags] [command]
 | `--app-max-concurrency`        |                      | `unlimited`                                                                        | The concurrency level of the application; default is unlimited                                       |
 | `--app-port`, `-p`             | `APP_PORT`           |                                                                                    | The port your application is listening on                                                            |
 | `--app-protocol`, `-P` | | `http` | The protocol Dapr uses to talk to the application. Valid values are: `http`, `grpc`, `https` (HTTP with TLS), `grpcs` (gRPC with TLS), `h2c` (HTTP/2 Cleartext) |
-| `--resources-path`, `-d`      |                      | Linux/Mac: `$HOME/.dapr/components` <br/>Windows: `%USERPROFILE%\.dapr\components`   | The path for components directory                                                                   |
+| `--resources-path`, `-d`      |                      | Linux/Mac: `$HOME/.dapr/components` <br/>Windows: `%USERPROFILE%\.dapr\components`   | The path for resources directory. If you've organized your resources into multiple folders (for example, components in one folder, resiliency policies in another), you can define multiple resource paths. See [example]({{< ref "#examples" >}}) below.                                                                 |
 | `--app-channel-address` | | `127.0.0.1` | The network address the application listens on |
 | `--runtime-path`                  |        |  | Dapr runtime install path |
 | `--config`, `-c`               |                      | Linux/Mac: `$HOME/.dapr/config.yaml` <br/>Windows: `%USERPROFILE%\.dapr\config.yaml` | Dapr configuration file                                                                            |
@@ -78,4 +78,7 @@ dapr run --app-id myapp --app-port 5000 --app-protocol grpc -- go run main.go
 
 # Run a NodeJs application that listens to port 3000 with API logging enabled
 dapr run --app-id myapp --app-port 3000 --enable-api-logging  -- node myapp.js
+
+# Pass multiple resource paths
+dapr run --app-id myapp --resources-path path1 --resources-path path2
 ```

daprdocs/content/en/reference/components-reference/supported-configuration-stores/azure-appconfig-configuration-store.md

@@ -40,7 +40,7 @@ spec:
   - name: azureCertificateFile # Optional
     value : "[pfx_certificate_file_fully_qualified_local_path]"
   - name: subscribePollInterval # Optional
-    value: #Optional [Expected format example - 1s|1m|1h]
+    value: #Optional [Expected format example - 86400000000000]
 
 ```
 
@@ -57,7 +57,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
 | maxRetries                 | N        | Maximum number of retries before giving up. Defaults to `3` | `5`, `10`
 | retryDelay                 | N        | RetryDelay specifies the initial amount of delay to use before retrying an operation. The delay increases exponentially with each retry up to the maximum specified by MaxRetryDelay. Defaults to `4` seconds; `"-1"` disables delay between retries. | `4000000000`
 | maxRetryDelay              | N        | MaxRetryDelay specifies the maximum delay allowed before retrying an operation. Typically the value is greater than or equal to the value specified in RetryDelay. Defaults to `120` seconds; `"-1"` disables the limit | `120000000000`
-| subscribePollInterval      | N        | subscribePollInterval specifies the poll interval for polling the subscribed keys for any changes. Default polling interval is set to `24` hours.
+| subscribePollInterval      | N        | subscribePollInterval specifies the poll interval in nanoseconds for polling the subscribed keys for any changes. This will be updated in the future to Go Time format. Default polling interval is set to `24` hours. | `86400000000000`
 
 **Note**: either `host` or `connectionString` must be specified.
 

daprdocs/content/en/reference/components-reference/supported-pubsub/setup-aws-snssqs.md

@@ -9,8 +9,18 @@ aliases:
 
 ## Component format
 
-To set up AWS SNS/SQS pub/sub, create a component of type `pubsub.aws.snssqs`. See the [pub/sub broker component file]({{< ref setup-pubsub.md >}}) to learn how ConsumerID is automatically generated. Read the [How-to: Publish and Subscribe guide]({{< ref "howto-publish-subscribe.md#step-1-setup-the-pubsub-component" >}}) on how to create and apply a pub/sub configuration.
+To set up AWS SNS/SQS pub/sub, create a component of type `pubsub.aws.snssqs`. 
 
+By default, the AWS SNS/SQS component:
+- Generates the SNS topics
+- Provisions the SQS queues
+- Configures a subscription of the queues to the topics
+
+{{% alert title="Note" color="primary" %}}
+If you only have a publisher and no subscriber, only the SNS topics are created. 
+
+However, if you have a subscriber, SNS, SQS, and the dynamic or static subscription thereof are generated.
+{{% /alert %}}
 
 ```yaml
 apiVersion: dapr.io/v1alpha1
@@ -72,7 +82,7 @@ The above example uses secrets as plain strings. It is recommended to use [a sec
 | accessKey          | Y  | ID of the AWS account/role with appropriate permissions to SNS and SQS (see below) | `"AKIAIOSFODNN7EXAMPLE"`
 | secretKey          | Y  | Secret for the AWS user/role. If using an `AssumeRole` access, you will also need to provide a `sessionToken` |`"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"`
 | region             | Y  | The AWS region where the SNS/SQS assets are located or be created in. See [this page](https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services/?p=ugi&l=na) for valid regions. Ensure that SNS and SQS are available in that region | `"us-east-1"`
-| consumerID       | N | Consumer ID (consumer tag) organizes one or more consumers into a group. Consumers with the same consumer ID work as one virtual consumer; for example, a message is processed only once by one of the consumers in the group. If the `consumerID` is not provided, the Dapr runtime set it to the Dapr application ID (`appID`) value. | `"channel1"`
+| consumerID       | N | Consumer ID (consumer tag) organizes one or more consumers into a group. Consumers with the same consumer ID work as one virtual consumer; for example, a message is processed only once by one of the consumers in the group. If the `consumerID` is not provided, the Dapr runtime set it to the Dapr application ID (`appID`) value. See the [pub/sub broker component file]({{< ref setup-pubsub.md >}}) to learn how ConsumerID is automatically generated. | `"channel1"`
 | endpoint          | N  | AWS endpoint for the component to use. Only used for local development with, for example, [localstack](https://github.com/localstack/localstack). The `endpoint` is unncessary when running against production AWS | `"http://localhost:4566"`
 | sessionToken      | N  | AWS session token to use.  A session token is only required if you are using temporary security credentials | `"TOKEN"`
 | messageReceiveLimit | N  | Number of times a message is received, after processing of that message fails, that once reached, results in removing of that message from the queue. If `sqsDeadLettersQueueName` is specified, `messageReceiveLimit` is the number of times a message is received, after processing of that message fails, that once reached, results in moving of the message to the SQS dead-letters queue. Default: `10` | `10`