Merge branch 'main' into fix/priority-class

Signed-off-by: Rimantas Ragainis <[email protected]>
prometheus-community · Oct 25, 2023 · 2f95f1d · 2f95f1d
2 parents 0836028 + 1d91784
commit 2f95f1d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
 appVersion: v2.47.0
-version: 25.2.0
+version: 25.3.0
 kubeVersion: ">=1.19.0-0"
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/

diff --git a/charts/prometheus/templates/cm.yaml b/charts/prometheus/templates/cm.yaml
@@ -39,6 +39,10 @@ data:
 {{ $root.Values.server.exemplars | toYaml | indent 8 }}
 {{- end }}
 {{- end }}
+{{- if $root.Values.scrapeConfigFiles }}
+    scrape_config_files:
+{{ toYaml $root.Values.scrapeConfigFiles | indent 4 }}
+{{- end }}
 {{- end }}
 {{- if eq $key "alerts" }}
 {{- if and (not (empty $value)) (empty $value.groups) }}

diff --git a/charts/prometheus/values.schema.json b/charts/prometheus/values.schema.json
@@ -644,6 +644,9 @@
                 }
             }
         },
+        "scrapeConfigFiles": {
+            "type": "array"
+        },
         "serverFiles": {
             "type": "object",
             "properties": {

diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml
@@ -682,6 +682,11 @@ server:
 ## Prometheus server ConfigMap entries for rule files (allow prometheus labels interpolation)
 ruleFiles: {}
 
+## Prometheus server ConfigMap entries for scrape_config_files
+## (allows scrape configs defined in additional files)
+##
+scrapeConfigFiles: []
+
 ## Prometheus server ConfigMap entries
 ##
 serverFiles: