From 95fc3e099687b33abf09b52c7a0e336100909e3c Mon Sep 17 00:00:00 2001
From: mc_rocha <mrocha@gitlab.com>
Date: Fri, 12 Dec 2025 16:03:42 -0500
Subject: [PATCH 1/2] Add policy_auto_dismissed field to Vulnerabilities ES
 index

EE: true
Changelog: added
---
 ...cy_auto_dismissed_field_to_vulnerability.yml | 10 ++++++++++
 ...icy_auto_dismissed_field_to_vulnerability.rb | 17 +++++++++++++++++
 ee/lib/search/elastic/types/vulnerability.rb    |  3 ++-
 ...uto_dismissed_field_to_vulnerability_spec.rb | 10 ++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml
 create mode 100644 ee/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.rb
 create mode 100644 ee/spec/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability_spec.rb

diff --git a/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml b/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml
new file mode 100644
index 00000000000000..f0b8296c430b0c
--- /dev/null
+++ b/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml
@@ -0,0 +1,10 @@
+---
+name: AddPolicyAutoDismissedFieldToVulnerability
+version: '20251211130305'
+description: Adds policy_auto_dismissed field to the Vulnerability index.
+group: group::security policies
+milestone: '18.8'
+introduced_by_url:
+obsolete: false
+marked_obsolete_by_url:
+marked_obsolete_in_milestone:
diff --git a/ee/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.rb b/ee/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.rb
new file mode 100644
index 00000000000000..9d59e591d01117
--- /dev/null
+++ b/ee/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddPolicyAutoDismissedFieldToVulnerability < Elastic::Migration
+  include ::Search::Elastic::MigrationUpdateMappingsHelper
+
+  DOCUMENT_TYPE = Vulnerability
+
+  private
+
+  def new_mappings
+    {
+      policy_auto_dismissed: {
+        type: 'boolean'
+      }
+    }
+  end
+end
diff --git a/ee/lib/search/elastic/types/vulnerability.rb b/ee/lib/search/elastic/types/vulnerability.rb
index 1301d88b56fc5c..ae974554f5a1bb 100644
--- a/ee/lib/search/elastic/types/vulnerability.rb
+++ b/ee/lib/search/elastic/types/vulnerability.rb
@@ -77,7 +77,8 @@ def base_mappings
               policy_violations: { type: 'short' }, # enum
               false_positive: { type: 'boolean' },
               schema_version: { type: 'short' },
-              security_project_tracked_context_id: { type: 'long' }
+              security_project_tracked_context_id: { type: 'long' },
+              policy_auto_dismissed: { type: 'boolean' }
             }
           end
 
diff --git a/ee/spec/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability_spec.rb b/ee/spec/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability_spec.rb
new file mode 100644
index 00000000000000..3d34d19d0f7fc7
--- /dev/null
+++ b/ee/spec/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability_spec.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require File.expand_path('ee/elastic/migrate/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.rb')
+
+RSpec.describe AddPolicyAutoDismissedFieldToVulnerability, :elastic, feature_category: :security_policy_management do
+  let(:version) { 20251211130305 }
+
+  include_examples 'migration adds mapping'
+end
-- 
GitLab


From cdefe1ffcc1a1e97a43a34023ba8aa7f1adbd23f Mon Sep 17 00:00:00 2001
From: Marcos Rocha <mrocha@gitlab.com>
Date: Tue, 16 Dec 2025 17:39:33 +0000
Subject: [PATCH 2/2] Add missing introduced_by_url

---
 ...1130305_add_policy_auto_dismissed_field_to_vulnerability.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml b/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml
index f0b8296c430b0c..ac3fc1f39c860d 100644
--- a/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml
+++ b/ee/elastic/docs/20251211130305_add_policy_auto_dismissed_field_to_vulnerability.yml
@@ -4,7 +4,7 @@ version: '20251211130305'
 description: Adds policy_auto_dismissed field to the Vulnerability index.
 group: group::security policies
 milestone: '18.8'
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/216336
 obsolete: false
 marked_obsolete_by_url:
 marked_obsolete_in_milestone:
-- 
GitLab