Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

6 files changed, 63 insertions, 6 deletions

diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
new file mode 100644
index 00000000000..afee13f5534
--- /dev/null
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -0,0 +1,18 @@
+---
+key_path: mail.smtp_server
+description: The value of the SMTP server that is used
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: data_available
+time_frame: all
+data_source: ruby
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index 6bb5795c971..ee3741581b4 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -6,9 +6,9 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: boolean
-status: data_available
+status: deprecated
 time_frame: none
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index 1828d18b794..37b12a982bb 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -8,7 +8,7 @@ product_category: global_search
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: ruby
 distribution:
 - ce
 - ee
@@ -16,4 +16,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+
diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
new file mode 100644
index 00000000000..378ae0e2ee4
--- /dev/null
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -0,0 +1,19 @@
+---
+key_path: database.version
+description: The version of the PostgreSQL database.
+product_section: enablement
+product_stage: enablement
+product_group: group::distribution
+product_category: collection
+value_type: string
+status: data_available
+time_frame: none
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index e88b8f8c827..0d60bc309b4 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -6,7 +6,7 @@ product_stage: enablement
 product_group: group::distribution
 product_category: collection
 value_type: string
-status: implemented
+status: data_available
 milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54778
 time_frame: none
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
new file mode 100644
index 00000000000..9cc32b75790
--- /dev/null
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -0,0 +1,21 @@
+---
+key_path: topology
+description: Topology data
+product_section: enablement
+product_stage: enablement
+product_group: group::memory
+product_category:
+value_type: object
+status: data_available
+milestone: "13.11"
+introduced_by_url: https://gitlab.com/groups/gitlab-org/-/epics/3209
+time_frame: none
+data_source: prometheus
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+object_json_schema: 'config/metrics/objects_schemas/topology_schema.json'