Merge branch 'deps/6885bc4-6ec9894' into 'master'

Update Chef from "15.12.22" to "15.14.0"

See merge request gitlab-org/omnibus-gitlab!4537

.custom_sources.yml

@@ -22,6 +22,9 @@ gitlab-pages:
 gitlab-exporter:
   remote: "git@dev.gitlab.org:gitlab-org/gitlab-exporter.git"
   alternative: "https://gitlab.com/gitlab-org/gitlab-exporter.git"
+gitlab-kas:
+  remote: "git@dev.gitlab.org:gitlab/gitlab-agent.git"
+  alternative: "https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent.git"
 docker-distribution-pruner:
   remote: "git@dev.gitlab.org:gitlab/docker-distribution-pruner.git"
   alternative: "https://gitlab.com/gitlab-org/docker-distribution-pruner.git"

.gitlab-ci.yml

@@ -50,7 +50,7 @@ variables:
   # will use images from that registry and not depend on GitLab.com
   BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
   PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
-  BUILDER_IMAGE_REVISION: "0.0.71"
+  BUILDER_IMAGE_REVISION: "0.0.73"
   # The registry to pull the assets image from
   ASSET_REGISTRY: "${CI_REGISTRY}"
   ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"

.gitlab/merge_request_templates/General Change.md

 <!-- After merging changes to this template, update the `Default description template for merge requests` -->
-<!-- found uner Settings - General Merge Requests -->
+<!-- found under Settings - General Merge Requests -->
 ## What does this MR do?
 <!-- Briefly describe what this MR is about. -->
@@ -18,7 +18,7 @@ For anything in this list which will not be completed, please provide a reason i
 - [ ] Merge Request Title, and Description are up to date, accurate, and descriptive
 - [ ] MR targeting the appropriate branch
 - [ ] MR has a green pipeline on GitLab.com
