|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/Chart.yaml packages/rancher-monitoring/charts/Chart.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/Chart.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/Chart.yaml
|
|
|
|
|
@@ -1,7 +1,11 @@
|
|
|
|
|
@@ -1,22 +1,26 @@
|
|
|
|
|
apiVersion: v1
|
|
|
|
|
appVersion: 0.38.1
|
|
|
|
|
-description: Provides easy monitoring definitions for Kubernetes services, and deployment
|
|
|
|
@ -15,19 +15,108 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/Cha
|
|
|
|
|
engine: gotpl
|
|
|
|
|
home: https://github.com/coreos/prometheus-operator
|
|
|
|
|
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
|
|
|
|
|
@@ -13,7 +17,7 @@
|
|
|
|
|
- name: bismarck
|
|
|
|
|
- email: gianrubio@gmail.com
|
|
|
|
|
name: gianrubio
|
|
|
|
|
keywords:
|
|
|
|
|
-- operator
|
|
|
|
|
-- prometheus
|
|
|
|
|
+ - operator
|
|
|
|
|
+ - prometheus
|
|
|
|
|
maintainers:
|
|
|
|
|
-- name: vsliouniaev
|
|
|
|
|
-- name: bismarck
|
|
|
|
|
-- email: gianrubio@gmail.com
|
|
|
|
|
- name: gianrubio
|
|
|
|
|
-name: prometheus-operator
|
|
|
|
|
+ - name: vsliouniaev
|
|
|
|
|
+ - name: bismarck
|
|
|
|
|
+ - email: gianrubio@gmail.com
|
|
|
|
|
+ name: gianrubio
|
|
|
|
|
+name: rancher-monitoring
|
|
|
|
|
sources:
|
|
|
|
|
- https://github.com/coreos/kube-prometheus
|
|
|
|
|
- https://github.com/coreos/prometheus-operator
|
|
|
|
|
-- https://github.com/coreos/kube-prometheus
|
|
|
|
|
-- https://github.com/coreos/prometheus-operator
|
|
|
|
|
-- https://coreos.com/operators/prometheus
|
|
|
|
|
+ - https://github.com/coreos/kube-prometheus
|
|
|
|
|
+ - https://github.com/coreos/prometheus-operator
|
|
|
|
|
+ - https://coreos.com/operators/prometheus
|
|
|
|
|
tillerVersion: '>=2.12.0'
|
|
|
|
|
version: 8.16.1
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/README.md packages/rancher-monitoring/charts/README.md
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/README.md
|
|
|
|
|
+++ packages/rancher-monitoring/charts/README.md
|
|
|
|
|
@@ -291,6 +291,7 @@
|
|
|
|
|
@@ -33,7 +33,7 @@
|
|
|
|
|
|
|
|
|
|
## Prerequisites
|
|
|
|
|
- Kubernetes 1.10+ with Beta APIs
|
|
|
|
|
- - Helm 2.12+ (If using Helm < 2.14, [see below for CRD workaround](#Helm-fails-to-create-CRDs))
|
|
|
|
|
+ - Helm 2.12+
|
|
|
|
|
|
|
|
|
|
## Installing the Chart
|
|
|
|
|
|
|
|
|
|
@@ -57,17 +57,6 @@
|
|
|
|
|
|
|
|
|
|
The command removes all the Kubernetes components associated with the chart and deletes the release.
|
|
|
|
|
|
|
|
|
|
-CRDs created by this chart are not removed by default and should be manually cleaned up:
|
|
|
|
|
-
|
|
|
|
|
-```console
|
|
|
|
|
-kubectl delete crd prometheuses.monitoring.coreos.com
|
|
|
|
|
-kubectl delete crd prometheusrules.monitoring.coreos.com
|
|
|
|
|
-kubectl delete crd servicemonitors.monitoring.coreos.com
|
|
|
|
|
-kubectl delete crd podmonitors.monitoring.coreos.com
|
|
|
|
|
-kubectl delete crd alertmanagers.monitoring.coreos.com
|
|
|
|
|
-kubectl delete crd thanosrulers.monitoring.coreos.com
|
|
|
|
|
-```
|
|
|
|
|
-
|
|
|
|
|
## Work-Arounds for Known Issues
|
|
|
|
|
|
|
|
|
|
### Running on private GKE clusters
|
|
|
|
|
@@ -77,27 +66,6 @@
|
|
|
|
|
|
|
|
|
|
Alternatively, you can disable the hooks by setting `prometheusOperator.admissionWebhooks.enabled=false`.
|
|
|
|
|
|
|
|
|
|
-### Helm fails to create CRDs
|
|
|
|
|
-You should upgrade to Helm 2.14 + in order to avoid this issue. However, if you are stuck with an earlier Helm release you should instead use the following approach: Due to a bug in helm, it is possible for the 5 CRDs that are created by this chart to fail to get fully deployed before Helm attempts to create resources that require them. This affects all versions of Helm with a [potential fix pending](https://github.com/helm/helm/pull/5112). In order to work around this issue when installing the chart you will need to make sure all 5 CRDs exist in the cluster first and disable their previsioning by the chart:
|
|
|
|
|
-
|
|
|
|
|
-1. Create CRDs
|
|
|
|
|
-```console
|
|
|
|
|
-kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
|
|
|
|
|
-kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
|
|
|
|
|
-kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
|
|
|
|
|
-kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
|
|
|
|
|
-kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
|
|
|
|
|
-kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
|
|
|
|
|
-
|
|
|
|
|
-```
|
|
|
|
|
-
|
|
|
|
|
-2. Wait for CRDs to be created, which should only take a few seconds
|
|
|
|
|
-
|
|
|
|
|
-3. Install the chart, but disable the CRD provisioning by setting `prometheusOperator.createCustomResource=false`
|
|
|
|
|
-```console
|
|
|
|
|
-$ helm install --name my-release stable/prometheus-operator --set prometheusOperator.createCustomResource=false
|
|
|
|
|
-```
|
|
|
|
|
-
|
|
|
|
|
## Upgrading an existing Release to a new major version
|
|
|
|
|
|
|
|
|
|
A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
|
|
|
|
|
@@ -195,16 +163,14 @@
|
|
|
|
|
| `prometheusOperator.admissionWebhooks.patch.podAnnotations` | Annotations for the webhook job pods | `nil` |
|
|
|
|
|
| `prometheusOperator.admissionWebhooks.patch.priorityClassName` | Priority class for the webhook integration jobs | `nil` |
|
|
|
|
|
| `prometheusOperator.affinity` | Assign custom affinity rules to the prometheus operator https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` |
|
|
|
|
|
-| `prometheusOperator.cleanupCustomResource` | Attempt to delete CRDs when the release is removed. This option may be useful while testing but is not recommended, as deleting the CRD definition will delete resources and prevent the operator from being able to clean up resources that it manages | `false` |
|
|
|
|
|
| `prometheusOperator.configReloaderCpu` | Set the prometheus config reloader side-car CPU limit. If unset, uses the prometheus-operator project default | `nil` |
|
|
|
|
|
| `prometheusOperator.configReloaderMemory` | Set the prometheus config reloader side-car memory limit. If unset, uses the prometheus-operator project default | `nil` |
|
|
|
|
|
| `prometheusOperator.configmapReloadImage.repository` | Repository for configmapReload image | `docker.io/jimmidyson/configmap-reload` |
|
|
|
|
|
| `prometheusOperator.configmapReloadImage.tag` | Tag for configmapReload image | `v0.3.0` |
|
|
|
|
|
-| `prometheusOperator.createCustomResource` | Create CRDs. Required if deploying anything besides the operator itself as part of the release. The operator will create / update these on startup. If your Helm version < 2.10 you will have to either create the CRDs first or deploy the operator first, then the rest of the resources. Regardless of value of this, Helm v3+ will install the CRDs if those are not present already. Use `--skip-crds` with `helm install` if you want to skip CRD creation | `true` |
|
|
|
|
|
| `prometheusOperator.namespaces` | Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with `denyNamespaces`. Setting this to an empty object will disable the configuration | `{}` |
|
|
|
|
|
| `prometheusOperator.namespaces.releaseNamespace` | Include the release namespace | `false` |
|
|
|
|
|
| `prometheusOperator.namespaces.additional` | Include additional namespaces besides the release namespace | `[]` |
|
|
|
|
|
-| `prometheusOperator.manageCrds` |If true prometheus operator will create and update its CRDs on startup (for operator `<v0.39.0`)) | `true` |
|
|
|
|
|
+| `prometheusOperator.manageCrds` |If true prometheus operator will create and update its CRs on startup (for operator `<v0.39.0`)) | `true` |
|
|
|
|
|
| `prometheusOperator.denyNamespaces` | Namespaces not to scope the interaction of the Prometheus Operator (deny list). This is mutually exclusive with `namespaces` | `[]` |
|
|
|
|
|
| `prometheusOperator.enabled` | Deploy Prometheus Operator. Only one of these should be deployed into the cluster | `true` |
|
|
|
|
|
| `prometheusOperator.hyperkubeImage.pullPolicy` | Image pull policy for hyperkube image used to perform maintenance tasks | `IfNotPresent` |
|
|
|
|
|
@@ -291,6 +257,7 @@
|
|
|
|
|
| `prometheus.prometheusSpec.evaluationInterval` | Interval between consecutive evaluations. | `""` |
|
|
|
|
|
| `prometheus.prometheusSpec.externalLabels` | The labels to add to any time series or alerts when communicating with external systems (federation, remote storage, Alertmanager). | `{}` |
|
|
|
|
|
| `prometheus.prometheusSpec.externalUrl` | The external URL the Prometheus instances will be available under. This is necessary to generate correct URLs. This is necessary if Prometheus is not served from root of a DNS name. | `""` |
|
|
|
|
@ -35,7 +124,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/REA
|
|
|
|
|
| `prometheus.prometheusSpec.image.repository` | Base image to use for a Prometheus deployment. | `quay.io/prometheus/prometheus` |
|
|
|
|
|
| `prometheus.prometheusSpec.image.tag` | Tag of Prometheus container image to be deployed. | `v2.18.1` |
|
|
|
|
|
| `prometheus.prometheusSpec.listenLocal` | ListenLocal makes the Prometheus server listen on loopback, so that it does not bind against the Pod IP. | `false` |
|
|
|
|
|
@@ -465,17 +466,23 @@
|
|
|
|
|
@@ -465,17 +432,23 @@
|
|
|
|
|
| `grafana.namespaceOverride` | Override the deployment namespace of grafana | `""` (`Release.Namespace`) |
|
|
|
|
|
| `grafana.rbac.pspUseAppArmor` | Enforce AppArmor in created PodSecurityPolicy (requires rbac.pspEnabled) | `true` |
|
|
|
|
|
| `grafana.service.portName` | Allow to customize Grafana service portname. Will be used by servicemonitor as well | `service` |
|
|
|
|
@ -59,6 +148,81 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/REA
|
|
|
|
|
|
|
|
|
|
### Exporters
|
|
|
|
|
| Parameter | Description | Default |
|
|
|
|
|
@@ -649,7 +622,7 @@
|
|
|
|
|
The Grafana chart is more feature-rich than this chart - it contains a sidecar that is able to load data sources and dashboards from configmaps deployed into the same cluster. For more information check out the [documentation for the chart](https://github.com/helm/charts/tree/master/stable/grafana)
|
|
|
|
|
|
|
|
|
|
### Coreos CRDs
|
|
|
|
|
-The CRDs are provisioned using crd-install hooks, rather than relying on a separate chart installation. If you already have these CRDs provisioned and don't want to remove them, you can disable the CRD creation by these hooks by passing `prometheusOperator.createCustomResource=false` (not required if using Helm v3).
|
|
|
|
|
+The CRDs are provisioned using a separate chart installation within the Helm chart `rancher-monitoring-crd` that is packaged alongside this chart.
|
|
|
|
|
|
|
|
|
|
### Kubelet Service
|
|
|
|
|
Because the kubelet service has a new name in the chart, make sure to clean up the old kubelet service in the `kube-system` namespace to prevent counting container metrics twice.
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/crds/crd-alertmanager.yaml packages/rancher-monitoring/charts/crds/crd-alertmanager.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/crds/crd-alertmanager.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/crds/crd-alertmanager.yaml
|
|
|
|
|
@@ -4,7 +4,6 @@
|
|
|
|
|
metadata:
|
|
|
|
|
annotations:
|
|
|
|
|
controller-gen.kubebuilder.io/version: v0.2.4
|
|
|
|
|
- helm.sh/hook: crd-install
|
|
|
|
|
creationTimestamp: null
|
|
|
|
|
name: alertmanagers.monitoring.coreos.com
|
|
|
|
|
spec:
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/crds/crd-podmonitor.yaml packages/rancher-monitoring/charts/crds/crd-podmonitor.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/crds/crd-podmonitor.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/crds/crd-podmonitor.yaml
|
|
|
|
|
@@ -4,7 +4,6 @@
|
|
|
|
|
metadata:
|
|
|
|
|
annotations:
|
|
|
|
|
controller-gen.kubebuilder.io/version: v0.2.4
|
|
|
|
|
- helm.sh/hook: crd-install
|
|
|
|
|
creationTimestamp: null
|
|
|
|
|
name: podmonitors.monitoring.coreos.com
|
|
|
|
|
spec:
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/crds/crd-prometheus.yaml packages/rancher-monitoring/charts/crds/crd-prometheus.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/crds/crd-prometheus.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/crds/crd-prometheus.yaml
|
|
|
|
|
@@ -4,7 +4,6 @@
|
|
|
|
|
metadata:
|
|
|
|
|
annotations:
|
|
|
|
|
controller-gen.kubebuilder.io/version: v0.2.4
|
|
|
|
|
- helm.sh/hook: crd-install
|
|
|
|
|
creationTimestamp: null
|
|
|
|
|
name: prometheuses.monitoring.coreos.com
|
|
|
|
|
spec:
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/crds/crd-prometheusrules.yaml packages/rancher-monitoring/charts/crds/crd-prometheusrules.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/crds/crd-prometheusrules.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/crds/crd-prometheusrules.yaml
|
|
|
|
|
@@ -4,7 +4,6 @@
|
|
|
|
|
metadata:
|
|
|
|
|
annotations:
|
|
|
|
|
controller-gen.kubebuilder.io/version: v0.2.4
|
|
|
|
|
- helm.sh/hook: crd-install
|
|
|
|
|
creationTimestamp: null
|
|
|
|
|
name: prometheusrules.monitoring.coreos.com
|
|
|
|
|
spec:
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/crds/crd-servicemonitor.yaml packages/rancher-monitoring/charts/crds/crd-servicemonitor.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/crds/crd-servicemonitor.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/crds/crd-servicemonitor.yaml
|
|
|
|
|
@@ -4,7 +4,6 @@
|
|
|
|
|
metadata:
|
|
|
|
|
annotations:
|
|
|
|
|
controller-gen.kubebuilder.io/version: v0.2.4
|
|
|
|
|
- helm.sh/hook: crd-install
|
|
|
|
|
creationTimestamp: null
|
|
|
|
|
name: servicemonitors.monitoring.coreos.com
|
|
|
|
|
spec:
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/crds/crd-thanosrulers.yaml packages/rancher-monitoring/charts/crds/crd-thanosrulers.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/crds/crd-thanosrulers.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/crds/crd-thanosrulers.yaml
|
|
|
|
|
@@ -4,7 +4,6 @@
|
|
|
|
|
metadata:
|
|
|
|
|
annotations:
|
|
|
|
|
controller-gen.kubebuilder.io/version: v0.2.4
|
|
|
|
|
- helm.sh/hook: crd-install
|
|
|
|
|
creationTimestamp: null
|
|
|
|
|
name: thanosrulers.monitoring.coreos.com
|
|
|
|
|
spec:
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/requirements.yaml packages/rancher-monitoring/charts/requirements.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/requirements.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/requirements.yaml
|
|
|
|
@ -917,6 +1081,77 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/tem
|
|
|
|
|
+{{- end }}
|
|
|
|
|
{{- end }}
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/prometheus-operator/cleanup-crds.yaml packages/rancher-monitoring/charts/templates/prometheus-operator/cleanup-crds.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/templates/prometheus-operator/cleanup-crds.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/templates/prometheus-operator/cleanup-crds.yaml
|
|
|
|
|
@@ -1,45 +0,0 @@
|
|
|
|
|
-{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.cleanupCustomResource }}
|
|
|
|
|
-apiVersion: batch/v1
|
|
|
|
|
-kind: Job
|
|
|
|
|
-metadata:
|
|
|
|
|
- name: {{ template "prometheus-operator.fullname" . }}-operator-cleanup
|
|
|
|
|
- namespace: {{ template "prometheus-operator.namespace" . }}
|
|
|
|
|
- annotations:
|
|
|
|
|
- "helm.sh/hook": pre-delete
|
|
|
|
|
- "helm.sh/hook-weight": "3"
|
|
|
|
|
- "helm.sh/hook-delete-policy": hook-succeeded
|
|
|
|
|
- labels:
|
|
|
|
|
- app: {{ template "prometheus-operator.name" . }}-operator
|
|
|
|
|
-{{ include "prometheus-operator.labels" . | indent 4 }}
|
|
|
|
|
-spec:
|
|
|
|
|
- template:
|
|
|
|
|
- metadata:
|
|
|
|
|
- name: {{ template "prometheus-operator.fullname" . }}-operator-cleanup
|
|
|
|
|
- labels:
|
|
|
|
|
- app: {{ template "prometheus-operator.name" . }}-operator
|
|
|
|
|
-{{ include "prometheus-operator.labels" . | indent 8 }}
|
|
|
|
|
- spec:
|
|
|
|
|
- {{- if .Values.global.rbac.create }}
|
|
|
|
|
- serviceAccountName: {{ template "prometheus-operator.operator.serviceAccountName" . }}
|
|
|
|
|
- {{- end }}
|
|
|
|
|
- containers:
|
|
|
|
|
- - name: kubectl
|
|
|
|
|
- image: "{{ .Values.prometheusOperator.hyperkubeImage.repository }}:{{ .Values.prometheusOperator.hyperkubeImage.tag }}"
|
|
|
|
|
- imagePullPolicy: "{{ .Values.prometheusOperator.hyperkubeImage.pullPolicy }}"
|
|
|
|
|
- command:
|
|
|
|
|
- - /bin/sh
|
|
|
|
|
- - -c
|
|
|
|
|
- - >
|
|
|
|
|
- kubectl delete alertmanager --all;
|
|
|
|
|
- kubectl delete prometheus --all;
|
|
|
|
|
- kubectl delete prometheusrule --all;
|
|
|
|
|
- kubectl delete servicemonitor --all;
|
|
|
|
|
- sleep 10;
|
|
|
|
|
- kubectl delete crd alertmanagers.monitoring.coreos.com;
|
|
|
|
|
- kubectl delete crd prometheuses.monitoring.coreos.com;
|
|
|
|
|
- kubectl delete crd prometheusrules.monitoring.coreos.com;
|
|
|
|
|
- kubectl delete crd servicemonitors.monitoring.coreos.com;
|
|
|
|
|
- kubectl delete crd podmonitors.monitoring.coreos.com;
|
|
|
|
|
- kubectl delete crd thanosrulers.monitoring.coreos.com;
|
|
|
|
|
- restartPolicy: OnFailure
|
|
|
|
|
-{{- end }}
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/prometheus-operator/clusterrole.yaml packages/rancher-monitoring/charts/templates/prometheus-operator/clusterrole.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/templates/prometheus-operator/clusterrole.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/templates/prometheus-operator/clusterrole.yaml
|
|
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
|
app: {{ template "prometheus-operator.name" . }}-operator
|
|
|
|
|
{{ include "prometheus-operator.labels" . | indent 4 }}
|
|
|
|
|
rules:
|
|
|
|
|
-{{- if or .Values.prometheusOperator.manageCrds .Values.prometheusOperator.cleanupCustomResource }}
|
|
|
|
|
+{{- if .Values.prometheusOperator.manageCrds }}
|
|
|
|
|
- apiGroups:
|
|
|
|
|
- apiextensions.k8s.io
|
|
|
|
|
resources:
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/prometheus-operator/crds.yaml packages/rancher-monitoring/charts/templates/prometheus-operator/crds.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/templates/prometheus-operator/crds.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/templates/prometheus-operator/crds.yaml
|
|
|
|
|
@@ -1,6 +0,0 @@
|
|
|
|
|
-{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.createCustomResource -}}
|
|
|
|
|
-{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
|
|
|
|
|
-{{ $.Files.Get $path }}
|
|
|
|
|
----
|
|
|
|
|
-{{- end }}
|
|
|
|
|
-{{- end }}
|
|
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/templates/rancher-monitoring/grafana-configmap-roles.yaml packages/rancher-monitoring/charts/templates/rancher-monitoring/grafana-configmap-roles.yaml
|
|
|
|
|
--- packages/rancher-monitoring/charts-original/templates/rancher-monitoring/grafana-configmap-roles.yaml
|
|
|
|
|
+++ packages/rancher-monitoring/charts/templates/rancher-monitoring/grafana-configmap-roles.yaml
|
|
|
|
@ -1353,7 +1588,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
|
|
|
|
|
|
|
|
|
|
## Deploy node exporter as a daemonset to all nodes
|
|
|
|
|
##
|
|
|
|
|
@@ -1124,6 +1331,16 @@
|
|
|
|
|
@@ -1124,13 +1331,23 @@
|
|
|
|
|
extraArgs:
|
|
|
|
|
- --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/)
|
|
|
|
|
- --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$
|
|
|
|
@ -1370,7 +1605,30 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
|
|
|
|
|
|
|
|
|
|
## Manages Prometheus and Alertmanager components
|
|
|
|
|
##
|
|
|
|
|
@@ -1280,13 +1497,13 @@
|
|
|
|
|
prometheusOperator:
|
|
|
|
|
enabled: true
|
|
|
|
|
|
|
|
|
|
- # If true prometheus operator will create and update its CRDs on startup
|
|
|
|
|
+ # If true prometheus operator will create and update its CRs on startup
|
|
|
|
|
# Only for prometheusOperator.image.tag < v0.39.0
|
|
|
|
|
manageCrds: true
|
|
|
|
|
|
|
|
|
|
@@ -1220,14 +1437,6 @@
|
|
|
|
|
##
|
|
|
|
|
externalIPs: []
|
|
|
|
|
|
|
|
|
|
- ## Deploy CRDs used by Prometheus Operator.
|
|
|
|
|
- ##
|
|
|
|
|
- createCustomResource: true
|
|
|
|
|
-
|
|
|
|
|
- ## Attempt to clean up CRDs created by Prometheus Operator.
|
|
|
|
|
- ##
|
|
|
|
|
- cleanupCustomResource: false
|
|
|
|
|
-
|
|
|
|
|
## Labels to add to the operator pod
|
|
|
|
|
##
|
|
|
|
|
podLabels: {}
|
|
|
|
|
@@ -1280,13 +1489,13 @@
|
|
|
|
|
|
|
|
|
|
## Resource limits & requests
|
|
|
|
|
##
|
|
|
|
@ -1391,7 +1649,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
|
|
|
|
|
|
|
|
|
|
# Required for use in managed kubernetes clusters (such as AWS EKS) with custom CNI (such as calico),
|
|
|
|
|
# because control-plane managed by AWS cannot communicate with pods' IP CIDR and admission webhooks are not working
|
|
|
|
|
@@ -1628,6 +1845,11 @@
|
|
|
|
|
@@ -1628,6 +1837,11 @@
|
|
|
|
|
##
|
|
|
|
|
externalUrl: ""
|
|
|
|
|
|
|
|
|
@ -1403,7 +1661,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
|
|
|
|
|
## Define which Nodes the Pods are scheduled on.
|
|
|
|
|
## ref: https://kubernetes.io/docs/user-guide/node-selection/
|
|
|
|
|
##
|
|
|
|
|
@@ -1802,9 +2024,13 @@
|
|
|
|
|
@@ -1802,9 +2016,13 @@
|
|
|
|
|
|
|
|
|
|
## Resource limits & requests
|
|
|
|
|
##
|
|
|
|
|