Docs upmerge 12/16 (#3015)

* Fix: codeblock wasn't properly closed Minor formatting fix. Signed-off-by: Tiago Alves Macambira <[email protected]> * update code examples Signed-off-by: Hannah Hunter <[email protected]> * Fix broken link in components-concept page Commit 043a39d shuffled content around and removed a section called "Pluggable Components", breaking an existing link to this section. This PR fixes the link to point to the section now hosting the appropriate content. Signed-off-by: Tiago Alves Macambira <[email protected]> * Add Resiliency to the concepts page Signed-off-by: Nick Greenfield <[email protected]> * Update redis.md Signed-off-by: wxbty <[email protected]> * Remove ServiceInvocation.NoDefaultContentType feature flag Fixes #2869 Signed-off-by: ItalyPaleAle <[email protected]> * dotnet submodule Signed-off-by: Hannah Hunter <[email protected]> * Simplifying kubernetes YAML config (#2908) * Simplifying Kubernetes YAML Signed-off-by: Marcos Candeia <[email protected]> * Update pluggable-components-registration.md Signed-off-by: Marcos Candeia <[email protected]> Signed-off-by: Marcos Candeia <[email protected]> * Clarify GH actions doc (#2906) * dotnet submodule Signed-off-by: Hannah Hunter <[email protected]> * attempt to clarify doc Signed-off-by: Hannah Hunter <[email protected]> * Revert "dotnet submodule" This reverts commit 8fdeb61. Signed-off-by: Hannah Hunter <[email protected]> * dotnet submodule (#2904) Signed-off-by: Hannah Hunter <[email protected]> Signed-off-by: Hannah Hunter <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * Update latest Python SDK version Signed-off-by: Bernd Verst <[email protected]> * etag true for dynamodb (#2902) Signed-off-by: Hannah Hunter <[email protected]> Signed-off-by: Hannah Hunter <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * [Run w/o docker] Add tabs and port number (#2905) * add tabs and window example Signed-off-by: Hannah Hunter <[email protected]> * edits per Mark Signed-off-by: Hannah Hunter <[email protected]> Signed-off-by: Hannah Hunter <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * 1/3 update per alecor191 Signed-off-by: Hannah Hunter <[email protected]> * Update redis.md Signed-off-by: wxbty <[email protected]> * Add missing rocketmq pubsub to table Signed-off-by: Bernd Verst <[email protected]> * Update aws-secret-manager.md Signed-off-by: vishalsignity <[email protected]> * Update daprdocs/content/en/concepts/resiliency-concept.md Co-authored-by: Hannah Hunter <[email protected]> Signed-off-by: greenie-msft <[email protected]> * Update daprdocs/content/en/concepts/resiliency-concept.md Co-authored-by: Hannah Hunter <[email protected]> Signed-off-by: greenie-msft <[email protected]> * Update daprdocs/content/en/concepts/resiliency-concept.md Co-authored-by: Hannah Hunter <[email protected]> Signed-off-by: greenie-msft <[email protected]> * Apply feedback to resiliency concept page * Mark pubsub.hazelcast as deprecated Fixes #2708 Signed-off-by: ItalyPaleAle <[email protected]> * Update daprdocs/content/en/reference/components-reference/supported-pubsub/setup-hazelcast.md Co-authored-by: Mukundan Sundararajan <[email protected]> Signed-off-by: Alessandro (Ale) Segala <[email protected]> * update supported versions list (#2916) * update supported versions list Signed-off-by: Mukundan Sundararajan <[email protected]> * updated supported versions Signed-off-by: Mukundan Sundararajan <[email protected]> Signed-off-by: Mukundan Sundararajan <[email protected]> Signed-off-by: greenie-msft <[email protected]> Co-authored-by: greenie-msft <[email protected]> * Update daprdocs/content/en/concepts/resiliency-concept.md Signed-off-by: greenie-msft <[email protected]> * Update azure-kubernetes-service-extension.md Signed-off-by: greenie-msft <[email protected]> * Update redis.md Signed-off-by: wxbty <[email protected]> * Update redis.md Signed-off-by: wxbty <[email protected]> * Update eventgrid.md command typos (#2932) Signed-off-by: Ana Cozma <[email protected]> Signed-off-by: Ana Cozma <[email protected]> * Add sidecar health image and fix broken links Signed-off-by: Nick Greenfield <[email protected]> * update python to be declarative example Signed-off-by: Hannah Hunter <[email protected]> * Start of resiliency quickstart Signed-off-by: Nick Greenfield <[email protected]> * Update daprdocs/content/en/getting-started/quickstarts/resiliency-quickstart.md Signed-off-by: greenie-msft <[email protected]> * Update docs runtime version to 1.9.3 Signed-off-by: Nick Greenfield <[email protected]> * Update azure-api-management.md Removed one word Signed-off-by: Richard de Zwart <[email protected]> * Use Google Analytics 4 ID (#2941) Signed-off-by: Patrice Chalin <[email protected]> Signed-off-by: Patrice Chalin <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * Fix Python SDK version Signed-off-by: greenie-msft <[email protected]> * update code snippets Signed-off-by: Hannah Hunter <[email protected]> * Azurite queue default port is 10001 fix: Update azurite port to 10001 instead of 10000 See [docs](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio#queue-listening-port-configuration) Signed-off-by: ThumNet <[email protected]> * updates per resiliency example Signed-off-by: Hannah Hunter <[email protected]> * Add resiliency images for quickstarts Signed-off-by: Nick Greenfield <[email protected]> * Updates to resiliency svc invoke quickstart * updates per Nick review Signed-off-by: Hannah Hunter <[email protected]> * Update daprdocs/content/en/developing-applications/integrations/Azure/azure-kubernetes-service-extension.md Co-authored-by: Hannah Hunter <[email protected]> Signed-off-by: greenie-msft <[email protected]> * capitalize Dapr Signed-off-by: Hannah Hunter <[email protected]> * Update daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md Signed-off-by: greenie-msft <[email protected]> * Update daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md Signed-off-by: greenie-msft <[email protected]> * Update daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md Signed-off-by: greenie-msft <[email protected]> * Update daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md Signed-off-by: greenie-msft <[email protected]> * Update daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md Signed-off-by: greenie-msft <[email protected]> * Fix resiliency component quickstart Signed-off-by: Nick Greenfield <[email protected]> * Update runtime version to 1.9.4 Signed-off-by: Nick Greenfield <[email protected]> * Update subscription examples (#2957) * dotnet submodule Signed-off-by: Hannah Hunter <[email protected]> * update to v2alpha Signed-off-by: Hannah Hunter <[email protected]> * revert some changes Signed-off-by: Hannah Hunter <[email protected]> * update routes Signed-off-by: Hannah Hunter <[email protected]> Signed-off-by: Hannah Hunter <[email protected]> * Kafka SASL SCRAM Authentication (#2939) * Adds settings for SASL SCRAM SHA-256 and SHA-512 Signed-off-by: Andrew <[email protected]> * Update setup-apache-kafka.md Signed-off-by: Andrew <[email protected]> Signed-off-by: Andrew <[email protected]> Co-authored-by: Hannah Hunter <[email protected]> Co-authored-by: Mukundan Sundararajan <[email protected]> Co-authored-by: Yaron Schneider <[email protected]> * Update fluentd.md (#2967) Elastic search installed by helm will version 8 series which does not let dapr connect with kibana(Because it enables authentication), After using version 7 series works as expected Signed-off-by: vikram-thiru <[email protected]> Signed-off-by: vikram-thiru <[email protected]> * Adding missing brace for json document example (#2968) There is a missing brace in the example json Signed-off-by: Chris Kingdon <[email protected]> Signed-off-by: Chris Kingdon <[email protected]> Co-authored-by: Yaron Schneider <[email protected]> * Update Kubernetes job page (#2973) Adds a paragraph mentioning `restartPolicy` needs to be set to `Never` for successful job completion. Signed-off-by: Renato L. de F. Cunha <[email protected]> Signed-off-by: Renato L. de F. Cunha <[email protected]> * Remove backoffmaxretries from pubsub.mqtt metadata spec Signed-off-by: shivam <[email protected]> * Fix resiliency run command in quickstart (#2983) Signed-off-by: Nick Greenfield <[email protected]> Signed-off-by: Nick Greenfield <[email protected]> * Update version to 1.9.5 (#2987) * Updated per feedback Signed-off-by: ItalyPaleAle <[email protected]> * clarify app namespace Signed-off-by: Hannah Hunter <[email protected]> * Improve Hashicorp Vault documentation on CA certificates. (#2988) * Improve Hashicorp Vault documentation on CA certificates. Hashicorp Vault component documentation for CA related fields (`caPem`, `caCert` and `caPath`) does not describe the precedence among those flags and a big ambiguous on what those flags mean. This PR tries to alliviate that. Closes #2989 Signed-off-by: Tiago Alves Macambira <[email protected]> * Apply suggestions from code review Co-authored-by: Hannah Hunter <[email protected]> Signed-off-by: Tiago Alves Macambira <[email protected]> Signed-off-by: Tiago Alves Macambira <[email protected]> Co-authored-by: Hannah Hunter <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * Removing stored procedure references from cosmosDB docs (#3000) Signed-off-by: Ryan Lettieri <[email protected]> Signed-off-by: Ryan Lettieri <[email protected]> Co-authored-by: Ryan Lettieri <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * fix broken ref in distributed_lock_api Signed-off-by: Lenshood <[email protected]> * Adding `helm repo update` (#3010) Signed-off-by: salaboy <[email protected]> Signed-off-by: salaboy <[email protected]> * change link for sidecar security (#3011) Signed-off-by: Hannah Hunter <[email protected]> Signed-off-by: Hannah Hunter <[email protected]> * update port to match go code (#3014) Signed-off-by: Hannah Hunter <[email protected]> Signed-off-by: Hannah Hunter <[email protected]> Co-authored-by: Mark Fussell <[email protected]> Signed-off-by: Tiago Alves Macambira <[email protected]> Signed-off-by: Hannah Hunter <[email protected]> Signed-off-by: Nick Greenfield <[email protected]> Signed-off-by: wxbty <[email protected]> Signed-off-by: ItalyPaleAle <[email protected]> Signed-off-by: Marcos Candeia <[email protected]> Signed-off-by: Bernd Verst <[email protected]> Signed-off-by: vishalsignity <[email protected]> Signed-off-by: greenie-msft <[email protected]> Signed-off-by: Alessandro (Ale) Segala <[email protected]> Signed-off-by: Mukundan Sundararajan <[email protected]> Signed-off-by: Ana Cozma <[email protected]> Signed-off-by: Richard de Zwart <[email protected]> Signed-off-by: Patrice Chalin <[email protected]> Signed-off-by: ThumNet <[email protected]> Signed-off-by: Andrew <[email protected]> Signed-off-by: vikram-thiru <[email protected]> Signed-off-by: Chris Kingdon <[email protected]> Signed-off-by: Renato L. de F. Cunha <[email protected]> Signed-off-by: shivam <[email protected]> Signed-off-by: Ryan Lettieri <[email protected]> Signed-off-by: Lenshood <[email protected]> Signed-off-by: salaboy <[email protected]> Co-authored-by: Tiago Alves Macambira <[email protected]> Co-authored-by: greenie-msft <[email protected]> Co-authored-by: Nick Greenfield <[email protected]> Co-authored-by: wxbty <[email protected]> Co-authored-by: ItalyPaleAle <[email protected]> Co-authored-by: Marcos Candeia <[email protected]> Co-authored-by: Mark Fussell <[email protected]> Co-authored-by: Bernd Verst <[email protected]> Co-authored-by: Artur Souza <[email protected]> Co-authored-by: vishalsignity <[email protected]> Co-authored-by: Mukundan Sundararajan <[email protected]> Co-authored-by: Ana Cozma <[email protected]> Co-authored-by: Richard de Zwart <[email protected]> Co-authored-by: Patrice Chalin <[email protected]> Co-authored-by: ThumNet <[email protected]> Co-authored-by: Jeffrey Tummers <[email protected]> Co-authored-by: Andrew <[email protected]> Co-authored-by: Yaron Schneider <[email protected]> Co-authored-by: vikram-thiru <[email protected]> Co-authored-by: Chris Kingdon <[email protected]> Co-authored-by: Renato L. de F. Cunha <[email protected]> Co-authored-by: shivam <[email protected]> Co-authored-by: Ryan Lettieri <[email protected]> Co-authored-by: Ryan Lettieri <[email protected]> Co-authored-by: Lenshood <[email protected]> Co-authored-by: salaboy <[email protected]>
dapr · Dec 21, 2022 · 268da74 · 268da74
1 parent e075a43
commit 268da74
Show file tree

Hide file tree

Showing 45 changed files with 2,372 additions and 169 deletions.
diff --git a/daprdocs/content/en/concepts/components-concept.md b/daprdocs/content/en/concepts/components-concept.md
@@ -11,7 +11,7 @@ Dapr uses a modular design where functionality is delivered as a component. Each
 You can contribute implementations and extend Dapr's component interfaces capabilities via:
 
 - The [components-contrib repository](https://github.com/dapr/components-contrib)
-- [Pluggable components]({{<ref "components-concept.md#pluggable-components" >}}).
+- [Pluggable components]({{<ref "components-concept.md#built-in-and-pluggable-components" >}}).
 
 A building block can use any combination of components. For example, the [actors]({{<ref "actors-overview.md">}}) and the [state management]({{<ref "state-management-overview.md">}}) building blocks both use [state components](https://github.com/dapr/components-contrib/tree/master/state).
 

diff --git a/daprdocs/content/en/concepts/resiliency-concept.md b/daprdocs/content/en/concepts/resiliency-concept.md
@@ -0,0 +1,39 @@
+---
+type: docs
+title: "Resiliency"
+linkTitle: "Resiliency"
+weight: 400
+description: "Configure policies and monitor app and sidecar health"
+---
+
+Distributed applications are commonly comprised of many microservices, with dozens - sometimes hundreds - of instances scaling across underlying infrastructure. As these distributed solutions grow in size and complexity, the potential for system failures inevitably increases. Service instances can fail or become unresponsive due to any number of issues, including hardware failures, unexpected throughput, or application lifecycle events, such as scaling out and application restarts. Designing and implementing a self-healing solution with the ability to detect, mitigate, and respond to failure is critical.
+
+## Resiliency Policies
+<img src="/images/resiliency_diagram.png" width="1200" alt="Diagram showing the resiliency applied to Dapr APIs">
+
+Dapr provides a capability for defining and applying fault tolerance resiliency policies to your application. You can define policies for following resiliency patterns:
+
+- Timeouts
+- Retries/back-offs
+- Circuit breakers
+
+These policies can be applied to any Dapr API calls when calling components with a [resiliency spec]({{< ref resiliency-overview >}}).
+
+## App Health Checks
+<img src="/images/observability-app-health.webp" width="800" alt="Diagram showing the app health feature. Running Dapr with app health enabled causes Dapr to periodically probe the app for its health">
+
+Applications can become unresponsive for a variety of reasons. For example, they are too busy to accept new work, could have crashed, or be in a deadlock state. Sometimes the condition can be transitory or persistent.
+
+Dapr provides a capability for monitoring app health through probes that check the health of your application and react to status changes. When an unhealthy app is detected, Dapr stops accepting new work on behalf of the application.
+
+Read more on how to apply [app health checks]({{< ref app-health >}}) to your application.
+
+## Sidecar Health Checks
+<img src="/images/sidecar-health.png" width="800" alt="Diagram showing the app health feature. Running Dapr with app health enabled causes Dapr to periodically probe the app for its health">
+
+Dapr provides a way to determine its health using an [HTTP `/healthz` endpoint]({{< ref health_api.md >}}). With this endpoint, the *daprd* process, or sidecar, can be:
+
+- Probed for its health
+- Determined for readiness and liveness
+
+Read more on about how to apply [dapr health checks]({{< ref sidecar-health >}}) to your application.
diff --git a/...tent/en/developing-applications/building-blocks/observability/sidecar-health.md b/...tent/en/developing-applications/building-blocks/observability/sidecar-health.md
@@ -6,7 +6,7 @@ weight: 200
 description: Dapr sidecar health checks
 ---
 
-Dapr provides a way to [determine its health using an [HTTP `/healthz` endpoint]({{< ref health_api.md >}}). With this endpoint, the *daprd* process, or sidecar, can be:
+Dapr provides a way to determine its health using an [HTTP `/healthz` endpoint]({{< ref health_api.md >}}). With this endpoint, the *daprd* process, or sidecar, can be:
 
 - Probed for its health
 - Determined for readiness and liveness

diff --git a/...nt/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md b/...nt/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md
@@ -155,13 +155,14 @@ Learn more in the [declarative and programmatic subscriptions doc]({{< ref subsc
 Create a file named `subscription.yaml` and paste the following:
 
 ```yaml
-apiVersion: dapr.io/v1alpha1
+apiVersion: dapr.io/v2alpha1
 kind: Subscription
 metadata:
   name: order-pub-sub
 spec:
   topic: orders
-  route: /checkout
+  routes: 
+    default: /checkout
   pubsubname: order-pub-sub
 scopes:
 - orderprocessing

diff --git a/...ntent/en/developing-applications/building-blocks/pubsub/subscription-methods.md b/...ntent/en/developing-applications/building-blocks/pubsub/subscription-methods.md
@@ -104,7 +104,6 @@ In your application code, subscribe to the topic specified in the Dapr pub/sub c
 
 ```csharp
  //Subscribe to a topic 
-[Topic("pubsub", "orders")]
 [HttpPost("checkout")]
 public void getCheckout([FromBody] int orderId)
 {
@@ -117,16 +116,15 @@ public void getCheckout([FromBody] int orderId)
 {{% codetab %}}
 
 ```java
+import io.dapr.client.domain.CloudEvent;
+
  //Subscribe to a topic
-@Topic(name = "orders", pubsubName = "pubsub")
 @PostMapping(path = "/checkout")
 public Mono<Void> getCheckout(@RequestBody(required = false) CloudEvent<String> cloudEvent) {
     return Mono.fromRunnable(() -> {
         try {
             log.info("Subscriber received: " + cloudEvent.getData());
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        } 
     });
 }
 ```
@@ -136,25 +134,30 @@ public Mono<Void> getCheckout(@RequestBody(required = false) CloudEvent<String>
 {{% codetab %}}
 
 ```python
+from cloudevents.sdk.event import v1
+
 #Subscribe to a topic 
-@app.subscribe(pubsub_name='pubsub', topic='orders')
-def mytopic(event: v1.Event) -> None:
+@app.route('/checkout', methods=['POST'])
+def checkout(event: v1.Event) -> None:
     data = json.loads(event.Data())
     logging.info('Subscriber received: ' + str(data))
-
-app.run(6002)
 ```
 
 {{% /codetab %}}
 
 {{% codetab %}}
 
 ```javascript
-//Subscribe to a topic
-await server.pubsub.subscribe("pubsub", "orders", async (orderId) => {
-    console.log(`Subscriber received: ${JSON.stringify(orderId)}`)
+const express = require('express')
+const bodyParser = require('body-parser')
+const app = express()
+app.use(bodyParser.json({ type: 'application/*+json' }));
+
+// listen to the declarative route
+app.post('/checkout', (req, res) => {
+  console.log(req.body);
+  res.sendStatus(200);
 });
-await server.startServer();
 ```
 
 {{% /codetab %}}
@@ -163,11 +166,10 @@ await server.startServer();
 
 ```go
 //Subscribe to a topic
-if err := s.AddTopicEventHandler(sub, eventHandler); err != nil {
-	log.Fatalf("error adding topic subscription: %v", err)
-}
-if err := s.Start(); err != nil && err != http.ErrServerClosed {
-	log.Fatalf("error listenning: %v", err)
+var sub = &common.Subscription{
+	PubsubName: "pubsub",
+	Topic:      "orders",
+	Route:      "/checkout",
 }
 
 func eventHandler(ctx context.Context, e *common.TopicEvent) (retry bool, err error) {

diff --git a/...plications/building-blocks/service-invocation/howto-invoke-discover-services.md b/...plications/building-blocks/service-invocation/howto-invoke-discover-services.md
@@ -405,9 +405,9 @@ dapr invoke --app-id checkout --method checkout/100
 
 ### Namespaces
 
-When running on [namespace supported platforms]({{< ref "service_invocation_api.md#namespace-supported-platforms" >}}), you include the namespace of the target app in the app ID: `checkout.production`
+When running on [namespace supported platforms]({{< ref "service_invocation_api.md#namespace-supported-platforms" >}}), you include the namespace of the target app in the app ID. For example, following the `<app>.<namespace>` format, use `checkout.production`.
 
-For example, invoking the example service with a namespace would look like:
+Using this example, invoking the service with a namespace would look like:
 
 ```bash
 curl http://localhost:3602/v1.0/invoke/checkout.production/method/checkout/100 -X POST

diff --git a/...-applications/building-blocks/service-invocation/service-invocation-overview.md b/...-applications/building-blocks/service-invocation/service-invocation-overview.md
@@ -134,4 +134,4 @@ For quick testing, try using the Dapr CLI for service invocation:
 - Read the [service invocation API specification]({{< ref service_invocation_api.md >}}). This reference guide for service invocation describes how to invoke methods on other services.
 - Understand the [service invocation performance numbers]({{< ref perf-service-invocation.md >}}).
 - Take a look at [observability]({{< ref monitoring.md >}}). Here you can dig into Dapr's monitoring tools like tracing, metrics and logging.
-- Read up on our [security practices]({{< ref monitoring.md >}}) around mTLS encryption, token authentication, and endpoint authorization.
+- Read up on our [security practices]({{< ref security-concept.md >}}) around mTLS encryption, token authentication, and endpoint authorization.
diff --git a/...s/content/en/developing-applications/integrations/Azure/authenticating-azure.md b/...s/content/en/developing-applications/integrations/Azure/authenticating-azure.md
@@ -84,7 +84,7 @@ To start, create a new Azure AD application, which will also be used as Service
 
 Prerequisites:
 
-- [Azure Subscription](https://azure.microsoft.com/free/)
+- Azure Subscription
 - [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli)
 - [jq](https://stedolan.github.io/jq/download/)
 - OpenSSL (included by default on all Linux and macOS systems, as well as on WSL)

diff --git a/...s/content/en/developing-applications/integrations/Azure/azure-api-management.md b/...s/content/en/developing-applications/integrations/Azure/azure-api-management.md
@@ -6,6 +6,6 @@ description: "Publish APIs for Dapr services and components through Azure API Ma
 weight: 2000
 ---
 
-Azure API Management (APIM) is a way to create consistent and modern API gateways for back-end services, including as those built with Dapr. Dapr support can be enabled in self-hosted API Management gateways to allow them to forward requests to Dapr services, send messages to Dapr Pub/Sub topics, or trigger Dapr output bindings. For more information, read the guide on [API Management Dapr Integration policies](https://docs.microsoft.com/azure/api-management/api-management-dapr-policies) and try out the [Dapr & Azure API Management Integration Demo](https://github.com/dapr/samples/tree/master/dapr-apim-integration).
+Azure API Management (APIM) is a way to create consistent and modern API gateways for back-end services, including those built with Dapr. Dapr support can be enabled in self-hosted API Management gateways to allow them to forward requests to Dapr services, send messages to Dapr Pub/Sub topics, or trigger Dapr output bindings. For more information, read the guide on [API Management Dapr Integration policies](https://docs.microsoft.com/azure/api-management/api-management-dapr-policies) and try out the [Dapr & Azure API Management Integration Demo](https://github.com/dapr/samples/tree/master/dapr-apim-integration).
 
 {{< button text="Learn more" link="https://docs.microsoft.com/azure/api-management/api-management-dapr-policies" >}}
diff --git a/...eveloping-applications/integrations/Azure/azure-kubernetes-service-extension.md b/...eveloping-applications/integrations/Azure/azure-kubernetes-service-extension.md
@@ -7,7 +7,7 @@ weight: 4000
 ---
 
 # Prerequisites
-- [Azure subscription](https://azure.microsoft.com/free/?WT.mc_id=A261C142F)
+- Azure subscription
 - [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli-windows?tabs=azure-cli) and the ***aks-preview*** extension.
 - [Azure Kubernetes Service (AKS) cluster](https://docs.microsoft.com/azure/aks/tutorial-kubernetes-deploy-cluster?tabs=azure-cli)
 
@@ -106,4 +106,4 @@ dapr-sidecar-injector-9555889bc-rpjwl   1/1     Running   0          1h
 dapr-sidecar-injector-9555889bc-rqjgt   1/1     Running   0          1h
 ```
 
-For further information such as configuration options and targeting specific versions of Dapr, see the official [AKS Dapr Extension Docs](https://docs.microsoft.com/azure/aks/dapr).
+For more information about configuration options and targeting specific Dapr versions, see the official [AKS Dapr Extension Docs](https://docs.microsoft.com/azure/aks/dapr).
diff --git a/daprdocs/content/en/developing-applications/integrations/gRPC-integration.md b/daprdocs/content/en/developing-applications/integrations/gRPC-integration.md
@@ -214,17 +214,17 @@ func main() {
 }
 ```
 
-This creates a gRPC server for your app on port 4000.
+This creates a gRPC server for your app on port 50001.
 
 4. Run your app
 
 To run locally, use the Dapr CLI:
 
 ```
-dapr run --app-id goapp --app-port 4000 --app-protocol grpc go run main.go
+dapr run --app-id goapp --app-port 50001 --app-protocol grpc go run main.go
 ```
 
-On Kubernetes, set the required `dapr.io/app-protocol: "grpc"` and `dapr.io/app-port: "4000` annotations in your pod spec template as mentioned above.
+On Kubernetes, set the required `dapr.io/app-protocol: "grpc"` and `dapr.io/app-port: "50001` annotations in your pod spec template as mentioned above.
 
 ## Other languages
 

diff --git a/daprdocs/content/en/developing-applications/integrations/github_actions.md b/daprdocs/content/en/developing-applications/integrations/github_actions.md
@@ -3,14 +3,21 @@ type: docs
 weight: 5000
 title: "Use the Dapr CLI in a GitHub Actions workflow"
 linkTitle: "GitHub Actions"
-description: "Learn how to add the Dapr CLI to your GitHub Actions to deploy and manage Dapr in your environments."
+description: "Add the Dapr CLI to your GitHub Actions to deploy and manage Dapr in your environments."
 ---
 
-Dapr can be integrated with GitHub Actions via the [Dapr tool installer](https://github.com/marketplace/actions/dapr-tool-installer) available in the GitHub Marketplace. This installer adds the Dapr CLI to your workflow, allowing you to deploy, manage, and upgrade Dapr across your environments.
+Dapr can be integrated with GitHub Actions via the [Dapr tool installer](https://github.com/marketplace/actions/dapr-tool-installer) available in the GitHub Marketplace. This installer adds the Dapr CLI to your workflow, allowing you to deploy, manage, and upgrade Dapr across your environments. 
 
-## Overview
+Copy and paste the following installer snippet into your applicatin's YAML file to get started:
 
-The `dapr/setup-dapr` action will install the specified version of the Dapr CLI on macOS, Linux and Windows runners. Once installed, you can run any [Dapr CLI command]({{< ref cli >}}) to manage your Dapr environments.
+```yaml
+- name: Dapr tool installer
+  uses: dapr/setup-dapr@v1
+```
+
+The [`dapr/setup-dapr` action](https://github.com/dapr/setup-dapr) will install the specified version of the Dapr CLI on macOS, Linux, and Windows runners. Once installed, you can run any [Dapr CLI command]({{< ref cli >}}) to manage your Dapr environments.
+
+Refer to the [`action.yml` metadata file](https://github.com/dapr/setup-dapr/blob/main/action.yml) for details about all the inputs.
 
 ## Example
 
@@ -34,4 +41,8 @@ The `dapr/setup-dapr` action will install the specified version of the Dapr CLI
 
     dapr status --kubernetes
   working-directory: ./twitter-sentiment-processor/demos/demo3
-```
+```
+
+## Next steps
+
+Learn more about [GitHub Actions](https://docs.github.com/en/actions).
diff --git a/daprdocs/content/en/getting-started/quickstarts/_index.md b/daprdocs/content/en/getting-started/quickstarts/_index.md
@@ -27,7 +27,4 @@ Hit the ground running with our Dapr quickstarts, complete with code samples aim
 | [State Management]({{< ref statemanagement-quickstart.md >}}) | Store a service's data as key/value pairs in supported state stores. |
 | [Bindings]({{< ref bindings-quickstart.md >}}) | Work with external systems using input bindings to respond to events and output bindings to call operations. |
 | [Secrets Management]({{< ref secrets-quickstart.md >}}) | Securely fetch secrets. |
-| Actors             | Coming soon. |
-| Observability      | Coming soon. |
-| Configuration      | Coming soon. |
-| Distributed Lock     | Coming soon. |
+| [Resiliency]({{< ref resiliency >}}) | Define and apply fault-tolerance policies to your Dapr API requests. |
diff --git a/daprdocs/content/en/getting-started/quickstarts/resiliency/_index.md b/daprdocs/content/en/getting-started/quickstarts/resiliency/_index.md
@@ -0,0 +1,7 @@
+---
+type: docs
+title: "Resiliency Quickstarts"
+linkTitle: "Resiliency"
+weight: 100
+description: "Get started with Dapr's resiliency component"
+---