easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1699 from prometheus-operator/automated-updates-main

Browse Source 
[bot] [main] Automated version update
This commit is contained in:
Simon Pasquier
2022-03-28 11:01:44 +02:00
committed by GitHub
parent 64b19b69d5 c30d8c1ef6
commit d6083dcb2d
26 changed files with 249 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsonnet/kube-prometheus/versions.json
View File

@@ -1,12 +1,12 @@
{
"alertmanager": "0.23.0",
"alertmanager": "0.24.0",
"blackboxExporter": "0.20.0",
"grafana": "8.4.4",
"kubeStateMetrics": "2.4.2",
"nodeExporter": "1.3.1",
"prometheus": "2.34.0",
"prometheusAdapter": "0.9.1",
"prometheusOperator": "0.55.0",
"prometheusOperator": "0.55.1",
"kubeRbacProxy": "0.11.0",
"configmapReload": "0.5.0"
}

28
jsonnetfile.lock.json
View File

@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
"version": "4787e71921f16af641c34e1f1c7a4dd94d6d8b0e",
"version": "be2929568f81080b20ef6812992f2e09c8dac91b",
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
},
{
@@ -28,7 +28,7 @@
"subdir": "grafana-mixin"
}
},
"version": "bb8304c83896fe2fab58e29399a5d3f3aa171c19",
"version": "8c622c1ef626a6982e0a6353877dd02313988010",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
@@ -58,8 +58,8 @@
"subdir": ""
}
},
"version": "0f0f3dc472ff2a8cdc6a6c6f938a2c450cb493ec",
"sum": "fMsMbtYIlyPhV5lr9KluAJmiJJEjnPirh1FveQzyDaA="
"version": "a2196d1b3493c15117550df2fd35dbdf54e4fa0e",
"sum": "QW/hop00uVdVHZ0ay2Ceogrra7qfBCvGqtuyYaoxHXY="
},
{
"source": {
@@ -68,7 +68,7 @@
"subdir": "lib/promgrafonnet"
}
},
"version": "0f0f3dc472ff2a8cdc6a6c6f938a2c450cb493ec",
"version": "a2196d1b3493c15117550df2fd35dbdf54e4fa0e",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -98,8 +98,8 @@
"subdir": "jsonnet/mixin"
}
},
"version": "f49dc4bb80e33f0044df4915ab4e844feb30c02e",
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
"version": "90e243ea91e4f332d517b0a2c190df9d5c3026a9",
"sum": "joc3gM74r0q658bmpfTbeAr0Nce4gTBv0rf3I+2J0rQ=",
"name": "prometheus-operator-mixin"
},
{
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "f49dc4bb80e33f0044df4915ab4e844feb30c02e",
"sum": "qgFgLS7/YpM5KNHoq/8eSDPg4vrCts9lI6ImGWORlEg="
"version": "90e243ea91e4f332d517b0a2c190df9d5c3026a9",
"sum": "SmdmXrgVBxc68tkc827FD2ozO4JRwvJCEVYLgKTYWwk="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "dd63d04a579fe8540a0c1eda4a75bbb134f50672",
"version": "a6d10bd5bc3f651e0ca04d47b981ed66e85a09a6",
"sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=",
"name": "alertmanager"
},
@@ -130,7 +130,7 @@
"subdir": "docs/node-mixin"
}
},
"version": "4917e1a451b07624511c83579855f98124ff1a84",
"version": "9aae303a46c3153b75e4d32b0936b40e4ee0beeb",
"sum": "/SFdKggqBEmznyeGfpyEZl4rC69mMtLGEB9lG1mQhVA="
},
{
@@ -140,8 +140,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "c901ebaf8dd1273de415f8a32617d708c4256683",
"sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=",
"version": "c7be45d957dd90e605738d8b74482e7579da0db0",
"sum": "7mS7v4Tt0wypJhUrjbHNbSe5maAToU5qHFD8LsLs+jM=",
"name": "prometheus"
},
{
@@ -151,7 +151,7 @@
"subdir": "mixin"
}
},
"version": "149e0264e181ac1899a0409a7d50d78c245c18b7",
"version": "f0e673a2e4860d8cffafba4c97955171e5c6cb2b",
"sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE=",
"name": "thanos-mixin"
},

8
manifests/alertmanager-alertmanager.yaml
View File

