Skip to content

Commit aedfa1c

Browse files
authored
Merge branch 'main' into ksm-user-ns
2 parents b216d1c + 85a0a0a commit aedfa1c

File tree

135 files changed

+16159
-10865
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+16159
-10865
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
/charts/prometheus-sql-exporter/ @wilfriedroset
4949
/charts/prometheus-stackdriver-exporter/ @rpahli
5050
/charts/prometheus-statsd-exporter/ @scDisorder
51-
/charts/prometheus-systemd-exporter/ @capuche2412 @maxime1907
51+
/charts/prometheus-systemd-exporter/ @maxime1907
5252
/charts/prometheus-to-sd/ @acondrat
5353
/charts/prometheus-windows-exporter/ @jkroepke
5454
/charts/prometheus-yet-another-cloudwatch-exporter/ @cristiangreco @thomaspeitz

.github/workflows/ci.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@ jobs:
2121
- name: Set up Helm
2222
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
2323
with:
24-
version: v3.12.0
24+
# renovate: github=helm/helm
25+
version: v3.19.0
2526

2627
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
2728
with:
2829
python-version: '3.13'
2930

3031
- name: Set up chart-testing
3132
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
33+
with:
34+
# renovate: github=helm/chart-testing
35+
version: v3.14.0
3236

3337
- name: Run chart-testing (list-changed)
3438
id: list-changed
@@ -107,7 +111,7 @@ jobs:
107111
fetch-depth: 0
108112

109113
- name: Lint Code Base
110-
uses: super-linter/super-linter/slim@ffde3b2b33b745cb612d787f669ef9442b1339a6 # v8.1.0
114+
uses: super-linter/super-linter/slim@2bdd90ed3262e023ac84bf8fe35dc480721fc1f2 # v8.2.1
111115
env:
112116
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
113117
LINTER_RULES_PATH: .github/linters

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
# see https://github.com/helm/chart-releaser/issues/183
4949
- name: Login to GitHub Container Registry
50-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
50+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
5151
with:
5252
registry: ghcr.io
5353
username: ${{ github.actor }}

MAINTAINERS.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@
217217

218218
### prometheus-systemd-exporter
219219

220-
- capuche2412 (<[email protected]> / @capuche2412)
221220
- maxime1907 (<[email protected]> / @maxime1907)
222221

223222
### prometheus-to-sd

charts/alertmanager/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/a
66
sources:
77
- https://github.com/prometheus/alertmanager
88
type: application
9-
version: 1.26.0
9+
version: 1.27.1
1010
# renovate: github-releases=prometheus/alertmanager
1111
appVersion: v0.28.1
1212
kubeVersion: ">=1.25.0-0"

charts/alertmanager/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ configmapReload:
346346
##
347347
image:
348348
repository: quay.io/prometheus-operator/prometheus-config-reloader
349-
tag: v0.85.0
349+
tag: v0.86.1
350350
pullPolicy: IfNotPresent
351351

352352
# containerPort: 9533

charts/kube-prometheus-stack/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ name: kube-prometheus-stack
3131
sources:
3232
- https://github.com/prometheus-community/helm-charts
3333
- https://github.com/prometheus-operator/kube-prometheus
34-
version: 77.10.0
34+
version: 79.0.0
3535
# renovate: github=prometheus-operator/prometheus-operator
36-
appVersion: v0.85.0
36+
appVersion: v0.86.1
3737
kubeVersion: ">=1.25.0-0"
3838
home: https://github.com/prometheus-operator/kube-prometheus
3939
keywords:
@@ -63,7 +63,7 @@ dependencies:
6363
repository: https://prometheus-community.github.io/helm-charts
6464
condition: nodeExporter.enabled
6565
- name: grafana
66-
version: "10.0.0"
66+
version: "10.1.2"
6767
repository: https://grafana.github.io/helm-charts
6868
condition: grafana.enabled
6969
- name: prometheus-windows-exporter

charts/kube-prometheus-stack/UPGRADE.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# Upgrade
22

3+
## From 78.x to 79.x
4+
5+
This version removes the default password for the grafana administrator, that in previous versions was set as `prom-operator`.
6+
For users that do not explicitly set an admin password, the value will now be generated randomly. Grafana offers detailed documentation on [how to read the default password](https://grafana.com/docs/grafana/latest/setup-grafana/installation/helm/#access-grafana) from the autogenerated kubernetes secret.
7+
8+
## From 77.x to 78.x
9+
10+
This version upgrades Prometheus-Operator to v0.86.0
11+
Since [68.4.0](https://github.com/prometheus-community/helm-charts/pull/5175) it is also possible to use `crds.upgradeJob.enabled` for upgrading the CRDs.
12+
For traditional upgrades, please run these commands to update the CRDs before applying the upgrade.
13+
14+
```console
15+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
16+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
17+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
18+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
19+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
20+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
21+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
22+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
23+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
24+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.86.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
25+
```
26+
327
## From 76.x to 77.x
428

529
This version upgrades Prometheus-Operator to v0.85.0

0 commit comments

Comments
 (0)