Merge branch 'main' into add_var_for_hardcoded_port

prometheus-community · Mar 5, 2024 · b546421 · b546421
2 parents e56a90b + b195c68
commit b546421
Show file tree

Hide file tree

Showing 7 changed files with 1,602 additions and 6 deletions.
diff --git a/charts/kube-prometheus-stack/.editorconfig b/charts/kube-prometheus-stack/.editorconfig
@@ -0,0 +1,5 @@
+root = true
+
+[files/dashboards/*.json]
+indent_size = 2
+indent_style = space
diff --git a/charts/kube-prometheus-stack/.gitignore b/charts/kube-prometheus-stack/.gitignore
@@ -8,4 +8,5 @@ charts/*
 Chart.lock
 hack/*.git
 hack/tmp/
+hack/venv/
 hack/pyvenv.cfg
diff --git a/charts/kube-prometheus-stack/.helmignore b/charts/kube-prometheus-stack/.helmignore
@@ -26,3 +26,4 @@ ci/
 kube-prometheus-*.tgz
 
 unittests/
+files/dashboards/
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -23,7 +23,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 56.21.0
+version: 56.21.1
 appVersion: v0.71.2
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ ci/
		kube-prometheus-*.tgz

		unittests/
		files/dashboards/