@@ -6,11 +6,11 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
name: main
namespace: monitoring
spec:
image: quay.io/prometheus/alertmanager:v0.23.0
image: quay.io/prometheus/alertmanager:v0.24.0
nodeSelector:
kubernetes.io/os: linux
podMetadata:
@@ -19,7 +19,7 @@ spec:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
replicas: 3
resources:
limits:
@@ -33,4 +33,4 @@ spec:
runAsNonRoot: true
runAsUser: 1000
serviceAccountName: alertmanager-main
version: 0.23.0
version: 0.24.0

2
manifests/alertmanager-podDisruptionBudget.yaml
View File

@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
name: alertmanager-main
namespace: monitoring
spec:

2
manifests/alertmanager-prometheusRule.yaml
View File

@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
prometheus: k8s
role: alert-rules
name: alertmanager-main-rules

2
manifests/alertmanager-secret.yaml
View File

@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
name: alertmanager-main
namespace: monitoring
stringData:

2
manifests/alertmanager-service.yaml
View File

@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
name: alertmanager-main
namespace: monitoring
spec:

2
manifests/alertmanager-serviceAccount.yaml
View File

@@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
name: alertmanager-main
namespace: monitoring

2
manifests/alertmanager-serviceMonitor.yaml
View File

@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
name: alertmanager-main
namespace: monitoring
spec:

2
manifests/kubernetesControlPlane-prometheusRule.yaml
View File

@@ -651,7 +651,7 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubeletpodstartuplatencyhigh
summary: Kubelet Pod startup latency is too high.
expr: |
histogram_quantile(0.99, sum(rate(kubelet_pod_worker_duration_seconds_bucket{job="kubelet", metrics_path="/metrics"}[5m])) by (instance, le)) * on(instance) group_left(node) kubelet_node_name{job="kubelet", metrics_path="/metrics"} > 60
histogram_quantile(0.99, sum(rate(kubelet_pod_worker_duration_seconds_bucket{job="kubelet", metrics_path="/metrics"}[5m])) by (cluster, instance, le)) * on(cluster, instance) group_left(node) kubelet_node_name{job="kubelet", metrics_path="/metrics"} > 60
for: 15m
labels:
severity: warning

12
manifests/prometheus-prometheusRule.yaml
View File

@@ -251,6 +251,18 @@ spec:
for: 15m
labels:
severity: warning
- alert: PrometheusScrapeBodySizeLimitHit
annotations:
description: Prometheus {{$labels.namespace}}/{{$labels.pod}} has dropped
{{ printf "%.0f" $value }} targets because some targets exceeded the configured
body_size_limit.
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/prometheus/prometheusscrapebodysizelimithit
summary: Prometheus has dropped some targets that exceeded body size limit.
expr: |
increase(prometheus_target_scrapes_exceeded_body_size_limit_total{job="prometheus-k8s",namespace="monitoring"}[5m]) > 0
for: 15m
labels:
severity: warning
- alert: PrometheusTargetSyncFailure
annotations:
description: '{{ printf "%.0f" $value }} targets in Prometheus {{$labels.namespace}}/{{$labels.pod}}

2
manifests/prometheusOperator-clusterRole.yaml
View File

@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.55.0
app.kubernetes.io/version: 0.55.1
name: prometheus-operator
rules:
- apiGroups:

2
manifests/prometheusOperator-clusterRoleBinding.yaml
View File

@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.55.0
app.kubernetes.io/version: 0.55.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io

8
manifests/prometheusOperator-deployment.yaml
View File

@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.55.0
app.kubernetes.io/version: 0.55.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -23,14 +23,14 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.55.0
app.kubernetes.io/version: 0.55.1
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.55.0
image: quay.io/prometheus-operator/prometheus-operator:v0.55.0
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.55.1
image: quay.io/prometheus-operator/prometheus-operator:v0.55.1
name: prometheus-operator
ports:
- containerPort: 8080

4
manifests/prometheusOperator-prometheusRule.yaml
View File

@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.55.0
app.kubernetes.io/version: 0.55.1
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
@@ -32,7 +32,7 @@ spec:
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/prometheus-operator/prometheusoperatorwatcherrors
summary: Errors while performing watch operations in controller.
expr: |
(sum by (controller,namespace) (rate(prometheus_operator_watch_operations_failed_total{job="prometheus-operator",namespace="monitoring"}[10m])) / sum by (controller,namespace) (rate(prometheus_operator_watch_operations_total{job="prometheus-operator",namespace="monitoring"}[10m]))) > 0.4
(sum by (controller,namespace) (rate(prometheus_operator_watch_operations_failed_total{job="prometheus-operator",namespace="monitoring"}[5m])) / sum by (controller,namespace) (rate(prometheus_operator_watch_operations_total{job="prometheus-operator",namespace="monitoring"}[5m]))) > 0.4
for: 15m
labels:
severity: warning

