Merge branch 'php-ref' of https://github.com/dapr/docs into php-ref

daprdocs/content/en/concepts/middleware-concept.md

@@ -12,7 +12,7 @@ Dapr allows custom processing pipelines to be defined by chaining a series of mi
 
 ## Customize processing pipeline
 
-When launched, a Dapr sidecar constructs a middleware processing pipeline. By default the pipeline consists of [tracing middleware]({{< ref tracing.md >}}) and CORS middleware. Additional middleware, configured by a Dapr [configuration]({{< ref configuration-concept.md >}}), can be added to the pipeline in the order they are defined. The pipeline applies to all Dapr API endpoints, including state, pub/sub, service invocation, bindings, security and others.
+When launched, a Dapr sidecar constructs a middleware processing pipeline. By default the pipeline consists of [tracing middleware]({{< ref tracing-overview.md >}}) and CORS middleware. Additional middleware, configured by a Dapr [configuration]({{< ref configuration-concept.md >}}), can be added to the pipeline in the order they are defined. The pipeline applies to all Dapr API endpoints, including state, pub/sub, service invocation, bindings, security and others.
 
 > **NOTE:** Dapr provides a **middleware.http.uppercase** pre-registered component that changes all text in a request body to uppercase. You can use it to test/verify if your custom pipeline is in place.
 

daprdocs/content/en/developing-applications/building-blocks/observability/w3c-tracing/w3c-tracing-howto.md

@@ -10,7 +10,7 @@ type: docs
 # How to use trace context
 Dapr uses W3C trace context for distributed tracing for both service invocation and pub/sub messaging. Dapr does all the heavy lifting of generating and propagating the trace context information and there are very few cases where you need to either propagate or create a trace context. First read scenarios in the [W3C distributed tracing]({{< ref w3c-tracing >}}) article to understand whether you need to propagate or create a trace context.
 
-To view traces, read the [how to diagnose with tracing]({{< ref tracing.md >}}) article.
+To view traces, read the [how to diagnose with tracing]({{< ref tracing-overview.md >}}) article.
 
 ## How to retrieve trace context from a response
 `Note: There are no helper methods exposed in Dapr SDKs to propagate and retrieve trace context. You need to use http/gRPC clients to propagate and retrieve trace headers through http headers and gRPC metadata.`

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

@@ -31,9 +31,9 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho
 
 | Language | Version | Client SDK | Service Extensions | Actor SDK |
 |----------|:-----:|:----------:|:-----------:|:---------:|
-| [.NET](https://github.com/dapr/dotnet-sdk) | v1.0 | ✔ | ASP.NET Core | ✔ |
-| [Python]({{< ref python >}}) | v1.0 | ✔ | [gRPC]({{< ref python-grpc.md >}}) | [FastAPI]({{< ref python-fastapi.md >}})<br />[Flask]({{< ref python-flask.md >}}) |
-| [Java](https://github.com/dapr/java-sdk) | v1.0 | ✔ | Spring Boot | ✔ |
+| [.NET](https://github.com/dapr/dotnet-sdk) | v1.0 | ✔ |  ✔ </br>ASP.NET Core | ✔ |
+| [Python]({{< ref python >}}) | v1.0 | ✔ | ✔ </br>[gRPC]({{< ref python-grpc.md >}}) | ✔ </br>[FastAPI]({{< ref python-fastapi.md >}})<br />[Flask]({{< ref python-flask.md >}}) |
+| [Java](https://github.com/dapr/java-sdk) | v1.0 | ✔ |  ✔ </br>Spring Boot | ✔ |
 | [Go](https://github.com/dapr/go-sdk) | v1.0 | ✔ | ✔ |  |
 | [PHP](https://github.com/dapr/php-sdk) | Preview | ✔ | ✔ | ✔ |
 | [C++](https://github.com/dapr/cpp-sdk) | Preview | ✔ | |
@@ -42,4 +42,4 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho
 
 ## Further reading
 
-- [Serialization in the Dapr SDKs]({{< ref sdk-serialization.md >}})
+- [Serialization in the Dapr SDKs]({{< ref sdk-serialization.md >}})

daprdocs/content/en/operations/configuration/configuration-overview.md

@@ -73,7 +73,7 @@ The following table lists the properties for tracing:
 `samplingRate` is used to enable or disable the tracing. To disable the sampling rate ,
 set `samplingRate : "0"` in the configuration. The valid range of samplingRate is between 0 and 1 inclusive. The sampling rate determines whether a trace span should be sampled or not based on value. `samplingRate : "1"` samples all traces. By default, the sampling rate is (0.0001) or 1 in 10,000 traces.
 
-See [Observability distributed tracing]({{< ref "tracing.md" >}}) for more information
+See [Observability distributed tracing]({{< ref "tracing-overview.md" >}}) for more information
 
 #### Metrics
 
@@ -92,7 +92,7 @@ The following table lists the properties for metrics:
 |--------------|--------|-------------|
 | `enabled` | boolean | Whether metrics should to be enabled.
 
-See [metrics documentation]({{< ref "metrics.md" >}}) for more information
+See [metrics documentation]({{< ref "metrics-overview.md" >}}) for more information
 
 #### Middleware
 

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

@@ -0,0 +1,8 @@
+---
+type: docs
+title: "Logging"
+linkTitle: "Logging"
+weight: 400
+description: "How to setup loggings for Dapr sidecar, and your application"
+---
+

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

@@ -187,3 +187,4 @@ Handling connection for 5601
 * [Elastic search helm chart](https://github.com/elastic/helm-charts/tree/master/elasticsearch)
 * [Kibana helm chart](https://github.com/elastic/helm-charts/tree/master/kibana)
 * [Kibana Query Language](https://www.elastic.co/guide/en/kibana/current/kuery-query.html)
+* [Troubleshooting using Logs]({{< ref "logs-troubleshooting.md" >}})

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

@@ -0,0 +1,7 @@
+---
+type: docs
+title: "Metrics"
+linkTitle: "Metrics"
+weight: 300
+description: "How to view Dapr metrics"
+---

daprdocs/content/en/operations/monitoring/tracing/_index.md

@@ -0,0 +1,7 @@
+---
+type: docs
+title: "Tracing"
+linkTitle: "Tracing"
+weight: 100
+description: "How to setup your trace backend to receive application traces from Dapr"
+---

daprdocs/content/en/operations/monitoring/tracing/backends/_index.md

@@ -0,0 +1,7 @@
+---
+type: docs
+title: "Common Tracing Backends"
+linkTitle: "Common Tracing Backends"
+weight: 3000
+description: "How to setup various common tracing backends"
+---

daprdocs/content/en/operations/monitoring/tracing/setup-tracing.md

@@ -1,8 +1,8 @@
 ---
 type: docs
-title: "Tracing"
-linkTitle: "Tracing"
-weight: 3000
+title: "Configure Dapr to send distributed tracing data"
+linkTitle: "Enable Dapr tracing for your application"
+weight: 100
 description: "Configure Dapr to send distributed tracing data"
 ---
 

daprdocs/content/en/operations/troubleshooting/logs-troubleshooting.md

@@ -178,3 +178,7 @@ time="2019-09-04T00:21:57Z" level=info msg="host added: 10.244.1.89"
 ### Non Kubernetes Environments
 
 The examples above are specific specific to Kubernetes, but the principal is the same for any kind of container based environment: simply grab the container ID of the Dapr sidecar and/or system component (if applicable) and view its logs.
+
+## References
+
+* [How to setup loggings for Dapr sidecar, and your application]({{< ref "logging.md" >}})