Add latest changes from gitlab-org/gitlab@master

.gitlab-ci.yml

-image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34"
+image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34"
 stages:
   - sync

.gitlab/ci/frontend.gitlab-ci.yml

@@ -78,7 +78,7 @@
     - .default-retry
     - .default-before_script
     - .assets-compile-cache
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.34-docker-19.03.1
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1
   stage: prepare
   services:
     - docker:19.03.0-dind

.gitlab/ci/global.gitlab-ci.yml

@@ -9,6 +9,8 @@
       - unknown_failure
       - api_failure
       - runner_system_failure
+      - job_execution_timeout
+      - stuck_or_timeout_failure
 .default-before_script:
   before_script:
@@ -203,7 +205,7 @@
     - name: redis:alpine
 .use-pg10:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.34"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34"
   services:
     - name: postgres:10.9
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -217,7 +219,7 @@
     - name: elasticsearch:6.4.2
 .use-pg10-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.34"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34"
   services:
     - name: postgres:10.9
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]

.rubocop.yml

@@ -343,6 +343,8 @@ RSpec/HaveGitlabHttpStatus:
     - 'ee/spec/controllers/*.rb'
     - 'spec/controllers/projects/**/*.rb'
     - 'ee/spec/controllers/projects/**/*.rb'
+    - 'spec/controllers/groups/**/*.rb'
+    - 'ee/spec/controllers/groups/**/*.rb'
     - 'spec/requests/*.rb'
     - 'ee/spec/requests/*.rb'

app/assets/javascripts/pages/projects/graphs/charts/index.js

 import $ from 'jquery';
 import Chart from 'chart.js';
-import _ from 'underscore';
-
 import { barChartOptions, pieChartOptions } from '~/lib/utils/chart_utils';
 document.addEventListener('DOMContentLoaded', () => {
@@ -40,7 +38,7 @@ document.addEventListener('DOMContentLoaded', () => {
         backgroundColor: 'rgba(220,220,220,0.5)',
         borderColor: 'rgba(220,220,220,1)',
         borderWidth: 1,
-        data: _.values(data),
+        data: Object.values(data),
       },
     ],
   });

app/services/metrics/dashboard/base_service.rb

@@ -46,10 +46,14 @@ module Metrics
       # Returns a new dashboard Hash, supplemented with DB info
       def process_dashboard
         ::Gitlab::Metrics::Dashboard::Processor
-          .new(project, raw_dashboard, sequence, params)
+          .new(project, raw_dashboard, sequence, process_params)
           .process
       end
+      def process_params
+        params
+      end
+
       # @return [String] Relative filepath of the dashboard yml
       def dashboard_path
         params[:dashboard_path]

changelogs/unreleased/self-monitoring-env.yml

+---
+title: Create an environment for self monitoring project
+merge_request: 24403
+author:
+type: added

doc/development/pipelines.md

@@ -42,9 +42,9 @@ The current stages are:
 ## Default image
 The default image is currently
-`registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34`.
-It includes Ruby 2.6.5, Go 1.12, Git 2.24, Git LFS 2.9, Chrome 73, Node 12, Yarn 1.16,
+`registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34`.
+It includes Ruby 2.6.5, Go 1.12, Git 2.24, Git LFS 2.9, Chrome 73, Node 12, Yarn 1.21,
 PostgreSQL 9.6, and Graphics Magick 1.3.33.
 The images used in our pipelines are configured in the
@@ -71,8 +71,8 @@ These common definitions are:
 - `.default-tags`: Ensures a job has the `gitlab-org` tag to ensure it's using
   our dedicated runners.
