From 8c0eebc065b50a2f2716fe7cdbcde3fdd3a14110 Mon Sep 17 00:00:00 2001 From: Donovan Brown Date: Fri, 1 Oct 2021 21:48:31 +0000 Subject: [PATCH 01/14] Closing issue #1410 --- .../supported-state-stores/setup-sqlserver.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-sqlserver.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-sqlserver.md index b2e0bd148..be20f5ca1 100644 --- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-sqlserver.md +++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-sqlserver.md @@ -25,7 +25,7 @@ spec: - name: connectionString value: # Required. - name: tableName - value: # Required. + value: # Optional. defaults to "state" - name: keyType value: # Optional. defaults to "string" - name: keyLength @@ -52,8 +52,8 @@ If you wish to use SQL server as an [actor state store]({{< ref "state_api.md#co | Field | Required | Details | Example | |--------------------|:--------:|---------|---------| -| connectionString | Y | The connection string used to connect | `"Server=myServerName\myInstanceName;Database=myDataBase;User Id=myUsername;Password=myPassword;"` -| tableName | Y | The name of the table to use. Alpha-numeric with underscores | `"table_name"` +| connectionString | Y | The connection string used to connect. If the connection string contains the database it must already exist. If the database is omitted a default database named `"Dapr"` will be created. | `"Server=myServerName\myInstanceName;Database=myDataBase;User Id=myUsername;Password=myPassword;"` +| tableName | N | The name of the table to use. Alpha-numeric with underscores. Defaults to `"state"` | `"table_name"` | keyType | N | The type of key used. Defaults to `"string"` | `"string"` | keyLength | N | The max length of key. Used along with `"string"` keytype. Defaults to `"200"` | `"200"` | schema | N | The schema to use. Defaults to `"dbo"` | `"dapr"`,`"dbo"` @@ -69,7 +69,7 @@ If you wish to use SQL server as an [actor state store]({{< ref "state_api.md#co In order to setup SQL Server as a state store, you need the following properties: -- **Connection String**: the SQL Server connection string. For example: server=localhost;user id=sa;password=your-password;port=1433;database=mydatabase; +- **Connection String**: The SQL Server connection string. For example: server=localhost;user id=sa;password=your-password;port=1433;database=mydatabase; - **Schema**: The database schema to use (default=dbo). Will be created if does not exist - **Table Name**: The database table name. Will be created if does not exist - **Indexed Properties**: Optional properties from json data which will be indexed and persisted as individual column From 81cc4d7740703746a96eb5bc989e56b7d30996c4 Mon Sep 17 00:00:00 2001 From: Donovan Brown Date: Fri, 1 Oct 2021 17:31:47 -0500 Subject: [PATCH 02/14] Update setup-sqlserver.md Incorporating feedback --- .../supported-state-stores/setup-sqlserver.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-sqlserver.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-sqlserver.md index be20f5ca1..76dec26e9 100644 --- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-sqlserver.md +++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-sqlserver.md @@ -52,7 +52,7 @@ If you wish to use SQL server as an [actor state store]({{< ref "state_api.md#co | Field | Required | Details | Example | |--------------------|:--------:|---------|---------| -| connectionString | Y | The connection string used to connect. If the connection string contains the database it must already exist. If the database is omitted a default database named `"Dapr"` will be created. | `"Server=myServerName\myInstanceName;Database=myDataBase;User Id=myUsername;Password=myPassword;"` +| connectionString | Y | The connection string used to connect. If the connection string contains the database it must already exist. If the database is omitted a default database named `"Dapr"` is created. | `"Server=myServerName\myInstanceName;Database=myDataBase;User Id=myUsername;Password=myPassword;"` | tableName | N | The name of the table to use. Alpha-numeric with underscores. Defaults to `"state"` | `"table_name"` | keyType | N | The type of key used. Defaults to `"string"` | `"string"` | keyLength | N | The max length of key. Used along with `"string"` keytype. Defaults to `"200"` | `"200"` From a8d53c132292864f96092e8343d504013b0169c9 Mon Sep 17 00:00:00 2001 From: Ori Zohar Date: Tue, 5 Oct 2021 16:29:47 -0700 Subject: [PATCH 03/14] Adding DaprCon card at top of main page --- daprdocs/content/en/_index.md | 16 ++++++++++++++++ daprdocs/static/images/daprcon.png | Bin 0 -> 28556 bytes 2 files changed, 16 insertions(+) create mode 100644 daprdocs/static/images/daprcon.png diff --git a/daprdocs/content/en/_index.md b/daprdocs/content/en/_index.md index 5243416f2..57a57378f 100644 --- a/daprdocs/content/en/_index.md +++ b/daprdocs/content/en/_index.md @@ -3,6 +3,22 @@ type: docs no_list: true --- +
+
+
+
+ DaprCon logo + Join us for DaprCon on October 19th-20th, 2021! +
+

+ The first ever DaprCon will take place October 19th-20th, 2021 virtually! Tune in for free and attend technical sessions, panels and real world examples from the community on building applications with Dapr!

Learn more >> +

+ +
+
+
+ +

# Dapr Docs Welcome to the Dapr documentation site! diff --git a/daprdocs/static/images/daprcon.png b/daprdocs/static/images/daprcon.png new file mode 100644 index 0000000000000000000000000000000000000000..ed0d3882c1825758c5b9ef7da8ff1da4e051163b GIT binary patch literal 28556 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 literal 0 HcmV?d00001 From 30d1181f1330b93e3f528f767509c1cb3f7acdeb Mon Sep 17 00:00:00 2001 From: Ori Zohar Date: Tue, 5 Oct 2021 16:40:59 -0700 Subject: [PATCH 04/14] Close i tag --- daprdocs/content/en/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/_index.md b/daprdocs/content/en/_index.md index 57a57378f..9c9315f0e 100644 --- a/daprdocs/content/en/_index.md +++ b/daprdocs/content/en/_index.md @@ -11,7 +11,7 @@ no_list: true Join us for DaprCon on October 19th-20th, 2021!

- The first ever DaprCon will take place October 19th-20th, 2021 virtually! Tune in for free and attend technical sessions, panels and real world examples from the community on building applications with Dapr!

Learn more >> + The first ever DaprCon will take place October 19th-20th, 2021 virtually! Tune in for free and attend technical sessions, panels and real world examples from the community on building applications with Dapr!

Learn more >>

From 9a34fade366993d07f484e8d85dc46720826dd9b Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Thu, 7 Oct 2021 09:48:43 -0700 Subject: [PATCH 05/14] Bump runtime version references to 1.4.3 and supported versions table --- .../content/en/operations/support/support-release-policy.md | 6 +++++- daprdocs/layouts/shortcodes/dapr-latest-version.html | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index 5ec7285f2..afb35acf4 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/daprdocs/content/en/operations/support/support-release-policy.md @@ -42,7 +42,9 @@ The table below shows the versions of Dapr releases that have been tested togeth | Jul 26th 2021 | 1.3
| 1.3.0 | Java 1.2.0
Go 1.2.0
PHP 1.1.0
Python 1.2.0
.NET 1.3.0 | 0.7.0 | Supported | | Sep 14th 2021 | 1.3.1
| 1.3.0 | Java 1.2.0
Go 1.2.0
PHP 1.1.0
Python 1.2.0
.NET 1.3.0 | 0.7.0 | Supported | | Sep 15th 2021 | 1.4
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported | -| Sep 22nd 2021 | 1.4.1
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported (current) | +| Sep 22nd 2021 | 1.4.1
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported +| Sep 15th 2021 | 1.4.2
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported | +| Sep 22nd 2021 | 1.4.3
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported (current) | ## Upgrade paths After the 1.0 release of the runtime there may be situations where it is necessary to explicitly upgrade through an additional release to reach the desired target. For example an upgrade from v1.0 to v1.2 may need go pass through v1.1 @@ -66,6 +68,8 @@ General guidance on upgrading can be found for [self hosted mode]({{ Date: Thu, 7 Oct 2021 09:57:53 -0700 Subject: [PATCH 06/14] Fixing closing b tag --- daprdocs/content/en/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/_index.md b/daprdocs/content/en/_index.md index 9c9315f0e..6ca2cff4c 100644 --- a/daprdocs/content/en/_index.md +++ b/daprdocs/content/en/_index.md @@ -11,7 +11,7 @@ no_list: true Join us for DaprCon on October 19th-20th, 2021!

