Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 28 insertions, 0 deletions

diff --git a/app/graphql/resolvers/metrics/dashboards/annotation_resolver.rb b/app/graphql/resolvers/metrics/dashboards/annotation_resolver.rb
new file mode 100644
index 00000000000..068323a3073
--- /dev/null
+++ b/app/graphql/resolvers/metrics/dashboards/annotation_resolver.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Metrics
+    module Dashboards
+      class AnnotationResolver < Resolvers::BaseResolver
+        argument :from, Types::TimeType,
+                 required: true,
+                 description: "Timestamp marking date and time from which annotations need to be fetched"
+
+        argument :to, Types::TimeType,
+                 required: false,
+                 description: "Timestamp marking date and time to which annotations need to be fetched"
+
+        type Types::Metrics::Dashboards::AnnotationType, null: true
+
+        alias_method :dashboard, :object
+
+        def resolve(**args)
+          return [] unless dashboard
+          return [] unless Feature.enabled?(:metrics_dashboard_annotations, dashboard.environment&.project)
+
+          ::Metrics::Dashboards::AnnotationsFinder.new(dashboard: dashboard, params: args).execute
+        end
+      end
+    end
+  end
+end