-- `.default-retry`: Allows a job to retry upon `unknown_failure`, `api_failure`,
-  `runner_system_failure`.
+- `.default-retry`: Allows a job to [retry](../ci/yaml/README.md#retry) upon `unknown_failure`, `api_failure`,
+  `runner_system_failure`, `job_execution_timeout`, or `stuck_or_timeout_failure`.
 - `.default-before_script`: Allows a job to use a default `before_script` definition
   suitable for Ruby/Rails tasks that may need a database running (e.g. tests).
 - `.default-cache`: Allows a job to use a default `cache` definition suitable for

lib/gitlab/database_importers/self_monitoring/project/create_service.rb

@@ -15,6 +15,7 @@ module Gitlab
             :create_group,
             :create_project,
             :save_project_id,
+            :create_environment,
             :add_prometheus_manual_configuration,
             :track_event
@@ -80,6 +81,17 @@ module Gitlab
             end
           end
+          def create_environment(result)
+            environment = ::Environment.new(project_id: result[:project].id, name: 'production')
+
+            if environment.save
+              success(result)
+            else
+              log_error("Could not create environment for the Self monitoring project. Errors: %{errors}" % { errors: environment.errors.full_messages })
+              error(_('Could not create environment'))
+            end
+          end
+
           def add_prometheus_manual_configuration(result)
             return success(result) unless prometheus_enabled?
             return success(result) unless prometheus_listen_address.present?

lib/gitlab/diff/highlight_cache.rb

@@ -93,8 +93,6 @@ module Gitlab
             #
             redis.expire(key, EXPIRATION)
           end
-
-          record_metrics(redis.memory("USAGE", key))
         end
         # Subsequent read_file calls would need the latest cache.
@@ -103,10 +101,6 @@ module Gitlab
         clear_memoization(:cacheable_files)
       end
-      def record_metrics(memory_usage)
-        self.class.gitlab_redis_diff_caching_memory_usage_bytes.observe({}, memory_usage)
-      end
-
       def file_paths
         strong_memoize(:file_paths) do
           diff_files.collect(&:file_path)

lib/gitlab/metrics/dashboard/finder.rb

@@ -34,6 +34,8 @@ module Gitlab
           #         cluster, one of [:admin, :project, :group]
           # @param options - grafana_url [String] URL pointing
           #         to a grafana dashboard panel
+          # @param options - prometheus_alert_id [Integer] ID of
+          #         a PrometheusAlert. For dashboard embeds.
           # @return [Hash]
           def find(project, user, options = {})
             service_for(options)

locale/gitlab.pot

@@ -5379,6 +5379,9 @@ msgstr ""
 msgid "Could not create Wiki Repository at this time. Please try again later."
 msgstr ""
+msgid "Could not create environment"
+msgstr ""
+
 msgid "Could not create group"
 msgstr ""

spec/controllers/groups/avatars_controller_spec.rb

@@ -25,6 +25,6 @@ describe Groups::AvatarsController do
     delete :destroy, params: { group_id: group }
-    expect(response).to have_gitlab_http_status(302)
+    expect(response).to have_gitlab_http_status(:found)
   end
 end

spec/controllers/groups/boards_controller_spec.rb

@@ -33,7 +33,7 @@ describe Groups::BoardsController do
         it 'returns a not found 404 response' do
           list_boards
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
           expect(response.content_type).to eq 'text/html'
         end
       end
@@ -76,7 +76,7 @@ describe Groups::BoardsController do
         it 'returns a not found 404 response' do
           list_boards format: :json
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
           expect(response.content_type).to eq 'application/json'
         end
       end
@@ -111,7 +111,7 @@ describe Groups::BoardsController do
         it 'returns a not found 404 response' do
           read_board board: board
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
           expect(response.content_type).to eq 'text/html'
         end
       end
@@ -148,7 +148,7 @@ describe Groups::BoardsController do
         it 'returns a not found 404 response' do
           read_board board: board, format: :json
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
           expect(response.content_type).to eq 'application/json'
         end
       end
@@ -160,7 +160,7 @@ describe Groups::BoardsController do
         read_board board: another_board
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end

spec/controllers/groups/children_controller_spec.rb

@@ -142,7 +142,7 @@ describe Groups::ChildrenController do
           get :index, params: { group_id: subgroup.to_param, filter: 'test' }, format: :json
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
         end
         it 'returns an array with one element when only one result is matched' do
@@ -185,7 +185,7 @@ describe Groups::ChildrenController do
           get :index, params: { group_id: group.to_param, filter: 'filter', per_page: 3 }, format: :json
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
         end
         it 'includes pagination headers' do
@@ -316,7 +316,7 @@ describe Groups::ChildrenController do
           it 'correctly calculates the counts' do
             get :index, params: { group_id: group.to_param, sort: 'id_asc', page: 2 }, format: :json
-            expect(response).to have_gitlab_http_status(200)
+            expect(response).to have_gitlab_http_status(:ok)
           end
         end
       end
@@ -328,7 +328,7 @@ describe Groups::ChildrenController do
         get :index, params: { group_id: group }, format: :json
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
   end

spec/controllers/groups/clusters/applications_controller_spec.rb

@@ -43,7 +43,7 @@ describe Groups::Clusters::ApplicationsController do
         expect(ClusterInstallAppWorker).to receive(:perform_async).with(application, anything).once
         expect { subject }.to change { current_application.count }
-        expect(response).to have_http_status(:no_content)
+        expect(response).to have_gitlab_http_status(:no_content)
         expect(cluster.application_helm).to be_scheduled
       end
@@ -54,7 +54,7 @@ describe Groups::Clusters::ApplicationsController do
         it 'return 404' do
           expect { subject }.not_to change { current_application.count }
-          expect(response).to have_http_status(:not_found)
+          expect(response).to have_gitlab_http_status(:not_found)
         end
       end
@@ -62,7 +62,7 @@ describe Groups::Clusters::ApplicationsController do
         let(:application) { 'unkwnown-app' }
         it 'return 404' do
-          is_expected.to have_http_status(:not_found)
+          is_expected.to have_gitlab_http_status(:not_found)
         end
       end
@@ -72,7 +72,7 @@ describe Groups::Clusters::ApplicationsController do
         end
         it 'returns 400' do
-          is_expected.to have_http_status(:bad_request)
+          is_expected.to have_gitlab_http_status(:bad_request)
         end
       end
     end
@@ -107,7 +107,7 @@ describe Groups::Clusters::ApplicationsController do
         it "schedules an application update" do
           expect(ClusterPatchAppWorker).to receive(:perform_async).with(application.name, anything).once
-          is_expected.to have_http_status(:no_content)
+          is_expected.to have_gitlab_http_status(:no_content)
           expect(cluster.application_cert_manager).to be_scheduled
         end
@@ -118,13 +118,13 @@ describe Groups::Clusters::ApplicationsController do
           cluster.destroy!
         end
-        it { is_expected.to have_http_status(:not_found) }
+        it { is_expected.to have_gitlab_http_status(:not_found) }
       end
       context 'when application is unknown' do
         let(:application_name) { 'unkwnown-app' }
-        it { is_expected.to have_http_status(:not_found) }
+        it { is_expected.to have_gitlab_http_status(:not_found) }
       end
       context 'when application is already scheduled' do
@@ -132,7 +132,7 @@ describe Groups::Clusters::ApplicationsController do
           application.make_scheduled!
         end
-        it { is_expected.to have_http_status(:bad_request) }
+        it { is_expected.to have_gitlab_http_status(:bad_request) }
       end
     end

spec/controllers/groups/clusters_controller_spec.rb

@@ -654,7 +654,7 @@ describe Groups::ClustersController do
             go(format: :json)
             cluster.reload
-            expect(response).to have_http_status(:no_content)
+            expect(response).to have_gitlab_http_status(:no_content)
             expect(cluster.enabled).to be_falsey
             expect(cluster.name).to eq('my-new-cluster-name')
             expect(cluster).not_to be_managed
@@ -674,7 +674,7 @@ describe Groups::ClustersController do
           it 'rejects changes' do
             go(format: :json)
-            expect(response).to have_http_status(:bad_request)
+            expect(response).to have_gitlab_http_status(:bad_request)
           end
         end
       end

spec/controllers/groups/group_links_controller_spec.rb

@@ -100,7 +100,7 @@ describe Groups::GroupLinksController do
         it 'renders 404' do
           subject
-          expect(response).to have_gitlab_http_status(404)
+          expect(response).to have_gitlab_http_status(:not_found)
         end
       end
     end
@@ -113,7 +113,7 @@ describe Groups::GroupLinksController do
       it 'renders 404' do
         subject
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
@@ -126,7 +126,7 @@ describe Groups::GroupLinksController do
       it 'renders 404' do
         subject
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -168,7 +168,7 @@ describe Groups::GroupLinksController do
       it 'renders 404' do
         subject
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
@@ -180,7 +180,7 @@ describe Groups::GroupLinksController do
       it 'renders 404' do
         subject
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end
@@ -210,7 +210,7 @@ describe Groups::GroupLinksController do
       it 'renders 404' do
         subject
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
@@ -222,7 +222,7 @@ describe Groups::GroupLinksController do
       it 'renders 404' do
         subject
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
   end

spec/controllers/groups/group_members_controller_spec.rb

@@ -13,7 +13,7 @@ describe Groups::GroupMembersController do
     it 'renders index with 200 status code' do
       get :index, params: { group_id: group }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
       expect(response).to render_template(:index)
     end
@@ -105,7 +105,7 @@ describe Groups::GroupMembersController do
                         access_level: Gitlab::Access::GUEST
                       }
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
         expect(group.users).not_to include group_user
       end
     end
