diff --git a/README.md b/README.md
index 252ddd4b1dbbda7a8cce9fa1949f42f03252f9fe..36aea2cb67854be897adc131dabcaedbb42cc2e2 100644
--- a/README.md
+++ b/README.md
@@ -222,7 +222,7 @@ These are the available fields with their respective default values:
kubeStateMetrics: "v1.3.1",
kubeRbacProxy: "v0.3.1",
addonResizer: "1.0",
- prometheusOperator: "v0.24.2",
+ prometheusOperator: "v0.24.0",
prometheus: "v2.4.3",
},
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index e684fedc2efdaa00f2c477e8d362abf0773105e7..f4c615b830cff2324ceaa0e8ba43380db581a227 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "e316fd4c4d1d39a5490c02a2b76e239a5378a8f2"
+ "version": "13cb3c515152fb8495cdc6364938f19bff860e70"
},
{
"name": "ksonnet",
@@ -68,7 +68,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "27b1eb72d9d93e5ab447121e2b884bc558bde01d"
+ "version": "4a7fea51ab3f10329472c07028354617fb6635fe"
},
{
"name": "etcd-mixin",
diff --git a/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
index 6ee94918cf8bd53ffbd8acec59d67e4bb1b59a32..7c5ff6681a5c4b134c2be234620b797d6e3fcd1f 100644
--- a/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
@@ -26,6 +26,12 @@ spec:
description: 'AlertmanagerSpec is a specification of the desired behavior
of the Alertmanager cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
properties:
+ additionalPeers:
+ description: AdditionalPeers allows injecting a set of additional Alertmanagers
+ to peer with to form a highly available cluster.
+ items:
+ type: string
+ type: array
affinity:
description: Affinity is a group of affinity scheduling rules.
properties:
@@ -1668,6 +1674,9 @@ spec:
Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids
type: string
+ priorityClassName:
+ description: Priority class assigned to the Pods
+ type: string
replicas:
description: Size is the expected size of the alertmanager cluster.
The controller will eventually make the size of the running cluster
@@ -1689,7 +1698,8 @@ spec:
type: object
retention:
description: Time duration Alertmanager shall retain data for. Default
- is '120h'.
+ is '120h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)`
+ (milliseconds seconds minutes hours days weeks years).
type: string
routePrefix:
description: The route prefix Alertmanager registers HTTP handlers for.
@@ -1793,14 +1803,22 @@ spec:
description: ServiceAccountName is the name of the ServiceAccount to
use to run the Prometheus Pods.
type: string
+ sha:
+ description: SHA of Alertmanager container image to be deployed. Defaults
+ to the value of `version`. Similar to a tag, but the SHA explicitly
+ deploys an immutable container image. Version and Tag are ignored
+ if SHA is set.
+ type: string
storage:
description: StorageSpec defines the configured storage for a group
- Prometheus servers.
+ Prometheus servers. If neither `emptyDir` nor `volumeClaimTemplate`
+ is specified, then by default an [EmptyDir](https://kubernetes.io/docs/concepts/storage/volumes/#emptydir)
+ will be used.
properties:
class:
description: 'Name of the StorageClass to use when requesting storage
provisioning. More info: https://kubernetes.io/docs/user-guide/persistent-volumes/#storageclasses
- DEPRECATED'
+ (DEPRECATED - instead use `volumeClaimTemplate.spec.storageClassName`)'
type: string
emptyDir:
description: Represents an empty directory for a pod. Empty directory
@@ -2331,7 +2349,7 @@ spec:
type: string
tag:
description: Tag of Alertmanager container image to be deployed. Defaults
- to the value of `version`.
+ to the value of `version`. Version is ignored if Tag is set.
type: string
tolerations:
description: If specified, the pod's tolerations.
diff --git a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
index 6eba60db4d31700d1d180fada106813f46177460..0117d343eb154dea7f30f670a1e41a5dab15fec8 100644
--- a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -1830,6 +1830,9 @@ spec:
Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids
type: string
+ priorityClassName:
+ description: Priority class assigned to the Pods
+ type: string
remoteRead:
description: If specified, the remote_read spec. This is an experimental
feature, it may change in any upcoming release in a breaking way.
@@ -2095,7 +2098,8 @@ spec:
type: object
retention:
description: Time duration Prometheus shall retain data for. Default
- is '24h'.
+ is '24h', and must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)`
+ (milliseconds seconds minutes hours days weeks years).
type: string
routePrefix:
description: The route prefix Prometheus registers HTTP handlers for.
@@ -2374,14 +2378,22 @@ spec:
"In", and the values array contains only "value". The requirements
are ANDed.
type: object
+ sha:
+ description: SHA of Prometheus container image to be deployed. Defaults
+ to the value of `version`. Similar to a tag, but the SHA explicitly
+ deploys an immutable container image. Version and Tag are ignored
+ if SHA is set.
+ type: string
storage:
description: StorageSpec defines the configured storage for a group
- Prometheus servers.
+ Prometheus servers. If neither `emptyDir` nor `volumeClaimTemplate`
+ is specified, then by default an [EmptyDir](https://kubernetes.io/docs/concepts/storage/volumes/#emptydir)
+ will be used.
properties:
class:
description: 'Name of the StorageClass to use when requesting storage
provisioning. More info: https://kubernetes.io/docs/user-guide/persistent-volumes/#storageclasses
- DEPRECATED'
+ (DEPRECATED - instead use `volumeClaimTemplate.spec.storageClassName`)'
type: string
emptyDir:
description: Represents an empty directory for a pod. Empty directory
@@ -2912,7 +2924,7 @@ spec:
type: string
tag:
description: Tag of Prometheus container image to be deployed. Defaults
- to the value of `version`.
+ to the value of `version`. Version is ignored if Tag is set.
type: string
thanos:
description: ThanosSpec defines parameters for a Prometheus server within
@@ -3015,9 +3027,16 @@ spec:
description: Whether to use S3 Signature Version 2; otherwise
Signature Version 4 will be used.
type: boolean
+ sha:
+ description: SHA of Thanos container image to be deployed. Defaults
+ to the value of `version`. Similar to a tag, but the SHA explicitly
+ deploys an immutable container image. Version and Tag are ignored
+ if SHA is set.
+ type: string
tag:
description: Tag of Thanos sidecar container image to be deployed.
- Defaults to the value of `version`.
+ Defaults to the value of `version`. Version is ignored if Tag
+ is set.
type: string
version:
description: Version describes the version of Thanos to use.
diff --git a/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
index 0a9873c93b99f08551a814f90e00c1994f9ccfb4..5258719281eac147c15c5b2661446ae68f08749c 100644
--- a/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
@@ -322,7 +322,9 @@ spec:
annotations:
type: object
expr:
- type: string
+ anyOf:
+ - type: string
+ - type: integer
for:
type: string
labels:
diff --git a/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
index 9d96bfebf1c8918634bf181c590afa5ca5f069cf..d2e310fde61d1fb805a8781189e64d686231c9d6 100644
--- a/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
@@ -136,6 +136,51 @@ spec:
description: ProxyURL eg http://proxyserver:2195 Directs scrapes
to proxy through this endpoint.
type: string
+ relabelings:
+ description: 'RelabelConfigs to apply to samples before ingestion.
+ More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#<relabel_config>'
+ items:
+ description: 'RelabelConfig allows dynamic rewriting of the
+ label set, being applied to samples before ingestion. It defines
+ `<metric_relabel_configs>`-section of Prometheus configuration.
+ More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
+ properties:
+ action:
+ description: Action to perform based on regex matching.
+ Default is 'replace'
+ type: string
+ modulus:
+ description: Modulus to take of the hash of the source label
+ values.
+ format: int64
+ type: integer
+ regex:
+ description: Regular expression against which the extracted
+ value is matched. defailt is '(.*)'
+ type: string
+ replacement:
+ description: Replacement value against which a regex replace
+ is performed if the regular expression matches. Regex
+ capture groups are available. Default is '$1'
+ type: string
+ separator:
+ description: Separator placed between concatenated source
+ label values. default is ';'.
+ type: string
+ sourceLabels:
+ description: The source labels select values from existing
+ labels. Their content is concatenated using the configured
+ separator and matched against the configured regular expression
+ for the replace, keep, and drop actions.
+ items:
+ type: string
+ type: array
+ targetLabel:
+ description: Label to which the resulting value is written
+ in a replace action. It is mandatory for replace actions.
+ Regex capture groups are available.
+ type: string
+ type: array
scheme:
description: HTTP scheme to use for scraping.
type: string
@@ -181,6 +226,17 @@ spec:
items:
type: string
type: array
+ podTargetLabels:
+ description: PodTargetLabels transfers labels on the Kubernetes Pod
+ onto the target.
+ items:
+ type: string
+ type: array
+ sampleLimit:
+ description: SampleLimit defines per-scrape limit on number of scraped
+ samples that will be accepted.
+ format: int64
+ type: integer
selector:
description: A label selector is a label query over a set of resources.
The result of matchLabels and matchExpressions are ANDed. An empty
diff --git a/manifests/0prometheus-operator-clusterRole.yaml b/manifests/0prometheus-operator-clusterRole.yaml
index bad68f27e2302a33f7e41937859827cdc678dffa..e0ac283a3e479f1aa65ed877196179273c7b2ca7 100644
--- a/manifests/0prometheus-operator-clusterRole.yaml
+++ b/manifests/0prometheus-operator-clusterRole.yaml
@@ -61,5 +61,6 @@ rules:
resources:
- namespaces
verbs:
+ - get
- list
- watch
diff --git a/manifests/0prometheus-operator-deployment.yaml b/manifests/0prometheus-operator-deployment.yaml
index 6894d92cd1687950d6a6bf516e626985396f6db3..9c9c485a0191d1f20e5fa91dcfe8fc3b8627cf22 100644
--- a/manifests/0prometheus-operator-deployment.yaml
+++ b/manifests/0prometheus-operator-deployment.yaml
@@ -20,8 +20,8 @@ spec:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.2
- image: quay.io/coreos/prometheus-operator:v0.23.2
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.24.0
+ image: quay.io/coreos/prometheus-operator:v0.24.0
name: prometheus-operator
ports:
- containerPort: 8080