Add latest changes from gitlab-org/gitlab@master

3 files changed, 40 insertions, 0 deletions

diff --git a/app/graphql/resolvers/metrics/dashboard_resolver.rb b/app/graphql/resolvers/metrics/dashboard_resolver.rb
new file mode 100644
index 00000000000..05d82ca0f46
--- /dev/null
+++ b/app/graphql/resolvers/metrics/dashboard_resolver.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Metrics
+    class DashboardResolver < Resolvers::BaseResolver
+      argument :path, GraphQL::STRING_TYPE,
+               required: true,
+               description: "Path to a file which defines metrics dashboard eg: 'config/prometheus/common_metrics.yml'"
+
+      type Types::Metrics::DashboardType, null: true
+
+      alias_method :environment, :object
+
+      def resolve(**args)
+        return unless environment
+
+        ::PerformanceMonitoring::PrometheusDashboard.find_for(project: environment.project, user: context[:current_user], path: args[:path], options: { environment: environment })
+      end
+    end
+  end
+end
diff --git a/app/graphql/types/environment_type.rb b/app/graphql/types/environment_type.rb
index c165c0ddc61..34a90006d03 100644
--- a/app/graphql/types/environment_type.rb
+++ b/app/graphql/types/environment_type.rb
@@ -15,5 +15,9 @@ module Types
 
     field :state, GraphQL::STRING_TYPE, null: false,
           description: 'State of the environment, for example: available/stopped'
+
+    field :metrics_dashboard, Types::Metrics::DashboardType, null: true,
+          description: 'Metrics dashboard schema for the environment',
+          resolver: Resolvers::Metrics::DashboardResolver
   end
 end
diff --git a/app/graphql/types/metrics/dashboard_type.rb b/app/graphql/types/metrics/dashboard_type.rb
new file mode 100644
index 00000000000..11e834013ca
--- /dev/null
+++ b/app/graphql/types/metrics/dashboard_type.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Types
+  module Metrics
+    # rubocop: disable Graphql/AuthorizeTypes
+    # Authorization is performed at environment level
+    class DashboardType < ::Types::BaseObject
+      graphql_name 'MetricsDashboard'
+
+      field :path, GraphQL::STRING_TYPE, null: true,
+            description: 'Path to a file with the dashboard definition'
+    end
+    # rubocop: enable Graphql/AuthorizeTypes
+  end
+end