Merge branch 'master' into use-cases

README.md

@@ -29,6 +29,7 @@ Dapr is currently under community development in preview phase and master branch
 
 | Version | Repo |
 |:-------:|:----:|
+| v0.6.0 | [Docs](https://github.com/dapr/docs/tree/v0.6.0) - [Runtime](https://github.com/dapr/dapr/tree/v0.6.0) - [CLI](https://github.com/dapr/cli/tree/release-0.6)
 | v0.5.0 | [Docs](https://github.com/dapr/docs/tree/v0.5.0) - [Runtime](https://github.com/dapr/dapr/tree/v0.5.0) - [CLI](https://github.com/dapr/cli/tree/release-0.5)
 | v0.4.0 | [Docs](https://github.com/dapr/docs/tree/v0.4.0) - [Runtime](https://github.com/dapr/dapr/tree/v0.4.0) - [CLI](https://github.com/dapr/cli/tree/release-0.4)
 | v0.3.0 | [Docs](https://github.com/dapr/docs/tree/v0.3.0) - [Runtime](https://github.com/dapr/dapr/tree/v0.3.0) - [CLI](https://github.com/dapr/cli/tree/release-0.3)

getting-started/environment-setup.md

@@ -43,6 +43,12 @@ Install the latest darwin Dapr CLI to `/usr/local/bin`
 curl -fsSL https://raw.githubusercontent.com/dapr/cli/master/install/install.sh | /bin/bash
 ```
 
+Or install via [Homebrew](https://brew.sh)
+
+```bash
+brew install dapr/tap/dapr-cli
+```
+
 ### From the Binary Releases
 
 Each release of Dapr CLI includes various OSes and architectures. These binary versions can be manually downloaded and installed.

howto/setup-monitoring-tools/setup-fluentd-es-kibana.md

@@ -1,4 +1,4 @@
-# Set up Fleuntd, Elastic search, and Kibana in Kubernetes
+# Set up Fluentd, Elastic search, and Kibana in Kubernetes
 
 This document descriebs how to install Fluentd, Elastic Search, and Kibana to search logs in Kubernetes
 
@@ -32,6 +32,14 @@ helm repo update
 
 3. Install Elastic Search using Helm
 
+By default the chart creates 3 replicas which must be on different nodes.  If your cluster has less than 3 nodes, specify a lower number of replicas.  For example, this sets it to 1:
+
+```
+helm install elasticsearch elastic/elasticsearch -n dapr-monitoring --set replicas=1
+```
+
+Otherwise:
+
 ```bash
 helm install elasticsearch elastic/elasticsearch -n dapr-monitoring
 ```
@@ -62,14 +70,20 @@ kibana-kibana-95bc54b89-zqdrk   1/1     Running   0          4m21s
 
 1. Install config map and Fluentd as a daemonset
 
-> Note: If you are running Fluentd in your cluster, please enable the nested json parser to parse JSON formatted log from Dapr.
+Navigate to the following path if you're not already there (the one this document is in):
+
+```
+docs/howto/setup-monitoring-tools
+```
+
+> Note: If you already have Fluentd running in your cluster, please enable the nested json parser to parse JSON formatted log from Dapr.
 
 ```bash
 kubectl apply -f ./fluentd-config-map.yaml
 kubectl apply -f ./fluentd-dapr-with-rbac.yaml
 ```
 
-2. Ensure that Fluentd is running as a daemonset
+2. Ensure that Fluentd is running as a daemonset; the number of instances should be the same as the number of cluster nodes.  In the example below we only have 1 node.
 
 ```bash
 kubectl get pods -n kube-system -w
@@ -86,6 +100,8 @@ fluentd-sdrld                 1/1     Running   0          14s
 1. Install Dapr with enabling JSON-formatted logs
 
 ```bash
+helm repo add dapr https://daprio.azurecr.io/helm/v1/repo
+helm repo update
 helm install dapr dapr/dapr --namespace dapr-system --set global.logAsJson=true
 ```
 

howto/setup-monitoring-tools/setup-prometheus-grafana.md

@@ -24,6 +24,8 @@ kubectl create namespace dapr-monitoring
 2. Install Prometheus
 
 ```bash
+helm repo add stable https://kubernetes-charts.storage.googleapis.com
+helm repo update
 helm install dapr-prom stable/prometheus -n dapr-monitoring
 ```
 
@@ -50,7 +52,7 @@ helm install grafana stable/grafana -n dapr-monitoring --set persistence.enabled
 > Note: remove `%` character from the password that this command returns. The admin password is `cj3m0OfBNx8SLzUlTx91dEECgzRlYJb60D2evof1`.
 
 ```
-kubernetes get secret --namespace dapr-monitoring grafana -o jsonpath="{.data.admin-password}" | base64 --decode
+kubectl get secret --namespace dapr-monitoring grafana -o jsonpath="{.data.admin-password}" | base64 --decode
 cj3m0OfBNx8SLzUlTx91dEECgzRlYJb60D2evof1%
 ```
 
@@ -129,9 +131,9 @@ So you need to set up Prometheus data source with the below settings:
 
 8. Import Dapr dashboards.
 
-You can now import built-in [Grafana dashboard templates](../../reference/dashboard/README.md).
+In the upper left, click the "+" then "Import". 
 
-Refer [here](../../reference/dashboard/README.md) for details.
+You can now import built-in [Grafana dashboard templates](../../reference/dashboard/README.md).  Please see the link for the templates.
 
 ![upload json](./img/grafana-uploadjson.png)