Add latest changes from gitlab-org/gitlab@master

8 files changed, 44 insertions, 1 deletions

diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index afe8db8a265..bf38efedcd3 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -11,6 +11,9 @@ milestone: "13.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35493
 time_frame: 28d
 data_source: database
+instrumentation_class: CountDeploymentsMetric
+options:
+  type: all
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index 80ebafc31a0..bed2969b14a 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -8,6 +8,9 @@ product_group: environments
 value_type: number
 status: active
 time_frame: 28d
+instrumentation_class: CountDeploymentsMetric
+options:
+  type: success
 data_source: database
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index 3b172d25f84..a11c1be42f2 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -9,6 +9,9 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: database
+instrumentation_class: CountDeploymentsMetric
+options:
+  type: failed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20230531170613_ci_builds.yml b/config/metrics/counts_28d/20230531170613_ci_builds.yml
index 2240f567633..c55ad452666 100644
--- a/config/metrics/counts_28d/20230531170613_ci_builds.yml
+++ b/config/metrics/counts_28d/20230531170613_ci_builds.yml
@@ -10,7 +10,7 @@ milestone: "16.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122227
 time_frame: 28d
 data_source: database
-data_category: optional
+data_category: operational
 instrumentation_class: CountAllCiBuildsMetric
 performance_indicator_type: []
 distribution:
diff --git a/config/metrics/counts_all/20210201124934_deployments.yml b/config/metrics/counts_all/20210201124934_deployments.yml
index cb85048c13b..39aad165613 100644
--- a/config/metrics/counts_all/20210201124934_deployments.yml
+++ b/config/metrics/counts_all/20210201124934_deployments.yml
@@ -11,6 +11,9 @@ milestone: "8.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/735
 time_frame: all
 data_source: database
+instrumentation_class: CountDeploymentsMetric
+options:
+  type: all
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index c83a7296f1b..fc62872cac8 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -9,6 +9,9 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: CountDeploymentsMetric
+options:
+  type: success
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index 74bddeb265e..9a3baf64c84 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -9,6 +9,9 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: CountDeploymentsMetric
+options:
+  type: failed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20230616065123_kubernetes_agent_flux_git_push_notifications_total.yml b/config/metrics/counts_all/20230616065123_kubernetes_agent_flux_git_push_notifications_total.yml
new file mode 100644
index 00000000000..7753ad9c1bc
--- /dev/null
+++ b/config/metrics/counts_all/20230616065123_kubernetes_agent_flux_git_push_notifications_total.yml
@@ -0,0 +1,25 @@
+---
+key_path: counts.kubernetes_agent_flux_git_push_notifications_total
+description: Count of Flux Git Push notifications from KAS to agentk
+product_section: ops
+product_stage: deploy
+product_group: environments
+value_type: number
+status: active
+milestone: "16.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123782
+time_frame: all
+data_source: redis
+data_category: optional
+instrumentation_class: RedisMetric
+performance_indicator_type: []
+options:
+  prefix: kubernetes_agent
+  event: flux_git_push_notifications_total
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate