Merge branch 'v1.1' into patch-2

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "sdkdocs/php"]
 	path = sdkdocs/php
 	url = https://github.com/dapr/php-sdk.git
+[submodule "sdkdocs/dotnet"]
+	path = sdkdocs/dotnet
+	url = https://github.com/dapr/dotnet-sdk.git

daprdocs/config.toml

@@ -46,6 +46,12 @@ id = "UA-149338238-3"
   [[module.mounts]]
     source = "../sdkdocs/php/daprdocs/content/en/php-sdk-docs"
     target = "content/developing-applications/sdks/php"
+  [[module.mounts]]
+    source = "../sdkdocs/dotnet/daprdocs/content/en/dotnet-sdk-docs"
+    target = "content/developing-applications/sdks/dotnet"
+  [[module.mounts]]
+    source = "../sdkdocs/dotnet/daprdocs/content/en/dotnet-sdk-contributing"
+    target = "content/contributing/"
 
 # Markdown Engine - Allow inline html
 [markup]

daprdocs/content/en/_index.md

@@ -77,7 +77,7 @@ Welcome to the Dapr documentation site!
     <h5 class="mt-0"><b>Language SDKs</b></h5>
     <p>Create Dapr applications in your preferred language using the Dapr SDKs.</p>
     <div class="media mt-3">
-      <a class="pr-3" href="{{< ref sdks >}}">
+      <a class="pr-3" href="{{< ref dotnet >}}">
         <img src="/images/homepage/dotnet.png" alt=".NET logo" width=30>
       </a>
       <div class="media-body">
@@ -109,7 +109,7 @@ Welcome to the Dapr documentation site!
       </div>
     </div>
     <div class="media mt-3">
-      <a class="pr-4" href="{{< ref sdks >}}">
+      <a class="pr-4" href="{{< ref php >}}">
         <img src="/images/homepage/php.png" alt="PHP logo" width=30>
       </a>
       <div class="media-body">

daprdocs/content/en/developing-applications/sdks/_index.md

@@ -18,7 +18,7 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho
    - Interact with external resources through input and output [bindings]({{< ref bindings >}})
    - Get [secrets]({{< ref secrets >}}) from secret stores
    - Interact with [virtual actors]({{< ref actors >}})
-- **Service extensions**: The Dapr service extensions allow you to create services that can:
+- **Server extensions**: The Dapr service extensions allow you to create services that can:
    - Be [invoked]({{< ref service-invocation >}}) by other services
    - [Subscribe]({{< ref pubsub >}}) to topics
 - **Actor SDK**: The Dapr Actor SDK allows you to build virtual actors with:
@@ -29,13 +29,13 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho
 
 ## SDK languages
 
-| Language | Status | Client SDK | Service Extensions | Actor SDK |
+| Language | Status | Client SDK | Server extensions | Actor SDK |
-|----------|:-----:|:----------:|:-----------:|:---------:|
+|----------|:------|:----------:|:-----------:|:---------:|
-| [.NET](https://github.com/dapr/dotnet-sdk) | Stable | ✔ |  ✔ </br>ASP.NET Core | ✔ |
+| [.NET]({{< ref dotnet >}}) | Stable | ✔ |  [ASP.NET Core]({{< ref dotnet-aspnet >}}) | ✔ |
-| [Python]({{< ref python >}}) | Stable | ✔ | ✔ </br>[gRPC]({{< ref python-grpc.md >}}) | ✔ </br>[FastAPI]({{< ref python-fastapi.md >}})<br />[Flask]({{< ref python-flask.md >}}) |
+| [Python]({{< ref python >}}) | Stable | ✔ | [gRPC]({{< ref python-grpc.md >}}) | [FastAPI]({{< ref python-fastapi.md >}})<br />[Flask]({{< ref python-flask.md >}}) |
-| [Java](https://github.com/dapr/java-sdk) | Stable | ✔ |  ✔ </br>Spring Boot | ✔ |
+| [Java](https://github.com/dapr/java-sdk) | Stable | ✔ | Spring Boot | ✔ |
 | [Go](https://github.com/dapr/go-sdk) | Stable | ✔ | ✔ |  |
-| [PHP](https://github.com/dapr/php-sdk) | Stable | ✔ | ✔ | ✔ |
+| [PHP]({{< ref php >}}) | Stable | ✔ | ✔ | ✔ |
 | [C++](https://github.com/dapr/cpp-sdk) | In development | ✔ | |
 | [Rust]() | In development | ✔ | |  |
 | [Javascript]() | In development| ✔ | |

daprdocs/content/en/operations/components/component-secrets.md

@@ -121,7 +121,7 @@ metadata:
 rules:
 - apiGroups: [""]
   resources: ["secrets"]
-  verbs: ["get"]
+  verbs: ["get", "list"]
 ---
 
 kind: RoleBinding

daprdocs/content/en/operations/components/setup-state-store/supported-state-stores/setup-mysql.md

@@ -64,7 +64,7 @@ Run an instance of MySQL. You can run a local instance of MySQL in Docker CE wit
 This example does not describe a production configuration because it sets the password in plain text and the user name is left as the MySQL default of "root".
 
 ```bash
-docker run --name dapr_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest
+docker run --name dapr-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest
 ```
 
 {{% /codetab %}}
@@ -78,7 +78,7 @@ We can use [Helm](https://helm.sh/) to quickly create a MySQL instance in our Ku
 
     ```bash
     helm repo add bitnami https://charts.bitnami.com/bitnami
-    helm install dapr_mysql bitnami/mysql
+    helm install dapr-mysql bitnami/mysql
     ```
 
 1. Run `kubectl get pods` to see the MySQL containers now running in your cluster.

daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md

@@ -21,7 +21,7 @@ Use the following resource settings might serve as a starting point. Requirement
 | Placement   | Limit: 1, Request: 250m  | Limit: 150Mi, Request: 75Mi
 | Dashboard   | Limit: 200m, Request: 50m  | Limit: 200Mi, Request: 20Mi
 
-When installing Dapr using Helm, no default limit/request values are set. Each component has a `resources` option (for example, `dapr_dashboard.resources`), which you can use to tune the Dapr control plane to fit your environment. The [Helm chart readme](https://github.com/dapr/dapr/blob/master/charts/dapr/README) has detailed information and examples. For local/dev installations, you might simply want to skip configuring the `resources` options.
+When installing Dapr using Helm, no default limit/request values are set. Each component has a `resources` option (for example, `dapr_dashboard.resources`), which you can use to tune the Dapr control plane to fit your environment. The [Helm chart readme](https://github.com/dapr/dapr/blob/master/charts/dapr/README.md) has detailed information and examples. For local/dev installations, you might simply want to skip configuring the `resources` options.
 
 ### Optional components
 

daprdocs/content/en/operations/monitoring/logging/logs.md

@@ -86,7 +86,7 @@ spec:
 
 ## Log collectors
 
-If you run Dapr in a Kubernetes cluster, [Fluentd](https://www.fluentd.org/) is a popular container log collector. You can use Fluentd with a [json parser plugin](https://docs.fluentd.org/parser/json) to parse Dapr JSON formatted logs. This [how-to]({{< ref fluentd.md >}}) shows how to configure the Fleuntd in your cluster.
+If you run Dapr in a Kubernetes cluster, [Fluentd](https://www.fluentd.org/) is a popular container log collector. You can use Fluentd with a [json parser plugin](https://docs.fluentd.org/parser/json) to parse Dapr JSON formatted logs. This [how-to]({{< ref fluentd.md >}}) shows how to configure the Fluentd in your cluster.
 
 If you are using the Azure Kubernetes Service, you can use the default OMS Agent to collect logs with Azure Monitor without needing to install Fluentd.
 

daprdocs/content/en/operations/monitoring/logging/newrelic.md

@@ -0,0 +1,78 @@
+---
+type: docs
+title: "How-To: Set-up New Relic for Dapr logging"
+linkTitle: "New Relic"
+weight: 2000
+description: "Set-up New Relic for Dapr logging"
+---
+
+## Prerequisites
+
+- Perpetually [free New Relic account](https://newrelic.com/signup?ref=dapr), 100 GB/month of free data ingest, 1 free full access user, unlimited free basic users
+
+## Background
+
+New Relic offers a [Fluent Bit](https://fluentbit.io/) output [plugin](https://github.com/newrelic/newrelic-fluent-bit-output) to easily forward your logs to [New Relic Logs](https://github.com/newrelic/newrelic-fluent-bit-output). This plugin is also provided in a standalone Docker image that can be installed in a Kubernetes cluster in the form of a DaemonSet, which we refer as the Kubernetes plugin.
+
+This document explains how to install it in your cluster, either using a Helm chart (recommended), or manually by applying Kubernetes manifests.
+
+## Installation
+
+### Install using the Helm chart (recommended)
+
+1. Install Helm following the official instructions.
+
+2. Add the New Relic official Helm chart repository following these instructions
+
+3. Run the following command to install the New Relic Logging Kubernetes plugin via Helm, replacing the placeholder value YOUR_LICENSE_KEY with your [New Relic license key](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/license-key):
+
+- Helm 3
+    ```bash
+    helm install newrelic-logging newrelic/newrelic-logging --set licenseKey=YOUR_LICENSE_KEY
+    ```
+
+- Helm 2
+    ```bash
+    helm install newrelic/newrelic-logging --name newrelic-logging --set licenseKey=YOUR_LICENSE_KEY
+    ```
+
+For EU users, add `--set endpoint=https://log-api.eu.newrelic.com/log/v1 to any of the helm install commands above.
+
+By default, tailing is set to /var/log/containers/*.log. To change this setting, provide your preferred path by adding --set fluentBit.path=DESIRED_PATH to any of the helm install commands above.
+
+### Install the Kubernetes manifest
+
+1. Download the following 3 manifest files into your current working directory:
+
+    ```bash
+    curl https://raw.githubusercontent.com/newrelic/helm-charts/master/charts/newrelic-logging/k8s/fluent-conf.yml > fluent-conf.yml
+    curl https://raw.githubusercontent.com/newrelic/helm-charts/master/charts/newrelic-logging/k8s/new-relic-fluent-plugin.yml > new-relic-fluent-plugin.yml
+    curl https://raw.githubusercontent.com/newrelic/helm-charts/master/charts/newrelic-logging/k8s/rbac.yml > rbac.yml
+    ```
+
+2. In the downloaded new-relic-fluent-plugin.yml file, replace the placeholder value LICENSE_KEY with your New Relic license key.
+
+    For EU users, replace the ENDPOINT environment variable to https://log-api.eu.newrelic.com/log/v1.
+
+3. Once the License key has been added, run the following command in your terminal or command-line interface:
+    ```bash
+    kubectl apply -f .
+    ```
+
+4. [OPTIONAL] You can configure how the plugin parses the data by editing the parsers.conf section in the fluent-conf.yml file. For more information, see Fluent Bit's documentation on Parsers configuration.
+
+    By default, tailing is set to /var/log/containers/*.log. To change this setting, replace the default path with your preferred path in the new-relic-fluent-plugin.yml file.
+
+## View Logs
+
+![Dapr Annotations](/images/nr-logging-1.png)
+
+![Search](/images/nr-logging-2.png)
+
+## Related Links/References
+
+* [New Relic Account Signup](https://newrelic.com/signup)
+* [Telemetry Data Platform](https://newrelic.com/platform/telemetry-data-platform)
+* [New Relic Logging](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging)
+* [Types of New Relic API keys](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys)
+* [Alerts and Applied Intelligence](https://docs.newrelic.com/docs/alerts-applied-intelligence)

daprdocs/content/en/operations/monitoring/metrics/newrelic.md

@@ -0,0 +1,43 @@
+---
+type: docs
+title: "How-To: Set-up New Relic to collect and analyze metrics"
+linkTitle: "New Relic"
+weight: 6000
+description: "Set-up New Relic for Dapr metrics"
+---
+
+## Prerequisites
+
+- Perpetually [free New Relic account](https://newrelic.com/signup?ref=dapr), 100 GB/month of free data ingest, 1 free full access user, unlimited free basic users
+
+## Background
+
+New Relic offers a Prometheus OpenMetrics Integration.
+
+This document explains how to install it in your cluster, either using a Helm chart (recommended).
+
+## Installation
+
+1. Install Helm following the official instructions.
+
+2. Add the New Relic official Helm chart repository following [these instructions](https://github.com/newrelic/helm-charts/blob/master/README.md#installing-charts)
+
+3. Run the following command to install the New Relic Logging Kubernetes plugin via Helm, replacing the placeholder value YOUR_LICENSE_KEY with your [New Relic license key](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/license-key):
+
+    ```bash
+    helm install nri-prometheus newrelic/nri-prometheus --set licenseKey=YOUR_LICENSE_KEY
+    ```
+
+## View Metrics
+
+![Dapr Metrics](/images/nr-metrics-1.png)
+
+![Dashboard](/images/nr-dashboard-dapr-metrics-1.png)
+
+## Related Links/References
+
+* [New Relic Account Signup](https://newrelic.com/signup)
+* [Telemetry Data Platform](https://newrelic.com/platform/telemetry-data-platform)
+* [New Relic Prometheus OpenMetrics Integration](https://github.com/newrelic/helm-charts/tree/master/charts/nri-prometheus)
+* [Types of New Relic API keys](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys)
+* [Alerts and Applied Intelligence](https://docs.newrelic.com/docs/alerts-applied-intelligence)

daprdocs/content/en/operations/monitoring/tracing/supported-tracing-backends/newrelic.md

@@ -1,14 +1,14 @@
 ---
 type: docs
-title: "How-To: Set-up New Relic for Dapr observability"
+title: "How-To: Set-up New Relic for distributed tracing"
 linkTitle: "New Relic"
 weight: 2000
-description: "Set-up New Relic for Dapr observability"
+description: "Set-up New Relic for distributed tracing"
 ---
 
 ## Prerequisites
 
-- Perpetually [free New Relic account](https://newrelic.com/signup), 100 GB/month of free data ingest, 1 free full access user, unlimited free basic users
+- Perpetually [free New Relic account](https://newrelic.com/signup?ref=dapr), 100 GB/month of free data ingest, 1 free full access user, unlimited free basic users
 
 ## Configure Dapr tracing
 

sdkdocs/dotnet

@@ -0,0 +1 @@
+Subproject commit 5f5326b83fa52fe1965f60f2161eb18b2940cc10