2
manifests/prometheusOperator-service.yaml
View File

@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.55.0
app.kubernetes.io/version: 0.55.1
name: prometheus-operator
namespace: monitoring
spec:

2
manifests/prometheusOperator-serviceAccount.yaml
View File

@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.55.0
app.kubernetes.io/version: 0.55.1
name: prometheus-operator
namespace: monitoring

4
manifests/prometheusOperator-serviceMonitor.yaml
View File

@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.55.0
app.kubernetes.io/version: 0.55.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -21,4 +21,4 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.55.0
app.kubernetes.io/version: 0.55.1

2
manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: alertmanagerconfigs.monitoring.coreos.com
spec:

88
manifests/setup/0alertmanagerCustomResourceDefinition.yaml
View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: alertmanagers.monitoring.coreos.com
spec:
@@ -973,14 +973,14 @@ spec:
alertmanagerConfiguration:
description: 'EXPERIMENTAL: alertmanagerConfiguration specifies the
global Alertmanager configuration. If defined, it takes precedence
over the `configSecret` field. This field may change in future releases.
The specified global alertmanager config will not force add a namespace
label in routes and inhibitRules.'
over the `configSecret` field. This field may change in future releases.'
properties:
name:
description: The name of the AlertmanagerConfig resource which
holds the global configuration. It must be in the same namespace
as the Alertmanager.
is used to generate the global configuration. It must be defined
in the same namespace as the Alertmanager object. The operator
will not enforce a `namespace` label for routes and inhibition
rules.
minLength: 1
type: string
type: object
@@ -1010,10 +1010,15 @@ spec:
type: string
type: array
configSecret:
description: ConfigSecret is the name of a Kubernetes Secret in the
same namespace as the Alertmanager object, which contains configuration
for this Alertmanager instance. Defaults to 'alertmanager-<alertmanager-name>'
The secret is mounted into /etc/alertmanager/config.
description: "ConfigSecret is the name of a Kubernetes Secret in the
same namespace as the Alertmanager object, which contains the configuration
for this Alertmanager instance. If empty, it defaults to 'alertmanager-<alertmanager-name>'.
\n The Alertmanager configuration should be available under the
`alertmanager.yaml` key. Additional keys from the original secret
are copied to the generated secret. \n If either the secret or the
`alertmanager.yaml` key is missing, the operator provisions an Alertmanager
configuration with one empty receiver (effectively dropping alert
notifications)."
type: string
containers:
description: 'Containers allows injecting additional containers. This
@@ -3917,13 +3922,13 @@ spec:
automatically if one of them is empty and the other
is non-empty. There are two important differences
between DataSource and DataSourceRef: * While DataSource
only allows two specific types of objects, DataSourceRef allows
any non-core object, as well as PersistentVolumeClaim
only allows two specific types of objects, DataSourceRef
allows any non-core object, as well as PersistentVolumeClaim
objects. * While DataSource ignores disallowed values
(dropping them), DataSourceRef preserves all values,
and generates an error if a disallowed value is specified.
(Alpha) Using this field requires the AnyVolumeDataSource
feature gate to be enabled.'
(dropping them), DataSourceRef preserves all values,
and generates an error if a disallowed value is
specified. (Alpha) Using this field requires the
AnyVolumeDataSource feature gate to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource
@@ -4140,11 +4145,11 @@ spec:
and the other is non-empty. There are two important
differences between DataSource and DataSourceRef: *
While DataSource only allows two specific types of objects,
DataSourceRef allows any non-core object, as well
as PersistentVolumeClaim objects. * While DataSource
ignores disallowed values (dropping them), DataSourceRef preserves
DataSourceRef allows any non-core object, as well as
PersistentVolumeClaim objects. * While DataSource ignores
disallowed values (dropping them), DataSourceRef preserves
all values, and generates an error if a disallowed value
is specified. (Alpha) Using this field requires the
is specified. (Alpha) Using this field requires the
AnyVolumeDataSource feature gate to be enabled.'
properties:
apiGroup:
@@ -4474,10 +4479,10 @@ spec:
description: 'WhenUnsatisfiable indicates how to deal with a
pod if it doesn''t satisfy the spread constraint. - DoNotSchedule
(default) tells the scheduler not to schedule it. - ScheduleAnyway
tells the scheduler to schedule the pod in any location, but
tells the scheduler to schedule the pod in any location, but
giving higher precedence to topologies that would help reduce
the skew. A constraint is considered "Unsatisfiable" for
an incoming pod if and only if every possible node assignment
the skew. A constraint is considered "Unsatisfiable" for an
incoming pod if and only if every possible node assignment
for that pod would violate "MaxSkew" on some topology. For
example, in a 3-zone cluster, MaxSkew is set to 1, and pods
with the same labelSelector spread as 3/1/1: | zone1 | zone2
@@ -4929,18 +4934,17 @@ spec:
pod starts, and deleted when the pod is removed. \n Use this
if: a) the volume is only needed while the pod runs, b) features
of normal volumes like restoring from snapshot or capacity
\ tracking are needed, c) the storage driver is specified
through a storage class, and d) the storage driver supports
dynamic volume provisioning through a PersistentVolumeClaim
(see EphemeralVolumeSource for more information on the
connection between this volume type and PersistentVolumeClaim).
\n Use PersistentVolumeClaim or one of the vendor-specific
APIs for volumes that persist for longer than the lifecycle
of an individual pod. \n Use CSI for light-weight local ephemeral
volumes if the CSI driver is meant to be used that way - see
the documentation of the driver for more information. \n A
pod can use both types of ephemeral volumes and persistent
volumes at the same time."
tracking are needed, c) the storage driver is specified through
a storage class, and d) the storage driver supports dynamic
volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource
for more information on the connection between this volume
type and PersistentVolumeClaim). \n Use PersistentVolumeClaim
or one of the vendor-specific APIs for volumes that persist
for longer than the lifecycle of an individual pod. \n Use
CSI for light-weight local ephemeral volumes if the CSI driver
is meant to be used that way - see the documentation of the
driver for more information. \n A pod can use both types of
ephemeral volumes and persistent volumes at the same time."
properties:
volumeClaimTemplate:
description: "Will be used to create a stand-alone PVC to
@@ -5028,13 +5032,13 @@ spec:
other is non-empty. There are two important differences
between DataSource and DataSourceRef: * While
DataSource only allows two specific types of objects,
DataSourceRef allows any non-core object, as
well as PersistentVolumeClaim objects. * While
DataSource ignores disallowed values (dropping
them), DataSourceRef preserves all values, and
generates an error if a disallowed value is specified.
(Alpha) Using this field requires the AnyVolumeDataSource
feature gate to be enabled.'
DataSourceRef allows any non-core object, as well
as PersistentVolumeClaim objects. * While DataSource
ignores disallowed values (dropping them), DataSourceRef
preserves all values, and generates an error if
a disallowed value is specified. (Alpha) Using
this field requires the AnyVolumeDataSource feature
gate to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource

