Skip to content

Commit a42c4dd

Browse files
apiarian-datadognhulstoncswatt
authored
feat: [SVLS-6946] rearrange serverless google cloud docs for incremental updates (#30102)
* feat: [SVLLS-6946] rearrange serverless google cloud docs for live updates * chore: move google cloud under serverless * chore: fix serverless google cloud index links * chore: move google_cloud_run doc into serverless/google_cloud directory * chore: move google cloud run in process docs to serverless/google_cloud directory * chore: move cloud run functions docs to serverless/google_cloud directory * chore: move functions 1st gen to serverless/google_cloud * update structure * fix menu * update cloud run index page * make links located at ``/serverless/google_cloud_run`; keep ``/serverless/google_cloud` as an alias * fix workload html * add further reading; fix padding on workloads * replace workload images with text for more clarity * hide gen 1 functions from sidebar * add further erading * move functions warning labels * update sidecar & in-process links * add 1st gen functions to sidebar * fix link; require google cloud integration * add info alerts for Google Cloud integration * fix alert link * update alerts * update code text in alerts * revert .editorconfig * edits --------- Co-authored-by: Nicholas Hulston <[email protected]> Co-authored-by: Nicholas Hulston <[email protected]> Co-authored-by: cecilia saixue watt <[email protected]>
1 parent 755f437 commit a42c4dd

File tree

8 files changed

+1019
-934
lines changed

8 files changed

+1019
-934
lines changed

config/_default/menus/main.en.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3353,14 +3353,22 @@ menu:
33533353
parent: serverless
33543354
identifier: serverless_gcr
33553355
weight: 7
3356-
- name: 1st Gen Functions
3357-
url: serverless/google_cloud_run/functions_gen1
3356+
- name: Containers (Sidecar)
3357+
url: serverless/google_cloud_run/containers
33583358
parent: serverless_gcr
33593359
weight: 701
3360-
- name: 2nd Gen Functions
3361-
url: serverless/google_cloud_run/functions
3360+
- name: Containers (In-Process)
3361+
url: serverless/google_cloud_run/containers_in_process
33623362
parent: serverless_gcr
33633363
weight: 702
3364+
- name: Functions
3365+
url: serverless/google_cloud_run/functions
3366+
parent: serverless_gcr
3367+
weight: 703
3368+
- name: Functions (1st generation)
3369+
url: serverless/google_cloud_run/functions_1st_gen
3370+
parent: serverless_gcr
3371+
weight: 704
33643372
- name: Glossary
33653373
url: serverless/glossary
33663374
parent: serverless

content/en/serverless/_index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ cascade:
3131
{{< vimeo url="https://player.vimeo.com/progressive_redirect/playback/543362476/rendition/1080p/file.mp4?loc=external&signature=4927d13b131aea1e3b4f77efca5af49bb509f5e7f1d6ca06a5267ba02a8c194a" poster="/images/poster/serverless.png" >}}
3232

3333
<br/>
34-
34+
3535
<div class="alert alert-info">Make sure to check out discussions going on in the <a href="https://datadoghq.slack.com/archives/CFDPB83M4">#serverless</a> channel in the <a href="https://chat.datadoghq.com/">Datadog Slack community</a>.</div>
3636

3737
{{< learning-center-callout header="Join an enablement webinar session" hide_image="true" btn_title="Sign Up" btn_url="https://www.datadoghq.com/technical-enablement/sessions/?tags.topics-0=Serverless">}}
@@ -56,7 +56,7 @@ With [Distributed Tracing][5], you can connect your serverless traces to metrics
5656

5757
### AWS Step Functions
5858

59-
AWS Step Functions is a serverless orchestration service that lets developers create and manage multi-step application workflows in AWS.
59+
AWS Step Functions is a serverless orchestration service that lets developers create and manage multi-step application workflows in AWS.
6060

6161
Monitor metrics and logs from the [AWS Step Functions Integration][13] to view cloud-native telemetry within the Serverless app view.
6262

@@ -66,7 +66,7 @@ Enhanced Step Function metrics, which appear in Datadog with the prefix `aws.sta
6666

6767
### Azure App Service
6868

69-
The [Datadog extension for Azure App Service][7] provides tracing capabilities for Azure Web Apps.
69+
The [Datadog extension for Azure App Service][7] provides tracing capabilities for Azure Web Apps.
7070

7171
Use the [Azure App Service view][8] to:
7272

@@ -82,7 +82,7 @@ The Datadog extension for Azure App Service provides tracing capabilities for Az
8282

8383
### Azure Container Apps
8484

85-
Azure Container Apps is a fully managed serverless platform for deploying and scaling container-based applications. Datadog provides monitoring and log collection for Container Apps through the [Azure integration][9].
85+
Azure Container Apps is a fully managed serverless platform for deploying and scaling container-based applications. Datadog provides monitoring and log collection for Container Apps through the [Azure integration][9].
8686

8787
Datadog also provides a solution, now in Preview, for [instrumenting your Container Apps applications][10] with a purpose-built Agent to enable tracing, custom metrics, and direct log collection.
8888

content/en/serverless/google_cloud_run/_index.md

Lines changed: 15 additions & 862 deletions
Large diffs are not rendered by default.

content/en/serverless/google_cloud_run/containers.md

Lines changed: 877 additions & 0 deletions
Large diffs are not rendered by default.

content/en/serverless/guide/gcr_serverless_init.md renamed to content/en/serverless/google_cloud_run/containers_in_process.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Google Cloud Run with serverless-init
2+
title: Instrumenting Google Cloud Run In-Process
33
further_reading:
44

55
- link: 'https://www.datadoghq.com/blog/collect-traces-logs-from-cloud-run-with-datadog/'
@@ -10,9 +10,15 @@ further_reading:
1010

1111
## Overview
1212

13-
<div class="alert alert-info">If you are running multiple containers per Google Cloud Run application, Datadog recommends using the Datadog sidecar: <a href="/serverless/google_cloud_run">Instrument Google Cloud Run</a>.</div>
13+
Google Cloud Run is a fully managed serverless platform for deploying and scaling container-based applications.
1414

15-
Google Cloud Run is a fully managed serverless platform for deploying and scaling container-based applications. Datadog provides monitoring and log collection for Cloud Run through the [Google Cloud integration][1]. Datadog also provides a solution for instrumenting your Cloud Run applications with a purpose-built Agent to enable tracing, custom metrics, and direct log collection.
15+
This page provides instructions for instrumenting your Google Cloud Run containers with the Datadog Agent, which enables tracing, custom metrics, and direct log collection.
16+
17+
<div class="alert alert-info">To instrument your Google Cloud Run applications with the Datadog Agent running in a sidecar, see <a href="/serverless/google_cloud_run/containers">Instrument Google Cloud Run with Sidecar</a>.</div>
18+
19+
<div class="alert alert-info">
20+
<strong>Have you set up your <a href="/integrations/google-cloud-platform/">Google Cloud integration</a>?</strong> Datadog recommends setting up the integration, which collects metrics and logs from Google Cloud services, before proceeding on to instrumentation. Remember to add the <code>cloud asset viewer</code> role to your service account and enable the Cloud Asset Inventory API in Google Cloud.
21+
</div>
1622

1723
### Prerequisites
1824

@@ -106,7 +112,7 @@ gcr.io/<YOUR_PROJECT>/<YOUR_APP_NAME>
106112

107113
## Configure your application
108114

109-
Once the container is built and pushed to your registry, the last step is to set the required environment variables for the Datadog Agent:
115+
After the container is built and pushed to your registry, set the required environment variables for the Datadog Agent:
110116
- `DD_API_KEY`: Datadog API key, used to send data to your Datadog account. It should be configured as a [Google Cloud Secret][11] for privacy and safety.
111117
- `DD_SITE`: Datadog endpoint and website. Select your site on the right side of this page. Your site is: {{< region-param key="dd_site" code="true" >}}.
112118

@@ -126,17 +132,17 @@ See [all arguments and flags for `gcloud run deploy`][26].
126132

127133
## Results
128134

129-
Once the deployment is completed, your metrics and traces are sent to Datadog. In Datadog, navigate to **Infrastructure > Serverless** to see your serverless metrics and traces.
135+
After the deployment is completed, your metrics and traces are sent to Datadog. In Datadog, navigate to **Infrastructure > Serverless** to see your serverless metrics and traces.
130136

131137
## Additional configurations
132138

133-
- **Advanced Tracing:** The Datadog Agent already provides some basic tracing for popular frameworks. Follow the [advanced tracing guide][2] for more information.
139+
- **Advanced tracing:** The Datadog Agent already provides some basic tracing for popular frameworks. Follow the [advanced tracing guide][2] for more information.
134140

135141
- **Logs:** If you use the [Google Cloud integration][1], your logs are already being collected. Alternatively, you can set the `DD_LOGS_ENABLED` environment variable to `true` to capture application logs through the serverless instrumentation directly.
136142

137-
- **Custom Metrics:** You can submit custom metrics using a [DogStatsD client][4]. For monitoring Cloud Run and other serverless applications, use [distribution][9] metrics. Distributions provide `avg`, `sum`, `max`, `min`, and `count` aggregations by default. On the Metric Summary page, you can enable percentile aggregations (p50, p75, p90, p95, p99) and also manage tags. To monitor a distribution for a gauge metric type, use `avg` for both the [time and space aggregations][11]. To monitor a distribution for a count metric type, use `sum` for both the time and space aggregations.
143+
- **Custom metrics:** You can submit custom metrics using a [DogStatsD client][4]. For monitoring Cloud Run and other serverless applications, use [distribution][9] metrics. Distributions provide `avg`, `sum`, `max`, `min`, and `count` aggregations by default. On the Metric Summary page, you can enable percentile aggregations (p50, p75, p90, p95, p99) and also manage tags. To monitor a distribution for a gauge metric type, use `avg` for both the [time and space aggregations][11]. To monitor a distribution for a count metric type, use `sum` for both the time and space aggregations.
138144

139-
### Environment Variables
145+
### Environment variables
140146

141147
| Variable | Description |
142148
| -------- | ----------- |
@@ -158,7 +164,6 @@ This integration depends on your runtime having a full SSL implementation. If yo
158164
RUN apt-get update && apt-get install -y ca-certificates
159165
```
160166

161-
162167
## Further reading
163168

164169
{{< partial name="whats-next/whats-next.html" >}}

0 commit comments

Comments
 (0)