mirror of https://github.com/dapr/docs.git
				
				
				
			Merge branch 'v1.1' into patch-1
This commit is contained in:
		
						commit
						5501ecf264
					
				|  | @ -29,6 +29,7 @@ jobs: | |||
|         with: | ||||
|           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }} | ||||
|           repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) | ||||
|           skip_deploy_on_missing_secrets: true | ||||
|           action: "upload" | ||||
|           ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### | ||||
|           # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig | ||||
|  | @ -48,4 +49,5 @@ jobs: | |||
|         uses: Azure/static-web-apps-deploy@v0.0.1-preview | ||||
|         with: | ||||
|           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }} | ||||
|           skip_deploy_on_missing_secrets: true | ||||
|           action: "close" | ||||
|  |  | |||
|  | @ -0,0 +1 @@ | |||
| node_modules/ | ||||
|  | @ -127,6 +127,10 @@ As an example, for this specific section the complete reference to the page and | |||
| {{</* ref "contributing-docs.md#referencing-sections-in-other-pages" */>}} | ||||
| ``` | ||||
| 
 | ||||
| ## Shortcodes | ||||
| 
 | ||||
| The following are useful shortcodes for writing Dapr documentation | ||||
| 
 | ||||
| ### Images | ||||
| The markdown spec used by Docsy and Hugo does not give an option to resize images using markdown notation. Instead, raw HTML is used. | ||||
| 
 | ||||
|  | @ -230,6 +234,46 @@ The shortcode would be: | |||
| {{</* youtube dQw4w9WgXcQ */>}} | ||||
| ``` | ||||
| 
 | ||||
| ### Buttons | ||||
| 
 | ||||
| To create a button in a webpage, use the `button` shortcode. | ||||
| 
 | ||||
| #### Link to an external page | ||||
| 
 | ||||
| ``` | ||||
| {{</* button text="My Button" link="https://example.com" */>}} | ||||
| ``` | ||||
| 
 | ||||
| {{< button text="My Button" link="https://example.com" >}} | ||||
| 
 | ||||
| #### Link to another docs page | ||||
| 
 | ||||
| You can also reference pages in your button as well: | ||||
| ``` | ||||
| {{</* button text="My Button" page="contributing" */>}} | ||||
| ``` | ||||
| 
 | ||||
| {{< button text="My Button" page="contributing" >}} | ||||
| 
 | ||||
| #### Button colors | ||||
| 
 | ||||
| You can customize the colors using the Bootstrap colors: | ||||
| ``` | ||||
| {{</* button text="My Button" link="https://example.com" color="primary" */>}} | ||||
| {{</* button text="My Button" link="https://example.com" color="secondary" */>}} | ||||
| {{</* button text="My Button" link="https://example.com" color="success" */>}} | ||||
| {{</* button text="My Button" link="https://example.com" color="danger" */>}} | ||||
| {{</* button text="My Button" link="https://example.com" color="warning" */>}} | ||||
| {{</* button text="My Button" link="https://example.com" color="info" */>}} | ||||
| ``` | ||||
| 
 | ||||
| {{< button text="My Button" link="https://example.com" color="primary" >}} | ||||
| {{< button text="My Button" link="https://example.com" color="secondary" >}} | ||||
| {{< button text="My Button" link="https://example.com" color="success" >}} | ||||
| {{< button text="My Button" link="https://example.com" color="danger" >}} | ||||
| {{< button text="My Button" link="https://example.com" color="warning" >}} | ||||
| {{< button text="My Button" link="https://example.com" color="info" >}} | ||||
| 
 | ||||
