Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

2 files changed, 11 insertions, 8 deletions

diff --git a/lib/api/entities/metrics/dashboard/annotation.rb b/lib/api/entities/metrics/dashboard/annotation.rb
index 66bd09d84f9..08d1a333259 100644
--- a/lib/api/entities/metrics/dashboard/annotation.rb
+++ b/lib/api/entities/metrics/dashboard/annotation.rb
@@ -5,13 +5,13 @@ module API
     module Metrics
       module Dashboard
         class Annotation < Grape::Entity
-          expose :id
-          expose :starting_at
-          expose :ending_at
-          expose :dashboard_path
-          expose :description
-          expose :environment_id
-          expose :cluster_id
+          expose :id, documentation: { type: 'integer', example: 4 }
+          expose :starting_at, documentation: { type: 'dateTime', example: '2016-04-08T03:45:40.000Z' }
+          expose :ending_at, documentation: { type: 'dateTime', example: '2016-08-08T09:00:00.000Z' }
+          expose :dashboard_path, documentation: { type: 'string', example: '.gitlab/dashboards/custom_metrics.yml' }
+          expose :description, documentation: { type: 'string', example: 'annotation description' }
+          expose :environment_id, documentation: { type: 'integer', example: 1 }
+          expose :cluster_id, documentation: { type: 'integer', example: 2 }
         end
       end
     end
diff --git a/lib/api/entities/metrics/user_starred_dashboard.rb b/lib/api/entities/metrics/user_starred_dashboard.rb
index d774160e3ea..1d2a8a39547 100644
--- a/lib/api/entities/metrics/user_starred_dashboard.rb
+++ b/lib/api/entities/metrics/user_starred_dashboard.rb
@@ -4,7 +4,10 @@ module API
   module Entities
     module Metrics
       class UserStarredDashboard < Grape::Entity
-        expose :id, :dashboard_path, :user_id, :project_id
+        expose :id, documentation: { type: 'integer', example: 5 }
+        expose :dashboard_path, documentation: { type: 'string', example: 'config/prometheus/common_metrics.yml' }
+        expose :user_id, documentation: { type: 'integer', example: 1 }
+        expose :project_id, documentation: { type: 'integer', example: 20 }
       end
     end
   end