- The first ever DaprCon will take place October 19th-20th, 2021 virtually! Tune in for free and attend technical sessions, panels and real world examples from the community on building applications with Dapr!

Learn more >> + The first ever DaprCon will take place October 19th-20th, 2021 virtually! Tune in for free and attend technical sessions, panels and real world examples from the community on building applications with Dapr!

Learn more >>

From cbc8034324c64a42c21076f600290871beb99df4 Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Thu, 7 Oct 2021 10:57:38 -0700 Subject: [PATCH 07/14] Address PR review comments --- .../operations/support/support-release-policy.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index afb35acf4..5cb817e11 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/daprdocs/content/en/operations/support/support-release-policy.md @@ -43,8 +43,8 @@ The table below shows the versions of Dapr releases that have been tested togeth | Sep 14th 2021 | 1.3.1
| 1.3.0 | Java 1.2.0
Go 1.2.0
PHP 1.1.0
Python 1.2.0
.NET 1.3.0 | 0.7.0 | Supported | | Sep 15th 2021 | 1.4
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported | | Sep 22nd 2021 | 1.4.1
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported -| Sep 15th 2021 | 1.4.2
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported | -| Sep 22nd 2021 | 1.4.3
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported (current) | +| Sep 24th 2021 | 1.4.2
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported | +| Oct 7th 2021 | 1.4.3
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported (current) | ## Upgrade paths After the 1.0 release of the runtime there may be situations where it is necessary to explicitly upgrade through an additional release to reach the desired target. For example an upgrade from v1.0 to v1.2 may need go pass through v1.1 @@ -59,14 +59,24 @@ General guidance on upgrading can be found for [self hosted mode]({{ Date: Thu, 7 Oct 2021 11:08:51 -0700 Subject: [PATCH 08/14] Corrected upgrade paths --- .../en/operations/support/support-release-policy.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index 5cb817e11..317803f3d 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/daprdocs/content/en/operations/support/support-release-policy.md @@ -78,8 +78,11 @@ General guidance on upgrading can be found for [self hosted mode]({{ Date: Thu, 7 Oct 2021 11:48:43 -0700 Subject: [PATCH 09/14] Update kubectl links --- .../en/operations/hosting/kubernetes/cluster/setup-aks.md | 2 +- .../en/operations/hosting/kubernetes/cluster/setup-gke.md | 2 +- .../en/operations/hosting/kubernetes/cluster/setup-minikube.md | 2 +- .../en/operations/hosting/kubernetes/kubernetes-deploy.md | 2 +- daprdocs/content/en/operations/monitoring/logging/fluentd.md | 2 +- .../content/en/operations/monitoring/metrics/azure-monitor.md | 2 +- daprdocs/content/en/operations/monitoring/metrics/prometheus.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-aks.md b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-aks.md index 905ef73b7..0323ba208 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-aks.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-aks.md @@ -12,7 +12,7 @@ description: > ## Prerequisites - [Docker](https://docs.docker.com/install/) -- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) +- [kubectl](https://kubernetes.io/docs/tasks/tools/) - [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest) ## Deploy an Azure Kubernetes Service cluster diff --git a/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-gke.md b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-gke.md index 5a7b7607c..53d278669 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-gke.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-gke.md @@ -8,7 +8,7 @@ description: "Setup a Google Kubernetes Engine cluster" ### Prerequisites -- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) +- [kubectl](https://kubernetes.io/docs/tasks/tools/) - [Google Cloud SDK](https://cloud.google.com/sdk) ## Create a new cluster diff --git a/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md index ef1d0110d..09762c9fd 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/cluster/setup-minikube.md @@ -12,7 +12,7 @@ description: > ## Prerequisites - [Docker](https://docs.docker.com/install/) -- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) +- [kubectl](https://kubernetes.io/docs/tasks/tools/) - [Minikube](https://minikube.sigs.k8s.io/docs/start/) > Note: For Windows, enable Virtualization in BIOS and [install Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v) diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md index afa7a238a..81b62d716 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md @@ -15,7 +15,7 @@ For more information on what is deployed to your Kubernetes cluster read the [Ku ## Prerequisites - Install [Dapr CLI]({{< ref install-dapr-cli.md >}}) -- Install [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) +- Install [kubectl](https://kubernetes.io/docs/tasks/tools/) - Kubernetes cluster (see below if needed) ### Create cluster diff --git a/daprdocs/content/en/operations/monitoring/logging/fluentd.md b/daprdocs/content/en/operations/monitoring/logging/fluentd.md index 0c15c1584..fd0758418 100644 --- a/daprdocs/content/en/operations/monitoring/logging/fluentd.md +++ b/daprdocs/content/en/operations/monitoring/logging/fluentd.md @@ -9,7 +9,7 @@ description: "How to install Fluentd, Elastic Search, and Kibana to search logs ## Prerequisites - Kubernetes (> 1.14) -- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) +- [kubectl](https://kubernetes.io/docs/tasks/tools/) - [Helm 3](https://helm.sh/) ## Install Elastic search and Kibana diff --git a/daprdocs/content/en/operations/monitoring/metrics/azure-monitor.md b/daprdocs/content/en/operations/monitoring/metrics/azure-monitor.md index 852716e76..c253d4f42 100644 --- a/daprdocs/content/en/operations/monitoring/metrics/azure-monitor.md +++ b/daprdocs/content/en/operations/monitoring/metrics/azure-monitor.md @@ -10,7 +10,7 @@ description: "Enable Dapr metrics and logs with Azure Monitor for Azure Kubernet - [Azure Kubernetes Service](https://docs.microsoft.com/en-us/azure/aks/) - [Enable Azure Monitor For containers in AKS](https://docs.microsoft.com/en-us/azure/azure-monitor/insights/container-insights-overview) -- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) +- [kubectl](https://kubernetes.io/docs/tasks/tools/) - [Helm 3](https://helm.sh/) ## Enable Prometheus metric scrape using config map diff --git a/daprdocs/content/en/operations/monitoring/metrics/prometheus.md b/daprdocs/content/en/operations/monitoring/metrics/prometheus.md index b81f1f539..b179b75a0 100644 --- a/daprdocs/content/en/operations/monitoring/metrics/prometheus.md +++ b/daprdocs/content/en/operations/monitoring/metrics/prometheus.md @@ -67,7 +67,7 @@ Once Prometheus is running, you'll be able to visit its dashboard by visiting `h ### Prerequisites - Kubernetes (> 1.14) -- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) +- [kubectl](https://kubernetes.io/docs/tasks/tools/) - [Helm 3](https://helm.sh/) ### Install Prometheus From 392ac6bd2a191343b461fdeab8007f894e5af841 Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Thu, 7 Oct 2021 13:28:10 -0700 Subject: [PATCH 10/14] Update supported versions table --- .../support/support-release-policy.md | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index 317803f3d..a07e40e4e 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/daprdocs/content/en/operations/support/support-release-policy.md @@ -58,31 +58,16 @@ General guidance on upgrading can be found for [self hosted mode]({{ Date: Fri, 15 Oct 2021 05:13:43 +0800 Subject: [PATCH 11/14] Fix typo (#1850) --- .../en/developing-applications/integrations/workflows.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/developing-applications/integrations/workflows.md b/daprdocs/content/en/developing-applications/integrations/workflows.md index ec30a0e1e..7261e5ddf 100644 --- a/daprdocs/content/en/developing-applications/integrations/workflows.md +++ b/daprdocs/content/en/developing-applications/integrations/workflows.md @@ -128,7 +128,7 @@ Prerequisites: 1. Create a Config Map for the workflow: ```bash - kubectl create configmap workflows --from-file ./samples/workflow1. json + kubectl create configmap workflows --from-file ./samples/workflow1.json ``` 1. Create a secret containing the Azure Storage Account credentials. Replace the account name and key values below with the actual credentials: @@ -228,4 +228,4 @@ Watch an example from the Dapr community call: ## Additional resources - [Blog announcement](https://cloudblogs.microsoft.com/opensource/2020/05/26/announcing-cloud-native-workflows-dapr-logic-apps/) -- [Repo](https://github.com/dapr/workflows) \ No newline at end of file +- [Repo](https://github.com/dapr/workflows) From 513d8c7630436d1f3689ef7dcb3cc01ead870576 Mon Sep 17 00:00:00 2001 From: Donovan Brown Date: Sun, 17 Oct 2021 18:08:35 -0500 Subject: [PATCH 12/14] Update setup-firestore.md Fixed typo where the word should be Firestore not Firestone. --- .../supported-state-stores/setup-firestore.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-firestore.md b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-firestore.md index 10a964aa6..2ea52382e 100644 --- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-firestore.md +++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-firestore.md @@ -65,7 +65,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr | client_x509_cert_url | Y | The client certificate URL | `"https://www.googleapis.com/robot/v1/metadata/x509/x"` | entity_kind | N | The entity name in Filestore. Defaults to `"DaprState"` | `"DaprState"` -## Setup GCP Firestone +## Setup GCP Firestore {{< tabs "Self-Hosted" "Google Cloud" >}} From 9ddab5df7d906a1c2ceec418f5e5caef3dc3c948 Mon Sep 17 00:00:00 2001 From: "Anh Le (Andy)" Date: Wed, 20 Oct 2021 11:22:06 +0700 Subject: [PATCH 13/14] Env variables inconsistency (#1835) * Remove uncessary env variables ISSUE-1781 * Remove unnecessary env variables ISSUE-1781 * Update env variables in other sections - Remove outdated env variables - Docs are re-formatted for readability ISSUE-1781 * run command: remove arg placement-host-address ISSUE-1781 * Env: rename `dapr runtime` into `dapr sidecar` ISSUE-1781 * cli: resolve complains by MarkDown linter * cli: smaller headers * cli: remove verbose .lead element * readme: fix styles * Dapr Init: update examples to use latest version * Dapr run: add example for Go * Env: update components using APP_API_TOKEN * env: update usage for APP_API_TOKEN Co-authored-by: Yaron Schneider Co-authored-by: Mark Fussell --- README.md | 23 ++++-- .../content/en/reference/cli/cli-overview.md | 4 +- .../en/reference/cli/dapr-build-info.md | 9 +-- .../en/reference/cli/dapr-completion.md | 38 ++++++---- .../en/reference/cli/dapr-components.md | 20 +++--- .../en/reference/cli/dapr-configurations.md | 24 +++---- .../en/reference/cli/dapr-dashboard.md | 45 +++++------- .../content/en/reference/cli/dapr-help.md | 12 ++-- .../content/en/reference/cli/dapr-init.md | 71 +++++++++--------- .../content/en/reference/cli/dapr-invoke.md | 35 +++++---- .../content/en/reference/cli/dapr-list.md | 31 ++++---- .../content/en/reference/cli/dapr-logs.md | 28 ++++---- .../en/reference/cli/dapr-mtls/_index.md | 28 ++++---- .../cli/dapr-mtls/dapr-mtls-expiry.md | 19 ++--- .../cli/dapr-mtls/dapr-mtls-export.md | 21 +++--- .../content/en/reference/cli/dapr-publish.md | 28 ++++---- daprdocs/content/en/reference/cli/dapr-run.md | 72 ++++++++----------- .../content/en/reference/cli/dapr-status.md | 20 +++--- .../content/en/reference/cli/dapr-stop.md | 20 +++--- .../en/reference/cli/dapr-uninstall.md | 32 +++++---- .../content/en/reference/cli/dapr-upgrade.md | 35 +++++---- .../en/reference/environment/_index.md | 19 ++--- daprdocs/layouts/docs/list.html | 3 +- 23 files changed, 323 insertions(+), 314 deletions(-) diff --git a/README.md b/README.md index 768ba03c4..4997d48e5 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ The Dapr docs handles branching differently than most code repositories. Instead The following branches are currently maintained: -| Branch | Website | Description | -|--------|---------|-------------| -| [v1.4](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. -| [v1.5](https://github.com/dapr/docs/tree/v1.5) (pre-release) | https://v1-5.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.5+ go here. +| Branch | Website | Description | +| ------------------------------------------------------------ | -------------------------- | ------------------------------------------------------------------------------------------------ | +| [v1.4](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. | +| [v1.5](https://github.com/dapr/docs/tree/v1.5) (pre-release) | https://v1-5.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.5+ go here. | For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/contributing-docs/#branch-guidance) document. @@ -38,31 +38,43 @@ The [daprdocs](./daprdocs) directory contains the hugo project, markdown files, 1. Ensure pre-requisites are installed 2. Clone this repository + ```sh git clone https://github.com/dapr/docs.git ``` + 3. Change to daprdocs directory: + ```sh -cd ./docs/daprdocs +cd ./daprdocs ``` + 4. Update submodules: + ```sh git submodule update --init --recursive ``` + 5. Install npm packages: + ```sh npm install ``` ## Run local server + 1. Make sure you're still in the `daprdocs` directory 2. Run + ```sh hugo server ``` + 3. Navigate to `http://localhost:1313/` + ## Update docs + 1. Fork repo into your account 1. Create new branch 1. Commit and push changes to forked branch @@ -70,4 +82,5 @@ hugo server 1. Staging site will automatically get created and linked to PR to review and test ## Code of Conduct + Please refer to our [Dapr community code of conduct](https://github.com/dapr/community/blob/master/CODE-OF-CONDUCT.md). diff --git a/daprdocs/content/en/reference/cli/cli-overview.md b/daprdocs/content/en/reference/cli/cli-overview.md index 8e19ef8d6..745fc2f12 100644 --- a/daprdocs/content/en/reference/cli/cli-overview.md +++ b/daprdocs/content/en/reference/cli/cli-overview.md @@ -50,7 +50,7 @@ Flags: Use "dapr [command] --help" for more information about a command. ``` -## Command Reference +### Command Reference You can learn more about each Dapr command from the links below. @@ -72,6 +72,6 @@ You can learn more about each Dapr command from the links below. - [`dapr uninstall`]({{< ref dapr-uninstall.md >}}) - [`dapr upgrade`]({{< ref dapr-upgrade.md >}}) -## Environment Variables +### Environment Variables Some Dapr flags can be set via environment variables (e.g. `DAPR_NETWORK` for the `--network` flag of the `dapr init` command). Note that specifying the flag on the command line overrides any set environment variable. \ No newline at end of file diff --git a/daprdocs/content/en/reference/cli/dapr-build-info.md b/daprdocs/content/en/reference/cli/dapr-build-info.md index 764847810..54c827e33 100644 --- a/daprdocs/content/en/reference/cli/dapr-build-info.md +++ b/daprdocs/content/en/reference/cli/dapr-build-info.md @@ -5,19 +5,20 @@ linkTitle: "build-info" description: "Detailed build information on dapr-cli and daprd executables" --- -## Description +### Description Get the version and git commit data for `dapr-cli` and `daprd` executables. -## Supported platforms +### Supported platforms - [Self-Hosted]({{< ref self-hosted >}}) -## Usage +### Usage + ```bash dapr build-info ``` -## Related facts +### Related facts You can get `daprd` build information directly by invoking `daprd --build-info` command. diff --git a/daprdocs/content/en/reference/cli/dapr-completion.md b/daprdocs/content/en/reference/cli/dapr-completion.md index 5e6e80f7c..f0f37c2c4 100644 --- a/daprdocs/content/en/reference/cli/dapr-completion.md +++ b/daprdocs/content/en/reference/cli/dapr-completion.md @@ -5,60 +5,68 @@ linkTitle: "completion" description: "Detailed information on the completion CLI command" --- -## Description +### Description Generates shell completion scripts -## Usage +### Usage ```bash dapr completion [flags] dapr completion [command] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description | -|------|----------------------|---------|-------------| -| `--help`, `-h` | | | Prints this help message | +| Name | Environment Variable | Default | Description | +| -------------- | -------------------- | ------- | ------------------------ | +| `--help`, `-h` | | | Prints this help message | -## Examples +### Examples -### Installing bash completion on macOS using Homebrew +#### Installing bash completion on macOS using Homebrew If running Bash 3.2 included with macOS: + ```bash brew install bash-completion ``` + Or, if running Bash 4.1+: + ```bash brew install bash-completion@2 ``` + Add the completion to your completion directory: + ```bash dapr completion bash > $(brew --prefix)/etc/bash_completion.d/dapr source ~/.bash_profile ``` -### Installing bash completion on Linux +#### Installing bash completion on Linux If bash-completion is not installed on Linux, please install the bash-completion' package via your distribution's package manager. Load the dapr completion code for bash into the current shell: + ```bash source <(dapr completion bash) ``` Write bash completion code to a file and source if from .bash_profile: + ```bash dapr completion bash > ~/.dapr/completion.bash.inc printf "source '$HOME/.dapr/completion.bash.inc'" >> $HOME/.bash_profile source $HOME/.bash_profile ``` -### Installing zsh completion on macOS using homebrew +#### Installing zsh completion on macOS using homebrew If zsh-completion is not installed on macOS, please install the 'zsh-completion' package: + ```bash brew install zsh-completions ``` @@ -69,33 +77,37 @@ dapr completion zsh > "${fpath[1]}/_dapr" source ~/.zshrc ``` -### Installing zsh completion on Linux +#### Installing zsh completion on Linux If zsh-completion is not installed on Linux, please install the 'zsh-completion' package via your distribution's package manager. Load the dapr completion code for zsh into the current shell: + ```bash source <(dapr completion zsh) ``` Set the dapr completion code for zsh[1] to autoload on startup: + ```bash dapr completion zsh > "${fpath[1]}/_dapr" ``` -### Installing Powershell completion on Windows +#### Installing Powershell completion on Windows Create $PROFILE if it not exists: + ```bash if (!(Test-Path -Path $PROFILE )){ New-Item -Type File -Path $PROFILE -Force } ``` Add the completion to your profile: + ```bash dapr completion powershell >> $PROFILE ``` -## Available Commands +### Available Commands ```txt bash Generates bash completion scripts diff --git a/daprdocs/content/en/reference/cli/dapr-components.md b/daprdocs/content/en/reference/cli/dapr-components.md index 693ae4e10..3d61c531b 100644 --- a/daprdocs/content/en/reference/cli/dapr-components.md +++ b/daprdocs/content/en/reference/cli/dapr-components.md @@ -5,30 +5,30 @@ linkTitle: "components" description: "Detailed information on the components CLI command" --- -## Description +### Description List all Dapr components. -## Supported platforms +### Supported platforms - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage ```bash dapr components [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--help`, `-h` | | | Print this help message | -| `--kubernetes`, `-k` | | `false` | List all Dapr components in a Kubernetes cluster | +| Name | Environment Variable | Default | Description | +| -------------------- | -------------------- | ------- | ------------------------------------------------ | +| `--help`, `-h` | | | Print this help message | +| `--kubernetes`, `-k` | | `false` | List all Dapr components in a Kubernetes cluster | -## Examples +### Examples -### List Kubernetes components ```bash +# List Kubernetes components dapr components -k ``` diff --git a/daprdocs/content/en/reference/cli/dapr-configurations.md b/daprdocs/content/en/reference/cli/dapr-configurations.md index 6cb0c7809..82348aa99 100644 --- a/daprdocs/content/en/reference/cli/dapr-configurations.md +++ b/daprdocs/content/en/reference/cli/dapr-configurations.md @@ -5,32 +5,32 @@ linkTitle: "configurations" description: "Detailed information on the configurations CLI command" --- -## Description +### Description List all Dapr configurations. -## Supported platforms +### Supported platforms - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage ```bash dapr configurations [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--kubernetes`, `-k` | | `false` | List all Dapr configurations in a Kubernetes cluster -| `--name`, `-n` | | | The configuration name to be printed (optional) -| `--output`, `-o` | | `list`| Output format (options: json or yaml or list) -| `--help`, `-h` | | | Print this help message | +| Name | Environment Variable | Default | Description | +| -------------------- | -------------------- | ------- | ---------------------------------------------------- | +| `--kubernetes`, `-k` | | `false` | List all Dapr configurations in a Kubernetes cluster | +| `--name`, `-n` | | | The configuration name to be printed (optional) | +| `--output`, `-o` | | `list` | Output format (options: json or yaml or list) | +| `--help`, `-h` | | | Print this help message | -## Examples +### Examples -### List Kubernetes Dapr configurations ```bash +# List Kubernetes Dapr configurations dapr configurations -k ``` diff --git a/daprdocs/content/en/reference/cli/dapr-dashboard.md b/daprdocs/content/en/reference/cli/dapr-dashboard.md index ef4922650..906a5da91 100644 --- a/daprdocs/content/en/reference/cli/dapr-dashboard.md +++ b/daprdocs/content/en/reference/cli/dapr-dashboard.md @@ -5,54 +5,47 @@ linkTitle: "dashboard" description: "Detailed information on the dashboard CLI command" --- -## Description +### Description Start [Dapr dashboard](https://github.com/dapr/dashboard). -## Supported platforms +### Supported platforms - [Self-Hosted]({{< ref self-hosted >}}) - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage + ```bash dapr dashboard [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description | -|------|----------------------|---------|-------------| -| `--address`, `-a` | | `localhost` | Address to listen on. Only accepts IP address or localhost as a value | -| `--help`, `-h` | | | Prints this help message | -| `--kubernetes`, `-k` | | `false` | Opens Dapr dashboard in local browser via local proxy to Kubernetes cluster | -| `--namespace`, `-n` | | `dapr-system` | The namespace where Dapr dashboard is running | -| `--port`, `-p` | | `8080` | The local port on which to serve Dapr dashboard | -| `--version`, `-v` | | `false` | Print the version for Dapr dashboard | +| Name | Environment Variable | Default | Description | +| -------------------- | -------------------- | ------------- | --------------------------------------------------------------------------- | +| `--address`, `-a` | | `localhost` | Address to listen on. Only accepts IP address or localhost as a value | +| `--help`, `-h` | | | Prints this help message | +| `--kubernetes`, `-k` | | `false` | Opens Dapr dashboard in local browser via local proxy to Kubernetes cluster | +| `--namespace`, `-n` | | `dapr-system` | The namespace where Dapr dashboard is running | +| `--port`, `-p` | | `8080` | The local port on which to serve Dapr dashboard | +| `--version`, `-v` | | `false` | Print the version for Dapr dashboard | -## Examples +### Examples -### Start dashboard locally ```bash +# Start dashboard locally dapr dashboard -``` -### Start dashboard service locally on a specified port -```bash +# Start dashboard service locally on a specified port dapr dashboard -p 9999 -``` -### Port forward to dashboard service running in Kubernetes -```bash +# Port forward to dashboard service running in Kubernetes dapr dashboard -k -``` -### Port forward to dashboard service running in Kubernetes on all addresses on a specified port -```bash +# Port forward to dashboard service running in Kubernetes on all addresses on a specified port dapr dashboard -k -p 9999 --address 0.0.0.0 -``` -### Port forward to dashboard service running in Kubernetes on a specified port -```bash +# Port forward to dashboard service running in Kubernetes on a specified port dapr dashboard -k -p 9999 ``` diff --git a/daprdocs/content/en/reference/cli/dapr-help.md b/daprdocs/content/en/reference/cli/dapr-help.md index a645a2a35..b34a71474 100644 --- a/daprdocs/content/en/reference/cli/dapr-help.md +++ b/daprdocs/content/en/reference/cli/dapr-help.md @@ -5,18 +5,18 @@ linkTitle: "help" description: "Detailed information on the help CLI command" --- -## Description +### Description Help provides help for any command in the application. -## Usage +### Usage ```bash dapr help [command] [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--help`, `-h` | | | Prints this help message | +| Name | Environment Variable | Default | Description | +| -------------- | -------------------- | ------- | ------------------------ | +| `--help`, `-h` | | | Prints this help message | diff --git a/daprdocs/content/en/reference/cli/dapr-init.md b/daprdocs/content/en/reference/cli/dapr-init.md index 8477c7514..0b383949c 100644 --- a/daprdocs/content/en/reference/cli/dapr-init.md +++ b/daprdocs/content/en/reference/cli/dapr-init.md @@ -5,67 +5,70 @@ linkTitle: "init" description: "Detailed information on the init CLI command" --- -## Description +### Description Install Dapr on supported hosting platforms. -## Supported platforms +### Supported platforms - [Self-Hosted]({{< ref self-hosted >}}) - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage + ```bash dapr init [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--enable-ha` | | `false` | Enable high availability (HA) mode | -| `--enable-mtls` | | `true` | Enable mTLS in your cluster | -| `--help`, `-h` | | | Print this help message | -| `--kubernetes`, `-k` | | `false` | Deploy Dapr to a Kubernetes cluster | -| `--wait` | | `false` | Wait for Kubernetes initialization to complete | -| `--timeout` | | `300` | The wait timeout for the Kubernetes installation | -| `--namespace`, `-n` | | `dapr-system` | The Kubernetes namespace to install Dapr in | -| `--network` | `DAPR_NETWORK` | | The Docker network on which to deploy the Dapr runtime | -| `--runtime-version` | | `latest` | The version of the Dapr runtime to install, for example: `1.0.0` | -| `--slim`, `-s` | | `false` | Exclude placement service, Redis and Zipkin containers from self-hosted installation | +| Name | Environment Variable | Default | Description | +| -------------------- | -------------------- | ------------- | ------------------------------------------------------------------------------------ | +| `--enable-ha` | | `false` | Enable high availability (HA) mode | +| `--enable-mtls` | | `true` | Enable mTLS in your cluster | +| `--help`, `-h` | | | Print this help message | +| `--kubernetes`, `-k` | | `false` | Deploy Dapr to a Kubernetes cluster | +| `--wait` | | `false` | Wait for Kubernetes initialization to complete | +| `--timeout` | | `300` | The wait timeout for the Kubernetes installation | +| `--namespace`, `-n` | | `dapr-system` | The Kubernetes namespace to install Dapr in | +| `--runtime-version` | | `latest` | The version of the Dapr runtime to install, for example: `1.0.0` | +| `--slim`, `-s` | | `false` | Exclude placement service, Redis and Zipkin containers from self-hosted installation | -## Examples +### Examples + +#### Self-hosted environment -### Initialize Dapr in self-hosted mode ```bash dapr init ``` -### Initialize Dapr in Kubernetes +You can also specify a specific runtime version. Be default, the latest version is used. + +```bash +dapr init --runtime-version 1.4.0 +``` + +Dapr can also run [Slim self-hosted mode]({{< ref self-hosted-no-docker.md >}}) without Docker. + +```bash +dapr init -s +``` + +#### Kubernetes environment + ```bash dapr init -k ``` -### Initialize Dapr in Kubernetes and wait for the installation to complete +You can wait for the installation to complete its deployment with the `--wait` flag. +The default timeout is 300s (5 min), but can be customized with the `--timeout` flag. - You can wait for the installation to complete its deployment with the `--wait` flag. - - The default timeout is 300s (5 min), but can be customized with the `--timeout` flag. ```bash dapr init -k --wait --timeout 600 ``` -### Initialize specified version of Dapr runtime in self-hosted mode -```bash -dapr init --runtime-version 0.10.0 -``` +You can also specify a specific runtime version. -### Initialize specified version of Dapr runtime in Kubernetes ```bash -dapr init -k --runtime-version 0.10.0 -``` - -### Initialize Dapr in [slim self-hosted mode]({{< ref self-hosted-no-docker.md >}}) -```bash -dapr init -s +dapr init -k --runtime-version 1.4.0 ``` diff --git a/daprdocs/content/en/reference/cli/dapr-invoke.md b/daprdocs/content/en/reference/cli/dapr-invoke.md index 9a471f769..60bbb5509 100644 --- a/daprdocs/content/en/reference/cli/dapr-invoke.md +++ b/daprdocs/content/en/reference/cli/dapr-invoke.md @@ -5,38 +5,37 @@ linkTitle: "invoke" description: "Detailed information on the invoke CLI command" --- -## Description +### Description Invoke a method on a given Dapr application. -## Supported platforms +### Supported platforms - [Self-Hosted]({{< ref self-hosted >}}) -## Usage +### Usage + ```bash dapr invoke [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--app-id`, `-a` | | | The application id to invoke | -| `--help`, `-h` | | | Print this help message | -| `--method`, `-m` | | | The method to invoke | -| `--data`, `-d` | | | The JSON serialized data string (optional) | -| `--data-file`, `-f` | | | A file containing the JSON serialized data (optional) -| `--verb`, `-v` | | `POST` | The HTTP verb to use | +| Name | Environment Variable | Default | Description | +| ------------------- | -------------------- | ------- | ----------------------------------------------------- | +| `--app-id`, `-a` | `APP_ID` | | The application id to invoke | +| `--help`, `-h` | | | Print this help message | +| `--method`, `-m` | | | The method to invoke | +| `--data`, `-d` | | | The JSON serialized data string (optional) | +| `--data-file`, `-f` | | | A file containing the JSON serialized data (optional) | +| `--verb`, `-v` | | `POST` | The HTTP verb to use | -## Examples +### Examples -### Invoke a sample method on target app with POST Verb ```bash +# Invoke a sample method on target app with POST Verb dapr invoke --app-id target --method sample --data '{"key":"value"}' -``` -### Invoke a sample method on target app with GET Verb -```bash +# Invoke a sample method on target app with GET Verb dapr invoke --app-id target --method sample --verb GET -``` +``` \ No newline at end of file diff --git a/daprdocs/content/en/reference/cli/dapr-list.md b/daprdocs/content/en/reference/cli/dapr-list.md index c8d3358c8..73b46dd56 100644 --- a/daprdocs/content/en/reference/cli/dapr-list.md +++ b/daprdocs/content/en/reference/cli/dapr-list.md @@ -5,41 +5,38 @@ linkTitle: "list" description: "Detailed information on the list CLI command" --- -## Description +### Description List all Dapr instances. -## Supported platforms +### Supported platforms - [Self-Hosted]({{< ref self-hosted >}}) - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage + ```bash dapr list [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--help`, `-h` | | | Print this help message | -| `--kubernetes`, `-k` | | `false` | List all Dapr pods in a Kubernetes cluster | -| `--output`, `-o` | | `table` | The output format of the list. Valid values are: `json`, `yaml`, or `table` +| Name | Environment Variable | Default | Description | +| -------------------- | -------------------- | ------- | --------------------------------------------------------------------------- | +| `--help`, `-h` | | | Print this help message | +| `--kubernetes`, `-k` | | `false` | List all Dapr pods in a Kubernetes cluster | +| `--output`, `-o` | | `table` | The output format of the list. Valid values are: `json`, `yaml`, or `table` | -## Examples +### Examples -### List Dapr instances in self-hosted mode ```bash +# List Dapr instances in self-hosted mode dapr list -``` -### List Dapr instances in Kubernetes mode -```bash +# List Dapr instances in Kubernetes mode dapr list -k -``` -### List Dapr instances in JSON format -```bash +# List Dapr instances in JSON format dapr list -o json ``` diff --git a/daprdocs/content/en/reference/cli/dapr-logs.md b/daprdocs/content/en/reference/cli/dapr-logs.md index 45e6bb5c5..e9c6e44b0 100644 --- a/daprdocs/content/en/reference/cli/dapr-logs.md +++ b/daprdocs/content/en/reference/cli/dapr-logs.md @@ -5,33 +5,33 @@ linkTitle: "logs" description: "Detailed information on the logs CLI command" --- -## Description +### Description Get Dapr sidecar logs for an application. -## Supported platforms +### Supported platforms - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage + ```bash dapr logs [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--app-id`, `-a` | | | The application id for which logs are needed | -| `--help`, `-h` | | | Print this help message | -| `--kubernetes`, `-k` | | `true` | Get logs from a Kubernetes cluster | -| `--namespace`, `-n` | | `default` | The Kubernetes namespace in which your application is deployed | -| `--pod-name`, `-p` | | | The name of the pod in Kubernetes, in case your application has multiple pods (optional) | + | Name | Environment Variable | Default | Description | + | -------------------- | -------------------- | --------- | ---------------------------------------------------------------------------------------- | + | `--app-id`, `-a` | `APP_ID` | | The application id for which logs are needed | + | `--help`, `-h` | | | Print this help message | + | `--kubernetes`, `-k` | | `true` | Get logs from a Kubernetes cluster | + | `--namespace`, `-n` | | `default` | The Kubernetes namespace in which your application is deployed | + | `--pod-name`, `-p` | | | The name of the pod in Kubernetes, in case your application has multiple pods (optional) | +### Examples -## Examples - -### Get logs of sample app from target pod in custom namespace ```bash +# Get logs of sample app from target pod in custom namespace dapr logs -k --app-id sample --pod-name target --namespace custom ``` diff --git a/daprdocs/content/en/reference/cli/dapr-mtls/_index.md b/daprdocs/content/en/reference/cli/dapr-mtls/_index.md index 4fa7eadea..abc49c875 100644 --- a/daprdocs/content/en/reference/cli/dapr-mtls/_index.md +++ b/daprdocs/content/en/reference/cli/dapr-mtls/_index.md @@ -5,45 +5,45 @@ linkTitle: "mtls" description: "Detailed information on the mtls CLI command" --- -## Description +### Description Check if mTLS is enabled. -## Supported platforms +### Supported platforms - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage ```bash dapr mtls [flags] dapr mtls [command] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--help`, `-h` | | | Print this help message | -| `--kubernetes`, `-k` | | `false` | Check if mTLS is enabled in a Kubernetes cluster | +| Name | Environment Variable | Default | Description | +| -------------------- | -------------------- | ------- | ------------------------------------------------ | +| `--help`, `-h` | | | Print this help message | +| `--kubernetes`, `-k` | | `false` | Check if mTLS is enabled in a Kubernetes cluster | -## Available Commands +### Available Commands ```txt expiry Checks the expiry of the root certificate export Export the root CA, issuer cert and key from Kubernetes to local files ``` -## Command Reference +### Command Reference You can learn more about each sub command from the links below. - - [`dapr mtls expiry`]({{< ref dapr-mtls-expiry.md >}}) - - [`dapr mtls export`]({{< ref dapr-mtls-export.md >}}) +- [`dapr mtls expiry`]({{< ref dapr-mtls-expiry.md >}}) +- [`dapr mtls export`]({{< ref dapr-mtls-export.md >}}) -## Examples +### Examples -### Check if mTLS is enabled ```bash +# Check if mTLS is enabled dapr mtls -k ``` \ No newline at end of file diff --git a/daprdocs/content/en/reference/cli/dapr-mtls/dapr-mtls-expiry.md b/daprdocs/content/en/reference/cli/dapr-mtls/dapr-mtls-expiry.md index 2f32af1c3..7fdf5b614 100644 --- a/daprdocs/content/en/reference/cli/dapr-mtls/dapr-mtls-expiry.md +++ b/daprdocs/content/en/reference/cli/dapr-mtls/dapr-mtls-expiry.md @@ -6,28 +6,29 @@ description: "Detailed information on the mtls expiry CLI command" weight: 2000 --- -## Description +### Description Checks the expiry of the root certificate -## Supported platforms +### Supported platforms - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage + ```bash dapr mtls expiry [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--help`, `-h` | | | help for expiry | +| Name | Environment Variable | Default | Description | +| -------------- | -------------------- | ------- | --------------- | +| `--help`, `-h` | | | help for expiry | -## Examples +### Examples -### Check expiry of Kubernetes certs ```bash +# Check expiry of Kubernetes certs dapr mtls expiry ``` diff --git a/daprdocs/content/en/reference/cli/dapr-mtls/dapr-mtls-export.md b/daprdocs/content/en/reference/cli/dapr-mtls/dapr-mtls-export.md index 2236601f3..2a6047f9b 100644 --- a/daprdocs/content/en/reference/cli/dapr-mtls/dapr-mtls-export.md +++ b/daprdocs/content/en/reference/cli/dapr-mtls/dapr-mtls-export.md @@ -6,29 +6,30 @@ description: "Detailed information on the mtls export CLI command" weight: 1000 --- -## Description +### Description Export the root CA, issuer cert and key from Kubernetes to local files -## Supported platforms +### Supported platforms - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage + ```bash dapr mtls export [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--help`, `-h` | | | help for export | -| `--out`, `-o` | | current directory | The output directory path to save the certs | +| Name | Environment Variable | Default | Description | +| -------------- | -------------------- | ----------------- | ------------------------------------------- | +| `--help`, `-h` | | | help for export | +| `--out`, `-o` | | current directory | The output directory path to save the certs | -## Examples +### Examples -### Check expiry of Kubernetes certs ```bash +# Check expiry of Kubernetes certs dapr mtls export -o ./certs ``` diff --git a/daprdocs/content/en/reference/cli/dapr-publish.md b/daprdocs/content/en/reference/cli/dapr-publish.md index 749a2071f..e70d853f9 100644 --- a/daprdocs/content/en/reference/cli/dapr-publish.md +++ b/daprdocs/content/en/reference/cli/dapr-publish.md @@ -5,35 +5,35 @@ linkTitle: "publish" description: "Detailed information on the publish CLI command" --- -## Description +### Description Publish a pub-sub event. -## Supported platforms +### Supported platforms - [Self-Hosted]({{< ref self-hosted >}}) -## Usage +### Usage ```bash dapr publish [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--publish-app-id`, `-i`| | The ID that represents the app from which you are publishing -| `--pubsub`, `-p` | | The name of the pub/sub component -| `--topic`, `-t` | | | The topic to be published to | -| `--data`, `-d` | | | The JSON serialized string (optional) | -| `--data-file`, `-f` | | | A file containing the JSON serialized data (optional) | -| `--help`, `-h` | | | Print this help message | +| Name | Environment Variable | Default | Description | +| ------------------------ | -------------------- | ------------------------------------------------------------ | ----------------------------------------------------- | +| `--publish-app-id`, `-i` | | The ID that represents the app from which you are publishing | +| `--pubsub`, `-p` | | The name of the pub/sub component | +| `--topic`, `-t` | | | The topic to be published to | +| `--data`, `-d` | | | The JSON serialized string (optional) | +| `--data-file`, `-f` | | | A file containing the JSON serialized data (optional) | +| `--help`, `-h` | | | Print this help message | -## Examples +### Examples -### Publish to sample topic in target pubsub ```bash +# Publish to sample topic in target pubsub dapr publish --publish-app-id appId --topic sample --pubsub target --data '{"key":"value"}' ``` diff --git a/daprdocs/content/en/reference/cli/dapr-run.md b/daprdocs/content/en/reference/cli/dapr-run.md index 49d6713c6..2b45908e9 100644 --- a/daprdocs/content/en/reference/cli/dapr-run.md +++ b/daprdocs/content/en/reference/cli/dapr-run.md @@ -5,69 +5,59 @@ linkTitle: "run" description: "Detailed information on the run CLI command" --- -## Description +### Description Run Dapr and (optionally) your application side by side. A full list comparing daprd arguments, CLI arguments, and Kubernetes annotations can be found [here]({{< ref arguments-annotations-overview.md >}}). -## Supported platforms +### Supported platforms - [Self-Hosted]({{< ref self-hosted >}}) -## Usage +### Usage ```bash dapr run [flags] [command] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--app-id`, `-a` | | | The id for your application, used for service discovery | -| `--app-max-concurrency` | | `unlimited` | The concurrency level of the application, otherwise is unlimited | -| `--app-port`, `-p` | | | The port your application is listening on -| `--app-protocol`, `-P` | | `http` | The protocol (gRPC or HTTP) Dapr uses to talk to the application. Valid values are: `http` or `grpc` | -| `--app-ssl` | | `false` | Enable https when Dapr invokes the application -| `--components-path`, `-d` | | `Linux & Mac: $HOME/.dapr/components`, `Windows: %USERPROFILE%\.dapr\components` | The path for components directory -| `--config`, `-c` | | `Linux & Mac: $HOME/.dapr/config.yaml`, `Windows: %USERPROFILE%\.dapr\config.yaml` | Dapr configuration file | -| `--dapr-grpc-port` | | `50001` | The gRPC port for Dapr to listen on | -| `--dapr-http-port` | | `3500` | The HTTP port for Dapr to listen on | -| `--enable-profiling` | | `false` | Enable `pprof` profiling via an HTTP endpoint -| `--help`, `-h` | | | Print this help message | -| `--image` | | | The image to build the code in. Input is: `repository/image` | -| `--log-level` | | `info` | The log verbosity. Valid values are: `debug`, `info`, `warn`, `error`, `fatal`, or `panic` | -| `--placement-host-address` | `DAPR_PLACEMENT_HOST` | `localhost` | The address of the placement service. Format is either `` for default port (`6050` on Windows, `50005` on Linux/MacOS) or `:` for custom port | -| `--profile-port` | | `7777` | The port for the profile server to listen on | -| `--dapr-http-max-request-size` | | `4` | Max size of request body in MB.| +| Name | Environment Variable | Default | Description | +| ------------------------------ | -------------------- | ---------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- | +| `--app-id`, `-a` | `APP_ID` | | The id for your application, used for service discovery | +| `--app-max-concurrency` | | `unlimited` | The concurrency level of the application, otherwise is unlimited | +| `--app-port`, `-p` | `APP_PORT` | | The port your application is listening on | +| `--app-protocol`, `-P` | | `http` | The protocol (gRPC or HTTP) Dapr uses to talk to the application. Valid values are: `http` or `grpc` | +| `--app-ssl` | | `false` | Enable https when Dapr invokes the application | +| `--components-path`, `-d` | | `Linux & Mac: $HOME/.dapr/components`, `Windows: %USERPROFILE%\.dapr\components` | The path for components directory | +| `--config`, `-c` | | `Linux & Mac: $HOME/.dapr/config.yaml`, `Windows: %USERPROFILE%\.dapr\config.yaml` | Dapr configuration file | +| `--dapr-grpc-port` | `DAPR_GRPC_PORT` | `50001` | The gRPC port for Dapr to listen on | +| `--dapr-http-port` | `DAPR_HTTP_PORT` | `3500` | The HTTP port for Dapr to listen on | +| `--enable-profiling` | | `false` | Enable `pprof` profiling via an HTTP endpoint | +| `--help`, `-h` | | | Print this help message | +| `--image` | | | The image to build the code in. Input is: `repository/image` | +| `--log-level` | | `info` | The log verbosity. Valid values are: `debug`, `info`, `warn`, `error`, `fatal`, or `panic` | +| `--metrics-port` | `DAPR_METRICS_PORT` | `9090` | The port that Dapr sends its metrics information to | +| `--profile-port` | | `7777` | The port for the profile server to listen on | +| `--dapr-http-max-request-size` | | `4` | Max size of request body in MB. | -## Examples - -### Run a .NET application +### Examples ```bash +# Run a .NET application dapr run --app-id myapp --app-port 5000 -- dotnet run -``` -### Run a Java application - -```bash +# Run a Java application dapr run --app-id myapp -- java -jar myapp.jar -``` -### Run a NodeJs application that listens to port 3000 - -```bash +# Run a NodeJs application that listens to port 3000 dapr run --app-id myapp --app-port 3000 -- node myapp.js -``` -### Run a Python application - -```bash +# Run a Python application dapr run --app-id myapp -- python myapp.py -``` -### Run sidecar only - -```bash +# Run sidecar only dapr run --app-id myapp + +# Run a gRPC application written in Go (listening on port 3000) +dapr run --app-id myapp --app-port 5000 --app-protocol grpc -- go run main.go ``` diff --git a/daprdocs/content/en/reference/cli/dapr-status.md b/daprdocs/content/en/reference/cli/dapr-status.md index dc0087e07..7aec87c5d 100644 --- a/daprdocs/content/en/reference/cli/dapr-status.md +++ b/daprdocs/content/en/reference/cli/dapr-status.md @@ -5,30 +5,30 @@ linkTitle: "status" description: "Detailed information on the status CLI command" --- -## Description +### Description Show the health status of Dapr services. -## Supported platforms +### Supported platforms - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage ```bash dapr status -k ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--help`, `-h` | | | Print this help message | -| `--kubernetes`, `-k` | | `false` | Show the health status of Dapr services on Kubernetes cluster | +| Name | Environment Variable | Default | Description | +| -------------------- | -------------------- | ------- | ------------------------------------------------------------- | +| `--help`, `-h` | | | Print this help message | +| `--kubernetes`, `-k` | | `false` | Show the health status of Dapr services on Kubernetes cluster | -## Examples +### Examples -### Get status of Dapr services from Kubernetes ```bash +# Get status of Dapr services from Kubernetes dapr status -k ``` diff --git a/daprdocs/content/en/reference/cli/dapr-stop.md b/daprdocs/content/en/reference/cli/dapr-stop.md index c4f44581d..2f9a47d00 100644 --- a/daprdocs/content/en/reference/cli/dapr-stop.md +++ b/daprdocs/content/en/reference/cli/dapr-stop.md @@ -5,30 +5,30 @@ linkTitle: "stop" description: "Detailed information on the stop CLI command" --- -## Description +### Description Stop Dapr instances and their associated apps. -## Supported platforms +### Supported platforms - [Self-Hosted]({{< ref self-hosted >}}) -## Usage +### Usage ```bash dapr stop [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--app-id`, `-a` | | | The application id to be stopped | -| `--help`, `-h` | | | Print this help message | +| Name | Environment Variable | Default | Description | +| ---------------- | -------------------- | ------- | -------------------------------- | +| `--app-id`, `-a` | `APP_ID` | | The application id to be stopped | +| `--help`, `-h` | | | Print this help message | -## Examples +### Examples -### Stop Dapr application ```bash +# Stop Dapr application dapr stop --app-id ``` diff --git a/daprdocs/content/en/reference/cli/dapr-uninstall.md b/daprdocs/content/en/reference/cli/dapr-uninstall.md index 28130221d..4abd62eaa 100644 --- a/daprdocs/content/en/reference/cli/dapr-uninstall.md +++ b/daprdocs/content/en/reference/cli/dapr-uninstall.md @@ -5,44 +5,46 @@ linkTitle: "uninstall" description: "Detailed information on the uninstall CLI command" --- -## Description +### Description Uninstall Dapr runtime. -## Supported platforms +### Supported platforms - [Self-Hosted]({{< ref self-hosted >}}) - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage ```bash dapr uninstall [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--all` | | `false` | Remove Redis, Zipkin containers in addition to actor placement container. Remove default dapr dir located at `$HOME/.dapr or %USERPROFILE%\.dapr\`. | -| `--help`, `-h` | | | Print this help message | -| `--kubernetes`, `-k` | | `false` | Uninstall Dapr from a Kubernetes cluster | -| `--namespace`, `-n` | | `dapr-system` | The Kubernetes namespace to uninstall Dapr from | -| `--network` | `DAPR_NETWORK` | | The Docker network from which to remove the Dapr runtime | +| Name | Environment Variable | Default | Description | +| -------------------- | -------------------- | ------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | +| `--all` | | `false` | Remove Redis, Zipkin containers in addition to actor placement container. Remove default dapr dir located at `$HOME/.dapr or %USERPROFILE%\.dapr\`. | +| `--help`, `-h` | | | Print this help message | +| `--kubernetes`, `-k` | | `false` | Uninstall Dapr from a Kubernetes cluster | +| `--namespace`, `-n` | | `dapr-system` | The Kubernetes namespace to uninstall Dapr from | -## Examples +### Examples + +#### Uninstall from self-hosted mode -### Uninstall from self-hosted mode ```bash dapr uninstall ``` -### Uninstall from self-hosted mode and remove .dapr directory, Redis, Placement and Zipkin containers +You can also use option `--all` to remove .dapr directory, Redis, Placement and Zipkin containers + ```bash dapr uninstall --all ``` -### Uninstall from Kubernetes +#### Uninstall from Kubernetes + ```bash dapr uninstall -k ``` diff --git a/daprdocs/content/en/reference/cli/dapr-upgrade.md b/daprdocs/content/en/reference/cli/dapr-upgrade.md index 6cc434569..9e2a9a3b6 100644 --- a/daprdocs/content/en/reference/cli/dapr-upgrade.md +++ b/daprdocs/content/en/reference/cli/dapr-upgrade.md @@ -5,7 +5,7 @@ linkTitle: "upgrade" description: "Detailed information on the upgrade CLI command" --- -## Description +### Description Upgrade or downgrade Dapr on supported hosting platforms. @@ -15,41 +15,38 @@ Version steps should be done incrementally, including minor versions as you upgr Prior to downgrading, confirm components are backwards compatible and application code does ultilize APIs that are not supported in previous versions of Dapr. {{% /alert %}} -## Supported platforms +### Supported platforms - [Kubernetes]({{< ref kubernetes >}}) -## Usage +### Usage + ```bash dapr upgrade [flags] ``` -## Flags +### Flags -| Name | Environment Variable | Default | Description -| --- | --- | --- | --- | -| `--help`, `-h` | | | Print this help message | -| `--kubernetes`, `-k` | | `false` | Upgrade/Downgrade Dapr in a Kubernetes cluster | -| `--runtime-version` | | `latest` | The version of the Dapr runtime to upgrade/downgrade to, for example: `1.0.0` | -| `--set` | | | Set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2) | +| Name | Environment Variable | Default | Description | +| -------------------- | -------------------- | -------- | --------------------------------------------------------------------------------------------------------- | +| `--help`, `-h` | | | Print this help message | +| `--kubernetes`, `-k` | | `false` | Upgrade/Downgrade Dapr in a Kubernetes cluster | +| `--runtime-version` | | `latest` | The version of the Dapr runtime to upgrade/downgrade to, for example: `1.0.0` | +| `--set` | | | Set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2) | -## Examples +### Examples -### Upgrade Dapr in Kubernetes to latest version ```bash +# Upgrade Dapr in Kubernetes to latest version dapr upgrade -k -``` -### Upgrade or downgrade to a specified version of Dapr runtime in Kubernetes -```bash +# Upgrade or downgrade to a specified version of Dapr runtime in Kubernetes dapr upgrade -k --runtime-version 1.2 -``` -### Upgrade or downgrade to a specified version of Dapr runtime in Kubernetes with value set -```bash +# Upgrade or downgrade to a specified version of Dapr runtime in Kubernetes with value set dapr upgrade -k --runtime-version 1.2 --set global.logAsJson=true ``` -# Related links +### Related links - [Upgrade Dapr on a Kubernetes cluster]({{< ref kubernetes-upgrade.md >}}) \ No newline at end of file diff --git a/daprdocs/content/en/reference/environment/_index.md b/daprdocs/content/en/reference/environment/_index.md index 16b21455a..7eb1bf339 100644 --- a/daprdocs/content/en/reference/environment/_index.md +++ b/daprdocs/content/en/reference/environment/_index.md @@ -8,12 +8,13 @@ weight: 300 The following table lists the environment variables used by the Dapr runtime, CLI, or from within your application: -| Environment Variable | Used By | Description | -|----------------------------------|------------------|-------------| -| DAPR_HTTP_PORT | Your application | The HTTP port that Dapr is listening on. Your application should use this variable to connect to Dapr instead of hardcoding the port value. Injected by the `dapr-sidecar-injector` into all the containers in the pod. -| DAPR_GRPC_PORT | Your application | The gRPC port that Dapr is listening on. Your application should use this variable to connect to Dapr instead of hardcoding the port value. Injected by the `dapr-sidecar-injector` into all the containers in the pod. -| DAPR_TOKEN_API | Your application | The token used for Dapr API authentication for requests from the application. Read [enable API token authentication in Dapr]({{< ref api-token >}}) for more information. -| APP_TOKEN_API | Your application | The token used by the app to authenticate requests from Dapr. Read [authenticate requests from Dapr using token authentication]({{< ref app-api-token >}}) for more information. -| DAPR_PLACEMENT_HOST |Your application | The address for the Dapr Placement service. Only needed in self-hosted mode if you run your app (which creates actors) and you want to tell the app the location of the Placement service. This is never needed outside of local machine development. -| DAPR_NETWORK | Dapr CLI | Optionally used by the Dapr CLI to specify the Docker network on which to deploy the Dapr runtime. -| NAMESPACE | Dapr runtime | Used to specify a component's [namespace in self-hosted mode]({{< ref component-scopes >}}) +| Environment Variable | Used By | Description | +| -------------------- | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| APP_ID | Your application | The id for your application, used for service discovery | +| APP_PORT | Your application | The port your application is listening on | +| APP_API_TOKEN | Your application | The token used by the application to authenticate requests from Dapr API. Read [authenticate requests from Dapr using token authentication]({{< ref app-api-token >}}) for more information. | +| DAPR_HTTP_PORT | Your application | The HTTP port that the Dapr sidecar is listening on. Your application should use this variable to connect to Dapr sidecar instead of hardcoding the port value. Set by the Dapr CLI run command for self hosted or injected by the dapr-sidecar-injector into all the containers in the pod. | +| DAPR_GRPC_PORT | Your application | The gRPC port that the Dapr sidecar is listening on. Your application should use this variable to connect to Dapr sidecar instead of hardcoding the port value. Set by the Dapr CLI run command for self hosted or injected by the dapr-sidecar-injector into all the containers in the pod. | +| DAPR_METRICS_PORT | Your application | The HTTP [Prometheus]({{< ref prometheus >}}) port that Dapr sends its metrics information to. Your application can use this variable to send its application specific metrics to have both Dapr metrics and application metrics together. See [metrics-port] ({{< ref arguments-annotations-overview>}}) for more information | +| DAPR_API_TOKEN | Dapr sidecar | The token used for Dapr API authentication for requests from the application. Read [enable API token authentication in Dapr]({{< ref api-token >}}) for more information. | +| NAMESPACE | Dapr sidecar | Used to specify a component's [namespace in self-hosted mode]({{< ref component-scopes >}}) | diff --git a/daprdocs/layouts/docs/list.html b/daprdocs/layouts/docs/list.html index 8886ba5b6..cfcff916f 100644 --- a/daprdocs/layouts/docs/list.html +++ b/daprdocs/layouts/docs/list.html @@ -1,7 +1,6 @@ {{ define "main" }}
-

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} +

