Merge branch 'update-prometheus-chart' into 'master'

Update prometheus chart version to 9.5.2

Closes #38304

See merge request gitlab-org/gitlab!21935

app/models/clusters/applications/prometheus.rb

@@ -5,7 +5,7 @@ module Clusters
     class Prometheus < ApplicationRecord
       include PrometheusAdapter
 
-      VERSION = '6.7.3'
+      VERSION = '9.5.2'
 
       self.table_name = 'clusters_applications_prometheus'
 

changelogs/unreleased/update-prometheus-chart.yml

+---
+title: Update prometheus chart version to 9.5.2
+merge_request: 21935
+author:
+type: changed

spec/models/clusters/applications/prometheus_spec.rb

@@ -130,7 +130,7 @@ describe Clusters::Applications::Prometheus do
     it 'is initialized with 3 arguments' do
       expect(subject.name).to eq('prometheus')
       expect(subject.chart).to eq('stable/prometheus')
-      expect(subject.version).to eq('6.7.3')
+      expect(subject.version).to eq('9.5.2')
       expect(subject).to be_rbac
       expect(subject.files).to eq(prometheus.files)
     end
@@ -147,7 +147,7 @@ describe Clusters::Applications::Prometheus do
       let(:prometheus) { create(:clusters_applications_prometheus, :errored, version: '2.0.0') }
 
       it 'is initialized with the locked version' do
-        expect(subject.version).to eq('6.7.3')
+        expect(subject.version).to eq('9.5.2')
       end
     end
 
@@ -218,7 +218,7 @@ describe Clusters::Applications::Prometheus do
     it 'is initialized with 3 arguments' do
       expect(patch_command.name).to eq('prometheus')
       expect(patch_command.chart).to eq('stable/prometheus')
-      expect(patch_command.version).to eq('6.7.3')
+      expect(patch_command.version).to eq('9.5.2')
       expect(patch_command.files).to eq(prometheus.files)
     end
   end

vendor/prometheus/values.yaml

 alertmanager:
   enabled: false
-  image:
-    tag: v0.15.2
 
 kubeStateMetrics:
   enabled: true
@@ -14,8 +12,6 @@ pushgateway:
 
 server:
   fullnameOverride: "prometheus-prometheus-server"
-  image:
-    tag: v2.4.3
 
 serverFiles:
   alerts: {}