From 18f5e6669021eee9de038b44be7b907ccddaf173 Mon Sep 17 00:00:00 2001 From: vikram-thiru <113989405+vikram-thiru@users.noreply.github.com> Date: Wed, 23 Nov 2022 23:08:31 +0530 Subject: [PATCH 1/3] 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 <113989405+vikram-thiru@users.noreply.github.com> Signed-off-by: vikram-thiru <113989405+vikram-thiru@users.noreply.github.com> --- .../content/en/operations/monitoring/logging/fluentd.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daprdocs/content/en/operations/monitoring/logging/fluentd.md b/daprdocs/content/en/operations/monitoring/logging/fluentd.md index 4dbd1d171..b456b8d95 100644 --- a/daprdocs/content/en/operations/monitoring/logging/fluentd.md +++ b/daprdocs/content/en/operations/monitoring/logging/fluentd.md @@ -32,25 +32,25 @@ description: "How to install Fluentd, Elastic Search, and Kibana to search logs By default, the chart creates 3 replicas which must be on different nodes. If your cluster has fewer than 3 nodes, specify a smaller number of replicas. For example, this sets the number of replicas to 1: ```bash - helm install elasticsearch elastic/elasticsearch -n dapr-monitoring --set replicas=1 + helm install elasticsearch elastic/elasticsearch --version 7.17.3 -n dapr-monitoring --set replicas=1 ``` Otherwise: ```bash - helm install elasticsearch elastic/elasticsearch -n dapr-monitoring + helm install elasticsearch elastic/elasticsearch --version 7.17.3 -n dapr-monitoring ``` If you are using minikube or simply want to disable persistent volumes for development purposes, you can do so by using the following command: ```bash - helm install elasticsearch elastic/elasticsearch -n dapr-monitoring --set persistence.enabled=false,replicas=1 + helm install elasticsearch elastic/elasticsearch --version 7.17.3 -n dapr-monitoring --set persistence.enabled=false,replicas=1 ``` 4. Install Kibana ```bash - helm install kibana elastic/kibana -n dapr-monitoring + helm install kibana elastic/kibana --version 7.17.3 -n dapr-monitoring ``` 5. Ensure that Elastic Search and Kibana are running in your Kubernetes cluster From 976dcab9ce725c1ed9ce7b5e77d8d56de3e89777 Mon Sep 17 00:00:00 2001 From: Chris Kingdon Date: Wed, 23 Nov 2022 12:54:39 -0500 Subject: [PATCH 2/3] Adding missing brace for json document example (#2968) There is a missing brace in the example json Signed-off-by: Chris Kingdon Signed-off-by: Chris Kingdon Co-authored-by: Yaron Schneider --- .../components-reference/supported-state-stores/setup-redis.md | 1 + 1 file changed, 1 insertion(+) diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-redis.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-redis.md index 4a1eb18ce..3c323b074 100644 --- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-redis.md +++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-redis.md @@ -230,6 +230,7 @@ Consider an example where you store documents like that: }, "city": "Seattle", "state": "WA" + } } ``` From 9ee2e27b40514c35885cb1e40a9da18265b1e894 Mon Sep 17 00:00:00 2001 From: "Renato L. de F. Cunha" Date: Fri, 25 Nov 2022 19:37:19 -0300 Subject: [PATCH 3/3] 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 Signed-off-by: Renato L. de F. Cunha --- .../en/operations/hosting/kubernetes/kubernetes-job.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-job.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-job.md index 6691c742c..0b2139fdd 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-job.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-job.md @@ -14,9 +14,12 @@ To address this issue the Dapr sidecar has an endpoint to `Shutdown` the sidecar When running a basic [Kubernetes Job](https://kubernetes.io/docs/concepts/workloads/controllers/job/) you will need to call the `/shutdown` endpoint for the sidecar to gracefully stop and the job will be considered `Completed`. -When a job is finish without calling `Shutdown` your job will be in a `NotReady` state with only the `daprd` container running endlessly. +When a job is finished without calling `Shutdown`, your job will be in a `NotReady` state with only the `daprd` container running endlessly. -Be sure and use the *POST* HTTP verb when calling the shutdown API. +Stopping the dapr sidecar will cause its readiness and liveness probes to fail in your container because the dapr sidecar was shutdown. +To prevent Kubernetes from trying to restart your job, set your job's `restartPolicy` to `Never`. + +Be sure to use the *POST* HTTP verb when calling the shutdown HTTP API. ```yaml apiVersion: batch/v1 @@ -37,7 +40,7 @@ spec: restartPolicy: Never ``` -You can also call the `Shutdown` from any of the Dapr SDK +You can also call the `Shutdown` from any of the Dapr SDKs ```go package main