VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-29 12:00:32 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2024-07-30 00:10:11 +00:00
parent da5677e7a7
commit f64d1064c5
47 changed files with 355 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/tutorials/export_sbom.md
View File

@ -85,17 +85,18 @@ Set up Dependency Scanning. For detailed instructions, follow [the Dependency Sc
```yaml
export-merged-sbom:
image: alpine
before_script:
- apk add --update jq curl
stage: .post
script:
- |
curl --header "Authorization: Bearer $PRIVATE_TOKEN"
--output export.sh --url "https://gitlab.com/api/v4/snippets/<SNIPPET_ID>/raw"
- |
curl --header "Authorization: Bearer $PRIVATE_TOKEN" --output export.sh --url "https://gitlab.com/api/v4/snippets/<SNIPPET_ID>/raw"
- /bin/sh export.sh
artifacts:
paths:
- "gl-sbom-merged-*.cdx.json"
```
1. Go to **Build > Pipelines** and confirm that the latest pipeline completed successfully.

9
doc/tutorials/observability/observability_django_tutorial.md
View File

@ -11,14 +11,11 @@ DETAILS:
**Offering:** GitLab.com
**Status:** Beta
> - Observability features [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124966) in GitLab 17.3 [with a flag](../../administration/feature_flags.md) named `observability_features`. Disabled by default.
FLAG:
The availability of this feature is controlled by a feature flag.
For more information, see the history.
This feature is available for testing, but not ready for production use.
For more information, see the history of the [**Distributed tracing** feature](../../operations/tracing.md).
In this tutorial, we'll show you how to create, configure, instrument and monitor a Django application using GitLab observability features.
In this tutorial, we'll show you how to create, configure, instrument, and monitor a Django application using GitLab observability features.
<!-- vale gitlab.SentenceSpacing = NO -->
@ -178,7 +175,7 @@ To create an application:
1. To start collecting traces, restart the Django server. After refreshing `/animals` a few times, you should see traces in the GitLab UI.
![Django traces](img/django_traces.png)
![Django traces](img/django_traces.png)
1. Optional. Django will also export certain metrics by default to GitLab, but custom metrics are supported too. For example, to increment a counter metric every time a page is loaded, add the following code:

5
doc/tutorials/observability/observability_nodejs_tutorial.md
View File

@ -11,12 +11,9 @@ DETAILS:
**Offering:** GitLab.com
**Status:** Beta
> - Observability tracing [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124966) in GitLab 16.2 [with a flag](../../administration/feature_flags.md) named `observability_tracing`. Disabled by default.
FLAG:
The availability of this feature is controlled by a feature flag.
For more information, see the history.
This feature is available for testing, but not ready for production use.
For more information, see the history of the [**Distributed tracing** feature](../../operations/tracing.md).
In this tutorial, you'll learn how to configure, instrument, and monitor a NodeJS application using GitLab Observability features.

5
doc/tutorials/observability/observability_rails_tutorial.md
View File

@ -11,12 +11,9 @@ DETAILS:
**Offering:** GitLab.com
**Status:** Beta
> - Observability tracing [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124966) in GitLab 16.2 [with a flag](../../administration/feature_flags.md) named `observability_tracing`. Disabled by default.
FLAG:
The availability of this feature is controlled by a feature flag.
For more information, see the history.
This feature is available for testing, but not ready for production use.
For more information, see the history of the [**Distributed tracing** feature](../../operations/tracing.md).
In this tutorial, you'll learn how to create, configure, instrument, and monitor a Ruby on Rails application using GitLab Observability features.