{{ .LinkTitle }}

{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} {{ partial "reading-time.html" . }} {{ end }} From c50aea708d13d984d9e9dad234174b4a5274962a Mon Sep 17 00:00:00 2001 From: Ori Zohar Date: Wed, 20 Oct 2021 08:18:10 -0700 Subject: [PATCH 14/14] Removing button from getting started note --- daprdocs/content/en/getting-started/_index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/daprdocs/content/en/getting-started/_index.md b/daprdocs/content/en/getting-started/_index.md index 238fed7b3..6339d4a5e 100644 --- a/daprdocs/content/en/getting-started/_index.md +++ b/daprdocs/content/en/getting-started/_index.md @@ -11,7 +11,6 @@ Welcome to the Dapr getting started guide! {{% alert title="Dapr Concepts" color="primary" %}} If you are looking for an introductory overview of Dapr and learn more about basic Dapr terminology, it is recommended to visit the [concepts section]({{}}). -{{< button text="Learn more" page="concepts" >}} {{% /alert %}} This guide will walk you through a series of steps to install, initialize and start using Dapr. The recommended way to get started with Dapr is to setup a local development environment (also referred to as [_self-hosted_ mode]({{< ref self-hosted >}})) which includes the Dapr CLI, Dapr sidecar binaries, and some default components that can help you start using Dapr quickly.