diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 7042a5753c..6052cb191d 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -11,7 +11,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 6.3.1 +version: 6.4.0 appVersion: 0.31.1 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index 604add3418..66a76f8e8c 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -128,9 +128,11 @@ The following tables list the configurable parameters of the prometheus-operator | `defaultRules.rules.kubernetesResources` | Create Kubernetes Resources default rules| `true` | | `defaultRules.rules.kubernetesStorage` | Create Kubernetes Storage default rules| `true` | | `defaultRules.rules.kubernetesSystem` | Create Kubernetes System default rules| `true` | -| `defaultRules.rules.node` | Create Node default rules| `true` | +| `defaultRules.rules.node` | Create Node default rules | `true` | +| `defaultRules.rules.network` | Create networking default rules | `true` | | `defaultRules.rules.PrometheusOperator` | Create Prometheus Operator default rules| `true` | | `defaultRules.rules.prometheus` | Create Prometheus default rules| `true` | +| `defaultRules.rules.time` | Create time default rules | `true` | | `defaultRules.labels` | Labels for default rules for monitoring the cluster | `{}` | | `defaultRules.annotations` | Annotations for default rules for monitoring the cluster | `{}` | | `additionalPrometheusRules` | *DEPRECATED* Will be removed in a future release. Please use **additionalPrometheusRulesMap** instead. List of `prometheusRule` objects to create. See https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusrulespec. | `[]` | diff --git a/stable/prometheus-operator/ci/test-values.yaml b/stable/prometheus-operator/ci/test-values.yaml index 94ca4afcf1..120b0ef4ef 100644 --- a/stable/prometheus-operator/ci/test-values.yaml +++ b/stable/prometheus-operator/ci/test-values.yaml @@ -28,15 +28,18 @@ defaultRules: kubeApiserver: true kubePrometheusNodeAlerting: true kubePrometheusNodeRecording: true - kubeScheduler: true kubernetesAbsent: true kubernetesApps: true kubernetesResources: true kubernetesStorage: true kubernetesSystem: true + kubeScheduler: true + network: true node: true - prometheusOperator: true prometheus: true + prometheusOperator: true + time: true + ## Labels for default rules labels: {} ## Annotations for default rules diff --git a/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml b/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml index 79a704f773..a725ddb901 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml @@ -1,7 +1,7 @@ # Generated from 'node-network' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # Do not change in-place! In order to change this file first read following link: # https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack -{{- if and .Values.defaultRules.create }} +{{- if and .Values.defaultRules.create .Values.defaultRules.rules.network }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: @@ -41,4 +41,4 @@ spec: for: 2m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml b/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml index 78cad3e758..19e98de3ce 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml @@ -1,7 +1,7 @@ # Generated from 'node-time' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # Do not change in-place! In order to change this file first read following link: # https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack -{{- if and .Values.defaultRules.create }} +{{- if and .Values.defaultRules.create .Values.defaultRules.rules.time }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: @@ -27,4 +27,4 @@ spec: for: 2m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index 6290a8084c..2b93f7a47a 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -28,15 +28,18 @@ defaultRules: kubeApiserver: true kubePrometheusNodeAlerting: true kubePrometheusNodeRecording: true - kubeScheduler: true kubernetesAbsent: true kubernetesApps: true kubernetesResources: true kubernetesStorage: true kubernetesSystem: true + kubeScheduler: true + network: true node: true - prometheusOperator: true prometheus: true + prometheusOperator: true + time: true + ## Labels for default rules labels: {} ## Annotations for default rules