dapr
/
docs
mirror of https://github.com/dapr/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master-from-website-merge-20201203

This commit is contained in:
Mark Chmarny 2020-12-03 10:58:07 -08:00 committed by GitHub
parent f6b9ddee3d 66a4919079
commit 37467fdb0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daprdocs/content/en/concepts/overview.md
View File

@ -118,4 +118,4 @@ The `dapr-sentry` service is a certificate authority that enables mutual TLS bet
<img src="/images/overview_kubernetes.png" width=800>
Deploying and running a Dapr enabled application into your Kubernetes cluster is a simple as adding a few annotations to the deployment schemes. You can see some examples [here](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes/deploy) in the Kubernetes getting started sample. Try this out with the [Kubernetes quickstart](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes).
Deploying and running a Dapr enabled application into your Kubernetes cluster is as simple as adding a few annotations to the deployment schemes. You can see some examples [here](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes/deploy) in the Kubernetes getting started sample. Try this out with the [Kubernetes quickstart](https://github.com/dapr/quickstarts/tree/master/hello-kubernetes).

4
daprdocs/content/en/operations/monitoring/grafana.md
View File

@ -84,9 +84,9 @@ First you need to connect Prometheus as a data source to Grafana.
![data source](/images/grafana-datasources.png)
5. Add Prometheus as a data soruce.
5. Add Prometheus as a data source.
![add data source](/images/grafana-datasources.png)
![add data source](/images/grafana-add-datasources.png)
6. Enter Promethesus server address in your cluster.