-- [ ] Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks
+- [ ] Pipeline is green on the [dev.gitlab.org](https://dev.gitlab.org/gitlab/omnibus-gitlab/-/pipelines) mirror for this branch if the change is touching anything besides documentation or internal cookbooks
 - [ ] `trigger-package` has a green pipeline running against latest commit
 ### Expected (please provide an explanation if not completing)

.markdownlint.json

@@ -45,9 +45,11 @@
       "Debian",
       "DevOps",
       "Docker",
+      "DockerSlim",
       "Elasticsearch",
       "Facebook",
       "fastlane",
+      "fluent-plugin-redis-slowlog",
       "GDK",
       "Geo",
       "Git LFS",

CHANGELOG.md

@@ -3,6 +3,84 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
+## 13.4.3 (2020-10-06)
+
+- No changes.
+
+## 13.4.2 (2020-10-01)
+
+### Security (1 change)
+
+- Add config for remove unaccepted member invites cron worker.
+
+
+## 13.4.1 (2020-09-24)
+
+- No changes.
+
+## 13.4.0 (2020-09-22)
+
+### Security (3 changes, 3 of them are from the community)
+
+- Update Python to 3.7.9. !4544 (Takuya Noguchi)
+- Update PostgreSQL 11 from 11.7 to 11.9. !4545 (Takuya Noguchi)
+- Update PostgreSQL 12 from 12.3 to 12.4. !4546 (Takuya Noguchi)
+
+### Fixed (6 changes, 2 of them are from the community)
+
+- Remove stub_status => on from nginx status on gitlab.rb config file. !4500 (Kelvin Jasperson)
+- fix: remove useless query string match and disable buffering for artifacts. !4516 (Chieh-Min Wang)
+- Reload PostgreSQL configuration when Patroni is enabled. !4548
+- Fix missing gitlab-geo.conf when initiating replication. !4556
+- Improve pgbouncer running? method. !4557
+- Move TLS below Prometheus in Praefect config. !4575
+
+### Changed (8 changes, 1 of them is from the community)
+
+- Allow Prometheus external_labels to be configured. !4494 (Chris Weyl @rsrchboy)
+- Update replicate-geo-database to support PostgreSQL 12. !4495
+- Make gitlab-shell go through Workhorse. !4498
+- Added ability to disable a previously enabled consul service. !4502
+- Geo: Add final confirmation for promotion to primary. !4523
+- Upgrade GnuPG related software. !4525
+- Add guidance for setting the timeout value for PG upgrades. !4563
+- Add option to enable Sidekiq Exporter logs. !4573
+
+### Performance (1 change)
+
+- Inline Gitaly gRPC recording rule. !4561
+
+### Added (6 changes)
+
+- Add auto_link_user setting. !4415
+- Add arm64 package for ubuntu 20.04. !4478
+- Add Azure Blob Storage configuration. !4505
+- Build openSUSE 15.1 arm64. !4535
+- Add PostgreSQL connect_timeout parameter. !4555
+- Add Praefect reconciliation config options. !4571
+
+### Other (7 changes)
+
+- Update Prometheus components. !4303
+- Expose Consul api_url to gitlab.yml. !4482
+- Add prometheus recording rule for database query Apdex. !4489
+- Cron worker settings for CI platform target metrics. !4526
+- Address TODOs for removing legacy attribute support. !4533
+- Add instance statistics cron worker. !4567
+- Update Mattermost to 5.26.2.
+
+
+## 13.3.6 (2020-09-14)
+
+- No changes.
+
+## 13.3.5 (2020-09-04)
+
+### Fixed (1 change)
+
+- Fix geo fdw deprecation message. !4528
+
+
 ## 13.3.4 (2020-09-02)
 - No changes.
@@ -64,6 +142,13 @@ omnibus-gitlab repository.
 - Update Mattermost to 5.25.3.
+## 13.2.9 (2020-09-04)
+
+### Fixed (1 change)
+
+- Add rhel 8 to helper and selinux files. !4501
+
+
 ## 13.2.8 (2020-09-02)
 - No changes.
@@ -505,7 +590,7 @@ This version has been skipped due to packaging problems.
 - Fixes sysctl error on reconfigure after reinstall. !3921
 - Fix pg-upgrade error during sysctl commands. !4080
 - Fix pg-upgrade error format exception. !4090
-- Fixed pg upgrade for seperate geo tracking db. !4091
+- Fixed pg upgrade for separate geo tracking db. !4091
 - Fix repmgr failure during pg-upgrade. !4117
 ### Deprecated (1 change)
@@ -787,7 +872,7 @@ This version has been skipped due to packaging problems.
 ### Fixed (1 change)
-- Fix promethues duplicate rule. !3891
+- Fix prometheus duplicate rule. !3891
 ## 12.7.4
@@ -1055,7 +1140,7 @@ This version has been skipped due to packaging problems.
 - Nginx responds to health checks with correct content types. !3594
 - Fix pg-upgrade handling of secondary database nodes. !3631
-- Do not cleanup old gitlab-monitor directory if explicitely using it. !3634
+- Do not cleanup old gitlab-monitor directory if explicitly using it. !3634
 - Resolve "Reconfigure skips Geo DB migrations if Geo DB is not running on the same machine". !3635
 - Fix database replication bootstrap with `gitlab-ctl repmgr standby setup`. !3636
 - Ensure user's gitconfig contains system's core options. !3648
@@ -1167,7 +1252,7 @@ This version has been skipped due to packaging problems.
 - Add option to allow some provider bypass two factor. !3543 (Dodocat)
 - [Geo]Configuration for Docker Registry Replication. !3549
 - Make gitaly open files ulimit configurable. !3560
-- Add smartcard_san_extentions to gitlab.rb. !3566
+- Add smartcard_san_extensions to gitlab.rb. !3566
 ### Other (8 changes, 1 of them is from the community)
@@ -1394,7 +1479,7 @@ This version has been skipped due to packaging problems.
 - Use PostgreSQL username from node attribute file in gitlab-ctl command. !3352
 - gitaly: prometheus not working with tls enabled. !3353 (Roger Meier)
 - Support pg-upgrade on dbs with collate and ctype values that differ from each other. !3371
-- Properly check whether postgres is enabled when doing pg-ugprade. !3381
+- Properly check whether postgres is enabled when doing pg-upgrade. !3381
 - Bring back the option to use the authorized keyfile in docker. !3388
 - Get prometheus home directory from node attributes. !3395
 - Create the uploads_storage_path directory. !3396
@@ -1449,7 +1534,7 @@ This version has been skipped due to packaging problems.
 ### Fixed (5 changes)
 - Support pg-upgrade on dbs with collate and ctype values that differ from each other. !3371
-- Properly check whether postgres is enabled when doing pg-ugprade. !3381
+- Properly check whether postgres is enabled when doing pg-upgrade. !3381
 - Use armv7 build of Grafana in RPi package. !3401
 - Fix error with repmgr and PostgreSQL 9. !3417
 - Enable specifying --path in bundle install on Ruby docker images. !3432
@@ -1473,7 +1558,7 @@ This version has been skipped due to packaging problems.
 ### Fixed (5 changes)
 - Support pg-upgrade on dbs with collate and ctype values that differ from each other. !3371
-- Properly check whether postgres is enabled when doing pg-ugprade. !3381
+- Properly check whether postgres is enabled when doing pg-upgrade. !3381
 - Use armv7 build of Grafana in RPi package. !3401
 - Fix error with repmgr and PostgreSQL 9. !3417
 - Enable specifying --path in bundle install on Ruby docker images. !3432
@@ -2317,7 +2402,7 @@ This version has been skipped due to packaging problems.
 - Geo: promoting secondary node into primary doesnt remove `database_geo.yml` #3463
 - Only create gitlab-consul database user after repmgr database has been created
-- Make migrations during upgrade only stop unecessary services
+- Make migrations during upgrade only stop unnecessary services
 ## 10.7.3
@@ -2694,7 +2779,7 @@ This version has been skipped due to packaging problems.
 - Build and configure gitaly-ruby
 - Added support for PostgreSQL's "idle_in_transaction_session_timeout" setting
 - UDP log shipping as part of CE
-- Bump Git verison to 2.13.5
+- Bump Git version to 2.13.5
 - Added Consul service in EE
 - Update gitlab-elasticsearch-indexr to v0.2.1 11a2e7fd
 - Add configuration options for handling repository storage failures
@@ -2918,8 +3003,8 @@ This version has been skipped due to packaging problems.
 ## 9.0.1
 - Allow configuration of prepared statement caching in Rails 169891c2
-- Default redis promethues exporter to off if redis is not managed locally 63056441
-- Default postgres promethues exporter to off if postgres is not managed locally 63056441
+- Default redis prometheus exporter to off if redis is not managed locally 63056441
+- Default postgres prometheus exporter to off if postgres is not managed locally 63056441
 - Default pages http to https redirect to off 1ece2480
 - Make HSTS easier to configure, and the docs on it accurate 4ba90ff8
 - Move the automatic PG Upgrade to happen after migrations have run 8cf38d43
@@ -3818,7 +3903,7 @@ are not the same (O Schwede) c4e83c5
 ## 8.2.1
-- Expose artifacs configuration options 4aca77a5ae78a836cc9f3be060afacc3c4e72a28
+- Expose artifacts configuration options 4aca77a5ae78a836cc9f3be060afacc3c4e72a28
 - Display deploy page on all pages b362ee7d70851c291ff0d090fd75ef550c5c5baa
 ## 8.2.0
@@ -3856,7 +3941,7 @@ are not the same (O Schwede) c4e83c5
 - Using sv to check for service status e7b00e4a5d8f0195d9a3f59a6d398a6d0dba3773
 - Set kernel.sem for postgres connections dff749b36a929f9a7dfc128b60f3d53cf2464ed8
 - Use ruby 2.1.7 6fb46c4db9e5daf8a724f5c389b56ea8d918b36e
-- Add backup encription option for AWS backups 8562644f3dfe44b6faed35f8e0769a0b7c202569
+- Add backup encryption option for AWS backups 8562644f3dfe44b6faed35f8e0769a0b7c202569
 - Update git to 2.6.1 b379c1060a6af314209b86161ea44c8467c5a49f
 - Update gitlab-git-http-server to 0.3.0 737815fd22a71f1b94379a1a11d8b82367cc7b3a
 - Move incoming email settings to gitlab.yml 9d8673e221ad869199d633c7feccab167a64df6d

GITLAB_KAS_VERSION

+0.0.6

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 require_relative "lib/gitlab/version"
-omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.01")
+omnibus_gem_version = Gitlab::Version.new('omnibus', "7.0.10.02")
 # Note that omnibus is from a fork with additional gitlab changes.  You can
 # check what they are with the following comparison link:

Gemfile.lock

 GIT
   remote: https://dev.gitlab.org/gitlab/omnibus.git
-  revision: 81221aa3b263e717f5fcb57959aa9c8425126d29
-  tag: 7.0.10.01
+  revision: c33184c00a1774f8350f0f1d8cbce35b99a82fd1
+  tag: 7.0.10.02
   specs:
     omnibus (7.0.10)
       aws-sdk-s3 (~> 1)

changelogs/unreleased/4019-version-manifest-information.yml

+---
+title: Specify display_version for sofware without proper version string
+merge_request: 4622
+author:
+type: added

changelogs/unreleased/4583-make-gitlab-shell-go-through-workhorse.yml

----
-title: Make gitlab-shell go through Workhorse
-merge_request: 4498
-author:
-type: changed

changelogs/unreleased/5423-patroni-pg-upgrade-fix.yml

+---
+title: Configure pg-upgrade to work with patroni service
+merge_request: 4529
+author:
+type: fixed

changelogs/unreleased/5579-consul-should-allow-to-disable-monitored-services.yml

----
-title: Added ability to disable a previously enabled consul service
-merge_request: 4502
-author:
-type: changed

changelogs/unreleased/5610-migrations-can-silently-fail-during-deployments.yml

+---
+title: Exit non-zero during upgrade if reconfigure fails
+merge_request: 4591
+author:
+type: fixed

changelogs/unreleased/5614-centos-6-deprecation.yml

+---
+title: Add deprecation warning for CentOS 6
+merge_request: 4596
+author:
+type: deprecated

changelogs/unreleased/5664-geo-upgrade-disk-space-check.yml

+---
+title: Support geo data dir for pg-upgrade
+merge_request: 4603
+author:
+type: fixed

changelogs/unreleased/5676-add-restart-and-reload-sub-commands-to-patroni-controller.yml

+---
+title: Add wrappers for Patroni restart and reload commands
+merge_request: 4601
+author:
+type: added

changelogs/unreleased/5689-opensuse-15-2-packages.yml

+---
+title: Provide packages for openSUSE Leap 15.2
+merge_request: 4616
+author:
+type: added

changelogs/unreleased/5701-gitlab-ctl-patroni-members-results-in-error-with-prettytable.yml

+---
+title: Force install PrettyTable 0.7
+merge_request: 4628
+author:
+type: fixed

changelogs/unreleased/ab-reindexing-tasks.yml

+---
+title: Add database reindexing cronjob
+merge_request: 4602
+author:
+type: added

changelogs/unreleased/add_member_invitation_reminder_emails_cron_job_to_omnibus.yml

+---
+title: Add member invitation reminder emails cron worker
+merge_request: 4582
+author:
+type: other