@@ -173,7 +173,7 @@ describe Groups::GroupMembersController do
       it 'returns 403' do
         delete :destroy, params: { group_id: group, id: 42 }
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
     end
@@ -186,7 +186,7 @@ describe Groups::GroupMembersController do
         it 'returns 403' do
           delete :destroy, params: { group_id: group, id: member }
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
           expect(group.members).to include member
         end
       end
@@ -223,7 +223,7 @@ describe Groups::GroupMembersController do
       it 'returns 404' do
         delete :leave, params: { group_id: group }
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(:not_found)
       end
     end
@@ -244,7 +244,7 @@ describe Groups::GroupMembersController do
         it 'supports json request' do
           delete :leave, params: { group_id: group }, format: :json
-          expect(response).to have_gitlab_http_status(200)
+          expect(response).to have_gitlab_http_status(:ok)
           expect(json_response['notice']).to eq "You left the \"#{group.name}\" group."
         end
       end
@@ -257,7 +257,7 @@ describe Groups::GroupMembersController do
         it 'cannot removes himself from the group' do
           delete :leave, params: { group_id: group }
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
         end
       end
@@ -304,7 +304,7 @@ describe Groups::GroupMembersController do
       it 'returns 403' do
         post :approve_access_request, params: { group_id: group, id: 42 }