2
manifests/setup/0podmonitorCustomResourceDefinition.yaml
View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: podmonitors.monitoring.coreos.com
spec:

2
manifests/setup/0probeCustomResourceDefinition.yaml
View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: probes.monitoring.coreos.com
spec:

115
manifests/setup/0prometheusCustomResourceDefinition.yaml
View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: prometheuses.monitoring.coreos.com
spec:
@@ -2678,6 +2678,7 @@ spec:
monitors and probes. This is an experimental feature, this behaviour
could change or be removed in the future. Only valid in Prometheus
versions 2.28.0 and newer.'
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
enforcedLabelLimit:
description: Per-scrape limit on number of labels that will be accepted
@@ -2704,8 +2705,8 @@ spec:
description: "EnforcedNamespaceLabel If set, a label will be added
to \n 1. all user-metrics (created by `ServiceMonitor`, `PodMonitor`
and `Probe` objects) and 2. in all `PrometheusRule` objects (except
the ones excluded in `prometheusRulesExcludedFromEnforce`) to *
alerting & recording rules and * the metrics used in their expressions
the ones excluded in `prometheusRulesExcludedFromEnforce`) to *
alerting & recording rules and * the metrics used in their expressions
(`expr`). \n Label name is this field's value. Label value is the
namespace of the created object (mentioned above)."
type: string
@@ -2732,6 +2733,42 @@ spec:
evaluationInterval:
description: 'Interval between consecutive evaluations. Default: `1m`'
type: string
excludedFromEnforcement:
description: List of references to PodMonitor, ServiceMonitor, Probe
and PrometheusRule objects to be excluded from enforcing a namespace
label of origin. Applies only if enforcedNamespaceLabel set to true.
items:
description: ObjectReference references a PodMonitor, ServiceMonitor,
Probe or PrometheusRule object.
properties:
group:
default: monitoring.coreos.com
description: Group of the referent. When not specified, it defaults
to `monitoring.coreos.com`
enum:
- monitoring.coreos.com
type: string
name:
description: Name of the referent. When not set, all resources
are matched.
type: string
namespace:
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
minLength: 1
type: string
resource:
description: Resource of the referent.
enum:
- prometheusrules
- servicemonitors
- podmonitors
- probes
type: string
required:
- namespace
- resource
type: object
type: array
externalLabels:
additionalProperties:
type: string
@@ -4265,10 +4302,11 @@ spec:
will _not_ be added when value is set to empty string (`""`).
type: string
prometheusRulesExcludedFromEnforce:
description: PrometheusRulesExcludedFromEnforce - list of prometheus
description: 'PrometheusRulesExcludedFromEnforce - list of prometheus
rules to be excluded from enforcing of adding namespace labels.
Works only if enforcedNamespaceLabel set to true. Make sure both
ruleNamespace and ruleName are set for each pair
ruleNamespace and ruleName are set for each pair. Deprecated: use
excludedFromEnforcement instead.'
items:
description: PrometheusRuleExcludeConfig enables users to configure
excluded PrometheusRule names and their namespaces to be ignored
@@ -5192,8 +5230,8 @@ spec:
hours days weeks years).
type: string
retentionSize:
description: 'Maximum amount of disk space used by blocks. Supported
units: B, KB, MB, GB, TB, PB, EB. Ex: `512MB`.'
description: Maximum amount of disk space used by blocks.
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
routePrefix:
description: The route prefix Prometheus registers HTTP handlers for.
@@ -5731,13 +5769,13 @@ spec:
automatically if one of them is empty and the other
is non-empty. There are two important differences
between DataSource and DataSourceRef: * While DataSource
only allows two specific types of objects, DataSourceRef allows
any non-core object, as well as PersistentVolumeClaim
only allows two specific types of objects, DataSourceRef
allows any non-core object, as well as PersistentVolumeClaim
objects. * While DataSource ignores disallowed values
(dropping them), DataSourceRef preserves all values,
and generates an error if a disallowed value is specified.
(Alpha) Using this field requires the AnyVolumeDataSource
feature gate to be enabled.'
(dropping them), DataSourceRef preserves all values,
and generates an error if a disallowed value is
specified. (Alpha) Using this field requires the
AnyVolumeDataSource feature gate to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource
@@ -5954,11 +5992,11 @@ spec:
and the other is non-empty. There are two important
differences between DataSource and DataSourceRef: *
While DataSource only allows two specific types of objects,
DataSourceRef allows any non-core object, as well
as PersistentVolumeClaim objects. * While DataSource
ignores disallowed values (dropping them), DataSourceRef preserves
DataSourceRef allows any non-core object, as well as
PersistentVolumeClaim objects. * While DataSource ignores
disallowed values (dropping them), DataSourceRef preserves
all values, and generates an error if a disallowed value
is specified. (Alpha) Using this field requires the
is specified. (Alpha) Using this field requires the
AnyVolumeDataSource feature gate to be enabled.'
properties:
apiGroup:
@@ -6603,10 +6641,10 @@ spec:
description: 'WhenUnsatisfiable indicates how to deal with a
pod if it doesn''t satisfy the spread constraint. - DoNotSchedule
(default) tells the scheduler not to schedule it. - ScheduleAnyway
tells the scheduler to schedule the pod in any location, but
tells the scheduler to schedule the pod in any location, but
giving higher precedence to topologies that would help reduce
the skew. A constraint is considered "Unsatisfiable" for
an incoming pod if and only if every possible node assignment
the skew. A constraint is considered "Unsatisfiable" for an
incoming pod if and only if every possible node assignment
for that pod would violate "MaxSkew" on some topology. For
example, in a 3-zone cluster, MaxSkew is set to 1, and pods
with the same labelSelector spread as 3/1/1: | zone1 | zone2
@@ -7058,18 +7096,17 @@ spec:
pod starts, and deleted when the pod is removed. \n Use this
if: a) the volume is only needed while the pod runs, b) features
of normal volumes like restoring from snapshot or capacity
\ tracking are needed, c) the storage driver is specified
through a storage class, and d) the storage driver supports
dynamic volume provisioning through a PersistentVolumeClaim
(see EphemeralVolumeSource for more information on the
connection between this volume type and PersistentVolumeClaim).
\n Use PersistentVolumeClaim or one of the vendor-specific
APIs for volumes that persist for longer than the lifecycle
of an individual pod. \n Use CSI for light-weight local ephemeral
volumes if the CSI driver is meant to be used that way - see
the documentation of the driver for more information. \n A
pod can use both types of ephemeral volumes and persistent
volumes at the same time."
tracking are needed, c) the storage driver is specified through
a storage class, and d) the storage driver supports dynamic
volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource
for more information on the connection between this volume
type and PersistentVolumeClaim). \n Use PersistentVolumeClaim
or one of the vendor-specific APIs for volumes that persist
for longer than the lifecycle of an individual pod. \n Use
CSI for light-weight local ephemeral volumes if the CSI driver
is meant to be used that way - see the documentation of the
driver for more information. \n A pod can use both types of
ephemeral volumes and persistent volumes at the same time."
properties:
volumeClaimTemplate:
description: "Will be used to create a stand-alone PVC to
@@ -7157,13 +7194,13 @@ spec:
other is non-empty. There are two important differences
between DataSource and DataSourceRef: * While
DataSource only allows two specific types of objects,
DataSourceRef allows any non-core object, as
well as PersistentVolumeClaim objects. * While
DataSource ignores disallowed values (dropping
them), DataSourceRef preserves all values, and
generates an error if a disallowed value is specified.
(Alpha) Using this field requires the AnyVolumeDataSource
feature gate to be enabled.'
DataSourceRef allows any non-core object, as well
as PersistentVolumeClaim objects. * While DataSource
ignores disallowed values (dropping them), DataSourceRef
preserves all values, and generates an error if
a disallowed value is specified. (Alpha) Using
this field requires the AnyVolumeDataSource feature
gate to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource

