Skip to content

Commit

Permalink
Merge branch 'main' into feat/mongodb-multi-target
Browse files Browse the repository at this point in the history
Signed-off-by: Baptiste Roux <32563450+BapRx@users.noreply.github.com>
  • Loading branch information
BapRx authored Oct 17, 2024
2 parents 9428fb9 + f683f27 commit 0001b62
Show file tree
Hide file tree
Showing 82 changed files with 8,538 additions and 9,957 deletions.
8 changes: 4 additions & 4 deletions charts/kube-prometheus-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ name: kube-prometheus-stack
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
version: 64.0.0
appVersion: v0.76.1
version: 65.3.1
appVersion: v0.77.1
kubeVersion: ">=1.19.0-0"
home: https://github.com/prometheus-operator/kube-prometheus
keywords:
Expand All @@ -45,7 +45,7 @@ dependencies:
version: "0.0.0"
condition: crds.enabled
- name: kube-state-metrics
version: "5.25.*"
version: "5.26.*"
repository: https://prometheus-community.github.io/helm-charts
condition: kubeStateMetrics.enabled
- name: prometheus-node-exporter
Expand All @@ -58,5 +58,5 @@ dependencies:
condition: grafana.enabled
- name: prometheus-windows-exporter
repository: https://prometheus-community.github.io/helm-charts
version: "0.6.*"
version: "0.7.*"
condition: windowsMonitoring.enabled
19 changes: 19 additions & 0 deletions charts/kube-prometheus-stack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,25 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen

A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.

### From 64.x to 65.x

This version upgrades Prometheus-Operator to v0.77.1

Run these commands to update the CRDs before applying the upgrade.

```console
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
```

### From 63.x to 64.x

v64 reverts the v63 release.
Expand Down
1,424 changes: 703 additions & 721 deletions charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml

Large diffs are not rendered by default.

429 changes: 202 additions & 227 deletions charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml

Large diffs are not rendered by default.

109 changes: 8 additions & 101 deletions charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml

Large diffs are not rendered by default.

90 changes: 7 additions & 83 deletions charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml

Large diffs are not rendered by default.

574 changes: 188 additions & 386 deletions charts/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml

Large diffs are not rendered by default.

758 changes: 186 additions & 572 deletions charts/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.76.1
controller-gen.kubebuilder.io/version: v0.16.1
operator.prometheus.io/version: 0.77.1
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand All @@ -26,7 +26,6 @@ spec:
description: |-
The `PrometheusRule` custom resource definition (CRD) defines [alerting](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) and [recording](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) rules to be evaluated by `Prometheus` or `ThanosRuler` objects.
`Prometheus` and `ThanosRuler` objects select `PrometheusRule` objects using label and namespace selectors.
properties:
apiVersion:
Expand Down
5,135 changes: 2,584 additions & 2,551 deletions charts/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml

Large diffs are not rendered by default.

109 changes: 8 additions & 101 deletions charts/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml

Large diffs are not rendered by default.

Loading

0 comments on commit 0001b62

Please sign in to comment.