-        expect(response).to have_gitlab_http_status(403)
+        expect(response).to have_gitlab_http_status(:forbidden)
       end
     end
@@ -317,7 +317,7 @@ describe Groups::GroupMembersController do
         it 'returns 403' do
           post :approve_access_request, params: { group_id: group, id: member }
-          expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(:forbidden)
           expect(group.members).not_to include member
         end
       end
@@ -348,7 +348,7 @@ describe Groups::GroupMembersController do
       it 'is successful' do
         get :index, params: { group_id: group }
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
@@ -356,7 +356,7 @@ describe Groups::GroupMembersController do
       it 'is successful' do
         post :create, params: { group_id: group, users: user, access_level: Gitlab::Access::GUEST }
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
       end
     end
@@ -370,7 +370,7 @@ describe Groups::GroupMembersController do
             },
             format: :js
-        expect(response).to have_gitlab_http_status(200)
+        expect(response).to have_gitlab_http_status(:ok)
       end
     end
@@ -378,7 +378,7 @@ describe Groups::GroupMembersController do
       it 'is successful' do
         delete :destroy, params: { group_id: group, id: membership }
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
       end
     end
@@ -388,7 +388,7 @@ describe Groups::GroupMembersController do
         post :request_access, params: { group_id: group }
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
       end
     end
@@ -397,7 +397,7 @@ describe Groups::GroupMembersController do
         access_request = create(:group_member, :access_request, group: group)
         post :approve_access_request, params: { group_id: group, id: access_request }
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
       end
     end
@@ -407,7 +407,7 @@ describe Groups::GroupMembersController do
         delete :leave, params: { group_id: group }
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
       end
     end
@@ -415,7 +415,7 @@ describe Groups::GroupMembersController do
       it 'is successful' do
         post :resend_invite, params: { group_id: group, id: membership }
-        expect(response).to have_gitlab_http_status(302)
+        expect(response).to have_gitlab_http_status(:found)
       end
     end
   end

spec/controllers/groups/labels_controller_spec.rb

@@ -53,7 +53,7 @@ describe Groups::LabelsController do
       post :toggle_subscription, params: { group_id: group.to_param, id: label.to_param }
-      expect(response).to have_gitlab_http_status(200)
+      expect(response).to have_gitlab_http_status(:ok)
     end
   end
 end