2
manifests/setup/0prometheusruleCustomResourceDefinition.yaml
View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: prometheusrules.monitoring.coreos.com
spec:

2
manifests/setup/0servicemonitorCustomResourceDefinition.yaml
View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: servicemonitors.monitoring.coreos.com
spec:

106
manifests/setup/0thanosrulerCustomResourceDefinition.yaml
View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: thanosrulers.monitoring.coreos.com
spec:
@@ -2168,6 +2168,42 @@ spec:
evaluationInterval:
description: Interval between consecutive evaluations.
type: string
excludedFromEnforcement:
description: List of references to PrometheusRule objects to be excluded
from enforcing a namespace label of origin. Applies only if enforcedNamespaceLabel
set to true.
items:
description: ObjectReference references a PodMonitor, ServiceMonitor,
Probe or PrometheusRule object.
properties:
group:
default: monitoring.coreos.com
description: Group of the referent. When not specified, it defaults
to `monitoring.coreos.com`
enum:
- monitoring.coreos.com
type: string
name:
description: Name of the referent. When not set, all resources
are matched.
type: string
namespace:
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
minLength: 1
type: string
resource:
description: Resource of the referent.
enum:
- prometheusrules
- servicemonitors
- podmonitors
- probes
type: string
required:
- namespace
- resource
type: object
type: array
externalPrefix:
description: The external URL the Thanos Ruler instances will be available
under. This is necessary to generate correct URLs. This is necessary
@@ -3639,10 +3675,11 @@ spec:
description: Priority class assigned to the Pods
type: string
prometheusRulesExcludedFromEnforce:
description: PrometheusRulesExcludedFromEnforce - list of Prometheus
description: 'PrometheusRulesExcludedFromEnforce - list of Prometheus
rules to be excluded from enforcing of adding namespace labels.
Works only if enforcedNamespaceLabel set to true. Make sure both
ruleNamespace and ruleName are set for each pair
ruleNamespace and ruleName are set for each pair Deprecated: use
excludedFromEnforcement instead.'
items:
description: PrometheusRuleExcludeConfig enables users to configure
excluded PrometheusRule names and their namespaces to be ignored
@@ -4105,13 +4142,13 @@ spec:
automatically if one of them is empty and the other
is non-empty. There are two important differences
between DataSource and DataSourceRef: * While DataSource
only allows two specific types of objects, DataSourceRef allows
any non-core object, as well as PersistentVolumeClaim
only allows two specific types of objects, DataSourceRef
allows any non-core object, as well as PersistentVolumeClaim
objects. * While DataSource ignores disallowed values
(dropping them), DataSourceRef preserves all values,
and generates an error if a disallowed value is specified.
(Alpha) Using this field requires the AnyVolumeDataSource
feature gate to be enabled.'
(dropping them), DataSourceRef preserves all values,
and generates an error if a disallowed value is
specified. (Alpha) Using this field requires the
AnyVolumeDataSource feature gate to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource
@@ -4328,11 +4365,11 @@ spec:
and the other is non-empty. There are two important
differences between DataSource and DataSourceRef: *
While DataSource only allows two specific types of objects,
DataSourceRef allows any non-core object, as well
as PersistentVolumeClaim objects. * While DataSource
ignores disallowed values (dropping them), DataSourceRef preserves
DataSourceRef allows any non-core object, as well as
PersistentVolumeClaim objects. * While DataSource ignores
disallowed values (dropping them), DataSourceRef preserves
all values, and generates an error if a disallowed value
is specified. (Alpha) Using this field requires the
is specified. (Alpha) Using this field requires the
AnyVolumeDataSource feature gate to be enabled.'
properties:
apiGroup:
@@ -4656,10 +4693,10 @@ spec:
description: 'WhenUnsatisfiable indicates how to deal with a
pod if it doesn''t satisfy the spread constraint. - DoNotSchedule
(default) tells the scheduler not to schedule it. - ScheduleAnyway
tells the scheduler to schedule the pod in any location, but
tells the scheduler to schedule the pod in any location, but
giving higher precedence to topologies that would help reduce
the skew. A constraint is considered "Unsatisfiable" for
an incoming pod if and only if every possible node assignment
the skew. A constraint is considered "Unsatisfiable" for an
incoming pod if and only if every possible node assignment
for that pod would violate "MaxSkew" on some topology. For
example, in a 3-zone cluster, MaxSkew is set to 1, and pods
with the same labelSelector spread as 3/1/1: | zone1 | zone2
@@ -5085,18 +5122,17 @@ spec:
pod starts, and deleted when the pod is removed. \n Use this
if: a) the volume is only needed while the pod runs, b) features
of normal volumes like restoring from snapshot or capacity
\ tracking are needed, c) the storage driver is specified
through a storage class, and d) the storage driver supports
dynamic volume provisioning through a PersistentVolumeClaim
(see EphemeralVolumeSource for more information on the
connection between this volume type and PersistentVolumeClaim).
\n Use PersistentVolumeClaim or one of the vendor-specific
APIs for volumes that persist for longer than the lifecycle
of an individual pod. \n Use CSI for light-weight local ephemeral
volumes if the CSI driver is meant to be used that way - see
the documentation of the driver for more information. \n A
pod can use both types of ephemeral volumes and persistent
volumes at the same time."
tracking are needed, c) the storage driver is specified through
a storage class, and d) the storage driver supports dynamic
volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource
for more information on the connection between this volume
type and PersistentVolumeClaim). \n Use PersistentVolumeClaim
or one of the vendor-specific APIs for volumes that persist
for longer than the lifecycle of an individual pod. \n Use
CSI for light-weight local ephemeral volumes if the CSI driver
is meant to be used that way - see the documentation of the
driver for more information. \n A pod can use both types of
ephemeral volumes and persistent volumes at the same time."
properties:
volumeClaimTemplate:
description: "Will be used to create a stand-alone PVC to
@@ -5184,13 +5220,13 @@ spec:
other is non-empty. There are two important differences
between DataSource and DataSourceRef: * While
DataSource only allows two specific types of objects,
DataSourceRef allows any non-core object, as
well as PersistentVolumeClaim objects. * While
DataSource ignores disallowed values (dropping
them), DataSourceRef preserves all values, and
generates an error if a disallowed value is specified.
(Alpha) Using this field requires the AnyVolumeDataSource
feature gate to be enabled.'
DataSourceRef allows any non-core object, as well
as PersistentVolumeClaim objects. * While DataSource
ignores disallowed values (dropping them), DataSourceRef
preserves all values, and generates an error if
a disallowed value is specified. (Alpha) Using
this field requires the AnyVolumeDataSource feature
gate to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource