Update from merge request

This commit is contained in:
root
2025-07-18 19:21:53 +00:00
parent 43aab8c8d8
commit b333223a56
11 changed files with 134 additions and 22 deletions

View File

@ -128,7 +128,7 @@ export default {
api: s__('JobSource|API'),
chat: s__('JobSource|Chat'),
container_registry_push: s__('JobSource|Container Registry Push'),
duo_workflow: s__('JobSource|Duo Workflow'),
duo_workflow: s__('JobSource|Duo Agent Platform'),
external: s__('JobSource|External'),
external_pull_request_event: s__('JobSource|External Pull Request'),
merge_request_event: s__('JobSource|Merge Request'),

View File

@ -57,7 +57,7 @@ const sourcesItems = [
text: s__('PipelineSource|Scheduled Scan Execution Policy'),
},
{ value: SOURCE_CONTAINER_REGISTRY_PUSH, text: s__('PipelineSource|Container Registry Push') },
{ value: SOURCE_DUO_WORKFLOW, text: s__('PipelineSource|Duo Workflow') },
{ value: SOURCE_DUO_WORKFLOW, text: s__('PipelineSource|Duo Agent Platform') },
{
value: SOURCE_PIPELINE_EXECUTION_POLICY_SCHEDULE,
text: s__('PipelineSource|Scheduled Pipeline Execution Policy'),

View File

@ -0,0 +1,8 @@
---
migration_job_name: BackfillSubscriptionUserAddOnAssignmentVersions
description: Backfills user_add_on_assignment_versions created before adding Papertrail to user_add_on_assignments
feature_category: value_stream_management
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/196272
milestone: '18.3'
queued_migration_version: 20250701112428
finalized_by: # version of the migration that finalized this BBM

View File

@ -0,0 +1,32 @@
# frozen_string_literal: true
class QueueBackfillSubscriptionUserAddOnAssignmentVersions < Gitlab::Database::Migration[2.3]
disable_ddl_transaction!
restrict_gitlab_migration gitlab_schema: :gitlab_main
milestone '18.3'
MIGRATION = "BackfillSubscriptionUserAddOnAssignmentVersions"
DELAY_INTERVAL = 2.minutes
BATCH_SIZE = 1000
SUB_BATCH_SIZE = 100
def up
queue_batched_background_migration(
MIGRATION,
:subscription_user_add_on_assignments,
:id,
job_interval: DELAY_INTERVAL,
batch_size: BATCH_SIZE,
sub_batch_size: SUB_BATCH_SIZE
)
end
def down
delete_batched_background_migration(
'BackfillSubscriptionUserAddOnAssignmentVersions',
:subscription_user_add_on_assignments,
:id,
[]
)
end
end

View File

@ -0,0 +1 @@
76e89a1188805bf2e50b603864d8b44f559897b5c72de867331df7f93b79a1f1

View File

@ -349,6 +349,34 @@ To add OpenTelemetry instrumentation to your applications:
Refer to the [OpenTelemetry documentation](https://opentelemetry.io/docs/instrumentation/) for language-specific guidelines.
## GitLab Observability Templates
GitLab provides pre-built dashboard templates to help you get started with observability quickly. These templates are available at [Experimental Observability O11y Templates](https://gitlab.com/gitlab-org/embody-team/experimental-observability/o11y-templates/).
### Available templates
**Standard OpenTelemetry dashboards**: If you instrument your application with standard OpenTelemetry libraries, you can use these plug-and-play dashboard templates:
- Application performance monitoring dashboards
- Service dependency visualizations
- Error rate and latency tracking
**GitLab-specific dashboards**: When you send GitLab OpenTelemetry data to your GitLab O11y instance, use these dashboards for out-of-the-box insights:
- GitLab application performance metrics
- GitLab service health monitoring
- GitLab-specific trace analysis
**CI/CD observability**: The repository includes an example GitLab CI/CD pipeline with OpenTelemetry instrumentation that works with the GitLab O11y CI/CD dashboard template JSON file. This helps you monitor your CI/CD pipeline performance and identify bottlenecks.
### Using the templates
1. Clone or download the templates from the repository.
1. Update the service name in the example application dashboards to match your service name.
1. Import the JSON files into your GitLab O11y instance.
1. Configure your applications to send telemetry data using standard OpenTelemetry libraries as described in the [Instrument your application](#instrument-your-application) section.
1. The dashboards are now available with your application's telemetry data in GitLab O11y.
## Troubleshooting
### GitLab Observability instance issues

View File

@ -0,0 +1,16 @@
# frozen_string_literal: true
module Gitlab
module BackgroundMigration
# This batched background migration is EE-only
# Migration file: ee/lib/ee/gitlab/background_migration/backfill_subscription_user_add_on_assignment_versions.rb
class BackfillSubscriptionUserAddOnAssignmentVersions < BatchedMigrationJob
feature_category :value_stream_management
def perform; end
end
end
end
Gitlab::BackgroundMigration::BackfillSubscriptionUserAddOnAssignmentVersions.prepend_mod

View File

@ -6000,7 +6000,7 @@ msgstr ""
msgid "AiPowered|Amazon Q Setup"
msgstr ""
msgid "AiPowered|Are you sure you want to turn off GitLab Duo Workflow?"
msgid "AiPowered|Are you sure you want to turn off GitLab Duo Agent Platform?"
msgstr ""
msgid "AiPowered|Assign models to AI-native features."
@ -6099,7 +6099,7 @@ msgstr ""
msgid "AiPowered|Explore GitLab Duo Core"
msgstr ""
msgid "AiPowered|Failed to disable GitLab Duo Workflow."
msgid "AiPowered|Failed to disable GitLab Duo Agent Platform."
msgstr ""
msgid "AiPowered|Failed to enable GitLab Duo Agent Platform."
@ -6123,6 +6123,12 @@ msgstr ""
msgid "AiPowered|GitLab Duo Agent Platform"
msgstr ""
msgid "AiPowered|GitLab Duo Agent Platform has successfully been turned off."
msgstr ""
msgid "AiPowered|GitLab Duo Agent Platform is an AI-native coding agent in the Visual Studio Code (VS Code) IDE."
msgstr ""
msgid "AiPowered|GitLab Duo Agent Platform is now on for the instance and the service account (%{accountId}) was created. To use Agent Platform in your groups, you must turn on AI features for specific groups."
msgstr ""
@ -6144,9 +6150,6 @@ msgstr ""
msgid "AiPowered|GitLab Duo Self-Hosted"
msgstr ""
msgid "AiPowered|GitLab Duo Workflow has successfully been turned off."
msgstr ""
msgid "AiPowered|GitLab Duo availability"
msgstr ""
@ -6231,13 +6234,10 @@ msgstr ""
msgid "AiPowered|This setting requires GitLab Duo availability to be on or off by default."
msgstr ""
msgid "AiPowered|Turn off GitLab Duo Workflow"
msgid "AiPowered|Turn off GitLab Duo Agent Platform"
msgstr ""
msgid "AiPowered|Turn off Workflow"
msgstr ""
msgid "AiPowered|Turn on GitLab Duo Workflow"
msgid "AiPowered|Turn on GitLab Duo Agent Platform"
msgstr ""
msgid "AiPowered|Turn on IDE features"
@ -6267,7 +6267,7 @@ msgstr ""
msgid "AiPowered|View configuration"
msgstr ""
msgid "AiPowered|What is this service account?"
msgid "AiPowered|What is the Duo Agent Platform service account?"
msgstr ""
msgid "AiPowered|When GitLab Duo is not available, experiment and beta features cannot be turned on."
@ -6282,13 +6282,10 @@ msgstr ""
msgid "AiPowered|When you save, GitLab Duo will be turned off for all groups, subgroups, and projects."
msgstr ""
msgid "AiPowered|When you turn off Workflow, users can no longer use it to solve coding tasks. Are you sure?"
msgid "AiPowered|When you turn off GitLab Duo Agent Platform, users can no longer use it to solve coding tasks. Are you sure?"
msgstr ""
msgid "AiPowered|When you turn on GitLab Duo Workflow, a service account is created."
msgstr ""
msgid "AiPowered|Workflow is an AI-native coding agent in the Visual Studio Code (VS Code) IDE."
msgid "AiPowered|When you turn on GitLab Duo Agent Platform, a service account is created."
msgstr ""
msgid "AiPowered|You now have access to GitLab Duo Chat and Code Suggestions in supported IDEs. To start using these features, %{link1Start}install the GitLab extension in your IDE%{link1End}. If you already have this extension installed, %{link2Start}explore what you can do with GitLab Duo Core%{link2End}."
@ -24263,7 +24260,7 @@ msgstr ""
msgid "DuoWorkflowSettings|Model Context Protocol"
msgstr ""
msgid "DuoWorkflowSettings|Turn on MCP support for GitLab Duo Agentic Chat and GitLab Duo Workflow"
msgid "DuoWorkflowSettings|Turn on MCP support for GitLab Duo Agentic Chat and GitLab Duo Agent Platform"
msgstr ""
msgid "DuoWorkflowSettings|Turn on Model Context Protocol (MCP) support"
@ -35678,6 +35675,9 @@ msgstr ""
msgid "JobSource|Container Registry Push"
msgstr ""
msgid "JobSource|Duo Agent Platform"
msgstr ""
msgid "JobSource|Duo Workflow"
msgstr ""
@ -45990,7 +45990,7 @@ msgstr ""
msgid "PipelineSource|Container Registry Push"
msgstr ""
msgid "PipelineSource|Duo Workflow"
msgid "PipelineSource|Duo Agent Platform"
msgstr ""
msgid "PipelineSource|External"

View File

@ -83,7 +83,7 @@ describe('Job Sidebar Details Container', () => {
['api', 'Source: API'],
['chat', 'Source: Chat'],
['container_registry_push', 'Source: Container Registry Push'],
['duo_workflow', 'Source: Duo Workflow'],
['duo_workflow', 'Source: Duo Agent Platform'],
['external', 'Source: External'],
['external_pull_request_event', 'Source: External Pull Request'],
['merge_request_event', 'Source: Merge Request'],

View File

@ -83,7 +83,7 @@ describe('PipelinesDashboardClickhouseFilters', () => {
'On-Demand DAST Validation',
'Scheduled Scan Execution Policy',
'Container Registry Push',
'Duo Workflow',
'Duo Agent Platform',
'Scheduled Pipeline Execution Policy',
'Unknown',
]);

View File

@ -0,0 +1,27 @@
# frozen_string_literal: true
require 'spec_helper'
require_migration!
RSpec.describe QueueBackfillSubscriptionUserAddOnAssignmentVersions, migration: :gitlab_main, feature_category: :value_stream_management do
let!(:batched_migration) { described_class::MIGRATION }
it 'schedules a new batched migration' do
reversible_migration do |migration|
migration.before -> {
expect(batched_migration).not_to have_scheduled_batched_migration
}
migration.after -> {
expect(batched_migration).to have_scheduled_batched_migration(
gitlab_schema: :gitlab_main,
table_name: :subscription_user_add_on_assignments,
column_name: :id,
interval: described_class::DELAY_INTERVAL,
batch_size: described_class::BATCH_SIZE,
sub_batch_size: described_class::SUB_BATCH_SIZE
)
}
end
end
end