| ### References | ||||
| - [Docsy authoring guide](https://www.docsy.dev/docs/adding-content/) | ||||
| 
 | ||||
|  |  | |||
|  | @ -22,5 +22,4 @@ The following steps in this guide are: | |||
| 1. Configure a component | ||||
| 1. Explore Dapr quickstarts | ||||
| 
 | ||||
| <a class="btn btn-primary" href="{{< ref install-dapr-cli.md >}}" role="button">First step: Install the Dapr CLI >></a> | ||||
| 
 | ||||
| {{< button text="First step: Install the Dapr CLI >>" page="install-dapr-cli" >}} | ||||
|  |  | |||
|  | @ -101,4 +101,4 @@ Exit the redis-cli with: | |||
| exit | ||||
| ``` | ||||
| 
 | ||||
| <a class="btn btn-primary" href="{{< ref get-started-component.md >}}" role="button">Next step: Define a component >></a> | ||||
| {{< button text="Next step: Define a component >>" page="get-started-component" >}} | ||||
|  |  | |||
|  | @ -90,4 +90,4 @@ You should see output with the secret you stored in the JSON file. | |||
| {"my-secret":"I'm Batman"} | ||||
| ``` | ||||
| 
 | ||||
| <a class="btn btn-primary" href="{{< ref quickstarts.md >}}" role="button">Next step: Explore Dapr quickstarts >></a> | ||||
| {{< button text="Next step: Explore Dapr quickstarts >>" page="quickstarts" >}} | ||||
|  |  | |||
|  | @ -110,5 +110,4 @@ Flags: | |||
| Use "dapr [command] --help" for more information about a command. | ||||
| ``` | ||||
| 
 | ||||
| <a class="btn btn-primary" href="{{< ref install-dapr-selfhost.md >}}" role="button">Next step: Initialize Dapr >></a> | ||||
| 
 | ||||
| {{< button text="Next step: Initialize Dapr >>" page="install-dapr-selfhost" >}} | ||||
|  |  | |||
|  | @ -109,5 +109,4 @@ You will see the Dapr config, Dapr binaries directory, and the default component | |||
| 
 | ||||
| {{< /tabs >}} | ||||
| 
 | ||||
| <a class="btn btn-primary" href="{{< ref get-started-api.md >}}" role="button">Next step: Use the Dapr API >></a> | ||||
| 
 | ||||
| {{< button text="Next step: Use the Dapr API >>" page="get-started-api" >}} | ||||
|  |  | |||
|  | @ -142,6 +142,6 @@ Use the `AWS account ID` and `AWS account secret` and plug them into the `access | |||
| - [Pub/Sub building block]({{< ref pubsub >}}) | ||||
| - Read [this guide]({{< ref "howto-publish-subscribe.md#step-2-publish-a-topic" >}}) for instructions on configuring pub/sub components | ||||
| - [AWS SQS as subscriber to SNS](https://docs.aws.amazon.com/sns/latest/dg/sns-sqs-as-subscriber.html) | ||||
| - [AWS SNS API refernce](https://docs.aws.amazon.com/sns/latest/api/Welcome.html) | ||||
| - [AWS SQS API refernce](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/Welcome.html) | ||||
| - [AWS SNS API reference](https://docs.aws.amazon.com/sns/latest/api/Welcome.html) | ||||
| - [AWS SQS API reference](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/Welcome.html) | ||||
| - [Authenticating to AWS]({{< ref authenticating-aws.md >}}) | ||||
|  |  | |||
|  | @ -12,7 +12,7 @@ description: "Set-up New Relic for distributed tracing" | |||
| 
 | ||||
| ## Configure Dapr tracing | ||||
| 
 | ||||
| Dapr natively captures metrics and traces that can be send directly to New Relic. The easiest way to export these is by configuring Dapr to send the traces to [New Relic's Trace API](https://docs.newrelic.com/docs/understand-dependencies/distributed-tracing/trace-api/report-zipkin-format-traces-trace-api#existing-zipkin) using the Zipkin trace format. | ||||
| Dapr natively captures metrics and traces that can be send directly to New Relic. The easiest way to export these is by configuring Dapr to send the traces to [New Relic's Trace API](https://docs.newrelic.com/docs/distributed-tracing/trace-api/report-zipkin-format-traces-trace-api/) using the Zipkin trace format. | ||||
| 
 | ||||
| In order for the integration to send data to New Relic [Telemetry Data Platform](https://newrelic.com/platform/telemetry-data-platform), you need a [New Relic Insights Insert API key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#insights-insert-key).  | ||||
| 
 | ||||
|  | @ -108,8 +108,7 @@ All the data that is collected from Dapr, Kubernetes or any services that run on | |||
| * [New Relic Account Signup](https://newrelic.com/signup) | ||||
| * [Telemetry Data Platform](https://newrelic.com/platform/telemetry-data-platform) | ||||
| * [Distributed Tracing](https://docs.newrelic.com/docs/understand-dependencies/distributed-tracing/get-started/introduction-distributed-tracing) | ||||
| * [New Relic Trace API](https://docs.newrelic.com/docs/understand-dependencies/distributed-tracing/trace-api) | ||||
| * [New Relic Metric API](https://docs.newrelic.com/docs/telemetry-data-platform/get-data/apis/introduction-metric-api) | ||||
| * [New Relic Trace API](https://docs.newrelic.com/docs/distributed-tracing/trace-api/introduction-trace-api/) | ||||
| * [Types of New Relic API keys](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys) | ||||
| * [New Relic OpenTelemetry User Experience](https://blog.newrelic.com/product-news/opentelemetry-user-experience/) | ||||
| * [Alerts and Applied Intelligence](https://docs.newrelic.com/docs/alerts-applied-intelligence) | ||||
|  |  | |||
|  | @ -0,0 +1,8 @@ | |||
| {{ $color := .Get "color" | default "primary" }} | ||||
| {{ $page := .Get "page" }} | ||||
| {{ $link := .Get "link" | default "#" }} | ||||
| {{ $text := .Get "text" }} | ||||
| 
 | ||||
| {{- if $page -}}{{- $link = ref . $page -}}{{- end -}} | ||||
| 
 | ||||
| <a class="btn btn-{{ $color }}" href="{{ $link }}" role="button">{{ $text }}</a> | ||||
		Loading…
	
		Reference in New Issue