diff --git a/go.mod b/go.mod
index b062ae78912ca8c03d688e4b0afa44ead1862d04..57e37bd94a202071ba419f8b739ddd7502a71cad 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
github.com/google/go-jsonnet v0.16.1-0.20200703153429-aaf50f5b655f
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d // indirect
github.com/imdario/mergo v0.3.7 // indirect
- github.com/jsonnet-bundler/jsonnet-bundler v0.3.1
+ github.com/jsonnet-bundler/jsonnet-bundler v0.4.0
github.com/kr/pretty v0.2.0 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/pkg/errors v0.8.1
diff --git a/go.sum b/go.sum
index b337a66c97f66369a653b93be5d2be86014fc7e5..c08cadea519881498c9ab5f1098254e9830ffc76 100644
--- a/go.sum
+++ b/go.sum
@@ -39,8 +39,6 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-jsonnet v0.16.0 h1:Nb4EEOp+rdeGGyB1rQ5eisgSAqrTnhf9ip+X6lzZbY0=
-github.com/google/go-jsonnet v0.16.0/go.mod h1:sOcuej3UW1vpPTZOr8L7RQimqai1a57bt5j22LzGZCw=
github.com/google/go-jsonnet v0.16.1-0.20200703153429-aaf50f5b655f h1:mw4KoMG5/DXLPhpKXQRYTEIZFkFo0a1HU2R1HbeYpek=
github.com/google/go-jsonnet v0.16.1-0.20200703153429-aaf50f5b655f/go.mod h1:sOcuej3UW1vpPTZOr8L7RQimqai1a57bt5j22LzGZCw=
github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
@@ -52,8 +50,8 @@ github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jsonnet-bundler/jsonnet-bundler v0.3.1 h1:KmNzitX12fFoyqjhU8cRifEB5D8x1NT1UAcK7FQ0zpY=
-github.com/jsonnet-bundler/jsonnet-bundler v0.3.1/go.mod h1:/by7P/OoohkI3q4CgSFqcoFsVY+IaNbzOVDknEsKDeU=
+github.com/jsonnet-bundler/jsonnet-bundler v0.4.0 h1:4BKZ6LDqPc2wJDmaKnmYD/vDjUptJtnUpai802MibFc=
+github.com/jsonnet-bundler/jsonnet-bundler v0.4.0/go.mod h1:/by7P/OoohkI3q4CgSFqcoFsVY+IaNbzOVDknEsKDeU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index 021f4dc1e82d5406ce3912d703cf6ec04ce7e9a5..086159f80e7000e95d77203805882d27ef11fef1 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -8,7 +8,7 @@
"subdir": "grafana"
}
},
- "version": "release-0.1"
+ "version": "master"
},
{
"source": {
@@ -26,7 +26,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "release-0.40"
+ "version": "release-0.41"
},
{
"source": {
@@ -54,7 +54,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "release-1.9"
+ "version": "master"
},
{
"source": {
@@ -63,7 +63,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "release-1.9"
+ "version": "master"
},
{
"source": {
diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
index fd0051dd30cf68fc9527e60cc991dca4cda967e5..2c21905cfe52c47ca2c782d98a14fe9ddabe613a 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
@@ -1,7 +1,7 @@
{
_config+:: {
versions+:: {
- kubeStateMetrics: '1.9.5',
+ kubeStateMetrics: '1.9.7',
},
imageRepos+:: {
kubeStateMetrics: 'quay.io/coreos/kube-state-metrics',
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 70aa1b9b138b88652017480f9c8fdb08f791a75b..4df10c74a4bf435ddafa5cdb014fb3c96f90bae2 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -4,57 +4,47 @@
{
"source": {
"git": {
- "remote": "https://github.com/brancz/kubernetes-grafana",
+ "remote": "https://github.com/brancz/kubernetes-grafana.git",
"subdir": "grafana"
}
},
- "version": "57b4365eacda291b82e0d55ba7eec573a8198dda",
- "sum": "92DWADwGjnCfpZaL7Q07C0GZayxBziGla/O03qWea34="
+ "version": "18c50c83ea49291b0aa00067e4b2b386556ba0e3",
+ "sum": "GEVLrcKGvUuvjq6bDhaWr4fOwkG5QMDpnUhHxUUywwg="
},
{
"source": {
"git": {
- "remote": "https://github.com/coreos/etcd",
+ "remote": "https://github.com/coreos/etcd.git",
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "cc564110bddeadc1d806ef0698745be702cb17ea",
- "sum": "Uv8ysXlEACF7BafoCkHnrBmJ2AHh/VldI5mm3BuMiy0="
+ "version": "ed27d9d2de4313f5e766eecc79996d011d5de4a8",
+ "sum": "NhOkJWkO7ZO2DSE8Fvipcs7Hh2/GOCS0WjPPZU8OiaQ="
},
{
"source": {
"git": {
- "remote": "https://github.com/prometheus-operator/prometheus-operator",
- "subdir": "jsonnet/prometheus-operator"
- }
- },
- "version": "0dca0f21ffff72a063db8855b5d515e15ab0dccb",
- "sum": "WggWVWZ+CBEUThQCztSaRELbtqdXf9s3OFzf06HbYNA="
- },
- {
- "source": {
- "git": {
- "remote": "https://github.com/grafana/grafonnet-lib",
+ "remote": "https://github.com/grafana/grafonnet-lib.git",
"subdir": "grafonnet"
}
},
- "version": "3336c69715f8f7a4d637582504c9fabd9d9ca081",
- "sum": "w6zS28Rjs9EzRN/WoLLIdi028BvumxDTyLefYVoql2k="
+ "version": "8338be68387b5811355aa919d031882ead0c9c6e",
+ "sum": "RixjNQccHT+UlCSvlR4HBiFcTRVdwDz5goWSHEXIf58="
},
{
"source": {
"git": {
- "remote": "https://github.com/grafana/jsonnet-libs",
+ "remote": "https://github.com/grafana/jsonnet-libs.git",
"subdir": "grafana-builder"
}
},
- "version": "08a81efce8314b3954665d3616d3ad9e545fa6ff",
- "sum": "N65Fv0M2JvFE3GN8ZxP5xh1U5a314ey8geLAioJLzF8="
+ "version": "de586e2ac76e9bcee87d34f0042abe1a2ef7cdf3",
+ "sum": "R5WJe6wW0R9vMpOAHaGFwcK8q4NmGZ0aLhdZGKDHeMU="
},
{
"source": {
"git": {
- "remote": "https://github.com/ksonnet/ksonnet-lib",
+ "remote": "https://github.com/ksonnet/ksonnet-lib.git",
"subdir": ""
}
},
@@ -65,7 +55,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
+ "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
"subdir": ""
}
},
@@ -75,7 +65,7 @@
{
"source": {
"git": {
- "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin",
+ "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
"subdir": "lib/promgrafonnet"
}
},
@@ -85,41 +75,51 @@
{
"source": {
"git": {
- "remote": "https://github.com/kubernetes/kube-state-metrics",
+ "remote": "https://github.com/kubernetes/kube-state-metrics.git",
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "eef2b125b5f09d0cc5245c0db897a27c9b74ca9b",
- "sum": "zD/pbQLnQq+5hegEelaheHS8mn1h09GTktFO74iwlBI="
+ "version": "44818d1538841379e1a1ea88d555f0249c1f464b",
+ "sum": "cJjGZaLBjcIGrLHZLjRPU9c3KL+ep9rZTb9dbALSKqA="
},
{
"source": {
"git": {
- "remote": "https://github.com/kubernetes/kube-state-metrics",
+ "remote": "https://github.com/kubernetes/kube-state-metrics.git",
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "eef2b125b5f09d0cc5245c0db897a27c9b74ca9b",
- "sum": "E1GGavnf9PCWBm4WVrxWnc0FIj72UcbcweqGioWrOdU="
+ "version": "44818d1538841379e1a1ea88d555f0249c1f464b",
+ "sum": "o5avaguRsfFwYFNen00ZEsub1x4i8Z/ZZ2QoEjFMff8="
+ },
+ {
+ "source": {
+ "git": {
+ "remote": "https://github.com/prometheus-operator/prometheus-operator.git",
+ "subdir": "jsonnet/prometheus-operator"
+ }
+ },
+ "version": "312d675008306b13c24d241bf4f0a882dbfa90d8",
+ "sum": "NPuLvqEmYZ+dCQ/9U4wXtobBD6hYreEx3jPpLQKS/ig="
},
{
"source": {
"git": {
- "remote": "https://github.com/prometheus/node_exporter",
+ "remote": "https://github.com/prometheus/node_exporter.git",
"subdir": "docs/node-mixin"
}
},
- "version": "503e4fc8486c0082d6bd8c53fad646bcfafeedf6",
+ "version": "3b035c8fa1f75c4c00e57acc14fb71dfd62e31ee",
"sum": "3jFV2qsc/GZe2GADswTYqxxP2zGOiANTj73W/VNFGqc="
},
{
"source": {
"git": {
- "remote": "https://github.com/prometheus/prometheus",
+ "remote": "https://github.com/prometheus/prometheus.git",
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "e5a06b483527d4fe0704b8fa3a2b475b661c526f",
+ "version": "983ebb4a513302315a8117932ab832815f85e3d2",
"sum": "TBq4SL7YsPInARbJqwz25JaBvvAegcnRCsuz3K9niWc=",
"name": "prometheus"
},
diff --git a/kustomization.yaml b/kustomization.yaml
index 73ce56e599b9d5f607d21e32d723e35bf977652b..944289002dc33e17d72ec6f7af57c6ac735a324d 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -57,6 +57,7 @@ resources:
- ./manifests/setup/0namespace-namespace.yaml
- ./manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
- ./manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
+- ./manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
- ./manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
- ./manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
- ./manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index d4cc0f92790b50f92994a4b0dae0563763d17990..589b1ade56cc53f4e2d0a174427919b1418df86d 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -12,6 +12,8 @@ spec:
app: grafana
template:
metadata:
+ annotations:
+ checksum/grafana-datasources: 48faab41f579fc8efde6034391496f6a
labels:
app: grafana
spec:
@@ -115,6 +117,7 @@ spec:
nodeSelector:
beta.kubernetes.io/os: linux
securityContext:
+ fsGroup: 65534
runAsNonRoot: true
runAsUser: 65534
serviceAccountName: grafana
diff --git a/manifests/kube-state-metrics-clusterRole.yaml b/manifests/kube-state-metrics-clusterRole.yaml
index 05fcdbc589e21e31740e2ff793257db311acb548..d4d4c2241f4c69225c8c065ba49d9d83dbc0c913 100644
--- a/manifests/kube-state-metrics-clusterRole.yaml
+++ b/manifests/kube-state-metrics-clusterRole.yaml
@@ -3,7 +3,7 @@ kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.5
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
rules:
- apiGroups:
@@ -108,3 +108,10 @@ rules:
verbs:
- list
- watch
+- apiGroups:
+ - coordination.k8s.io
+ resources:
+ - leases
+ verbs:
+ - list
+ - watch
diff --git a/manifests/kube-state-metrics-clusterRoleBinding.yaml b/manifests/kube-state-metrics-clusterRoleBinding.yaml
index 3de08c712eb0dea33a999dd2d1aba5a293400940..9e3244b09263710cafe7b9b1ab9d8f5df0e43a14 100644
--- a/manifests/kube-state-metrics-clusterRoleBinding.yaml
+++ b/manifests/kube-state-metrics-clusterRoleBinding.yaml
@@ -3,7 +3,7 @@ kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.5
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml
index 970f9872eac1cb803f4514bd3b0844e3ac3578a0..5c72983257c644d9dd9db16e859aae7889b20be8 100644
--- a/manifests/kube-state-metrics-deployment.yaml
+++ b/manifests/kube-state-metrics-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.5
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
namespace: monitoring
spec:
@@ -15,7 +15,7 @@ spec:
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.5
+ app.kubernetes.io/version: 1.9.7
spec:
containers:
- args:
@@ -23,8 +23,10 @@ spec:
- --port=8081
- --telemetry-host=127.0.0.1
- --telemetry-port=8082
- image: quay.io/coreos/kube-state-metrics:v1.9.5
+ image: quay.io/coreos/kube-state-metrics:v1.9.7
name: kube-state-metrics
+ securityContext:
+ runAsUser: 65534
- args:
- --logtostderr
- --secure-listen-address=:8443
diff --git a/manifests/kube-state-metrics-service.yaml b/manifests/kube-state-metrics-service.yaml
index fb1cc26932f2f126cb981e437795846c7dd76b99..bf23bdb283765d8d1f9fed6b840a5a9a8efdb7c3 100644
--- a/manifests/kube-state-metrics-service.yaml
+++ b/manifests/kube-state-metrics-service.yaml
@@ -3,7 +3,7 @@ kind: Service
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.5
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/kube-state-metrics-serviceAccount.yaml b/manifests/kube-state-metrics-serviceAccount.yaml
index 25a8bae3381d5474148211949ad6afe9c22959c0..ffc9dc6e61c94d89175c1283958c7574212eb1fa 100644
--- a/manifests/kube-state-metrics-serviceAccount.yaml
+++ b/manifests/kube-state-metrics-serviceAccount.yaml
@@ -3,6 +3,6 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: v1.9.5
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
namespace: monitoring
diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml
index f84324e10aed9d039190c672ef36ee1bd99fba25..b860f4c3d34d39b5f455fa8b96bcd682dad8e6df 100644
--- a/manifests/kube-state-metrics-serviceMonitor.yaml
+++ b/manifests/kube-state-metrics-serviceMonitor.yaml
@@ -3,7 +3,7 @@ kind: ServiceMonitor
metadata:
labels:
app.kubernetes.io/name: kube-state-metrics
- app.kubernetes.io/version: 1.9.5
+ app.kubernetes.io/version: 1.9.7
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/prometheus-operator-serviceMonitor.yaml b/manifests/prometheus-operator-serviceMonitor.yaml
index 39e48aa775489eea6bd1daf3f1656328377bc4d7..880ae76550d2c16bb506e9677c2eb7059111c8f5 100644
--- a/manifests/prometheus-operator-serviceMonitor.yaml
+++ b/manifests/prometheus-operator-serviceMonitor.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.40.0
+ app.kubernetes.io/version: v0.41.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -19,4 +19,4 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.40.0
+ app.kubernetes.io/version: v0.41.1
diff --git a/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
index e04eddbbb5321071bdb7fd164f874feeba8d4ecf..6dc3c7d415c3f85d467e9bdfa9c1a55d2cefd3b5 100644
--- a/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
@@ -645,7 +645,8 @@ spec:
type: object
type: object
baseImage:
- description: Base image that is used to deploy pods, without tag.
+ description: 'Base image that is used to deploy pods, without tag.
+ Deprecated: use ''image'' instead'
type: string
clusterAdvertiseAddress:
description: 'ClusterAdvertiseAddress is the explicit address to advertise
@@ -3014,10 +3015,11 @@ spec:
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.
+ 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. Deprecated: use ''image'' instead. The
+ image digest can be specified as part of the image URL.'
type: string
storage:
description: Storage is the definition of how storage will be used
@@ -3279,8 +3281,10 @@ spec:
type: object
type: object
tag:
- description: Tag of Alertmanager container image to be deployed. Defaults
- to the value of `version`. Version is ignored if Tag is set.
+ description: 'Tag of Alertmanager container image to be deployed.
+ Defaults to the value of `version`. Version is ignored if Tag is
+ set. Deprecated: use ''image'' instead. The image tag can be specified
+ as part of the image URL.'
type: string
tolerations:
description: If specified, the pod's tolerations.
diff --git a/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..47d871ace27eba6e310ebb6ce37683cdc20432ad
--- /dev/null
+++ b/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
@@ -0,0 +1,212 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+ annotations:
+ controller-gen.kubebuilder.io/version: v0.2.4
+ creationTimestamp: null
+ name: probes.monitoring.coreos.com
+spec:
+ group: monitoring.coreos.com
+ names:
+ kind: Probe
+ listKind: ProbeList
+ plural: probes
+ singular: probe
+ scope: Namespaced
+ versions:
+ - name: v1
+ schema:
+ openAPIV3Schema:
+ description: Probe defines monitoring for a set of static targets or ingresses.
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: Specification of desired Ingress selection for target discovery
+ by Prometheus.
+ properties:
+ interval:
+ description: Interval at which targets are probed using the configured
+ prober. If not specified Prometheus' global scrape interval is used.
+ type: string
+ jobName:
+ description: The job name assigned to scraped metrics by default.
+ type: string
+ module:
+ description: 'The module to use for probing specifying how to probe
+ the target. Example module configuring in the blackbox exporter:
+ https://github.com/prometheus/blackbox_exporter/blob/master/example.yml'
+ type: string
+ prober:
+ description: Specification for the prober to use for probing targets.
+ The prober.URL parameter is required. Targets cannot be probed if
+ left empty.
+ properties:
+ path:
+ description: Path to collect metrics from. Defaults to `/probe`.
+ type: string
+ scheme:
+ description: HTTP scheme to use for scraping. Defaults to `http`.
+ type: string
+ url:
+ description: Mandatory URL of the prober.
+ type: string
+ required:
+ - url
+ type: object
+ scrapeTimeout:
+ description: Timeout for scraping metrics from the Prometheus exporter.
+ type: string
+ targets:
+ description: Targets defines a set of static and/or dynamically discovered
+ targets to be probed using the prober.
+ properties:
+ ingress:
+ description: Ingress defines the set of dynamically discovered
+ ingress objects which hosts are considered for probing.
+ properties:
+ namespaceSelector:
+ description: Select Ingress objects by namespace.
+ properties:
+ any:
+ description: Boolean describing whether all namespaces
+ are selected in contrast to a list restricting them.
+ type: boolean
+ matchNames:
+ description: List of namespace names.
+ items:
+ type: string
+ type: array
+ type: object
+ relabelingConfigs:
+ 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. Default 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: object
+ type: array
+ selector:
+ description: Select Ingress objects by labels.
+ properties:
+ matchExpressions:
+ description: matchExpressions is a list of label selector
+ requirements. The requirements are ANDed.
+ items:
+ description: A label selector requirement is a selector
+ that contains values, a key, and an operator that
+ relates the key and values.
+ properties:
+ key:
+ description: key is the label key that the selector
+ applies to.
+ type: string
+ operator:
+ description: operator represents a key's relationship
+ to a set of values. Valid operators are In, NotIn,
+ Exists and DoesNotExist.
+ type: string
+ values:
+ description: values is an array of string values.
+ If the operator is In or NotIn, the values array
+ must be non-empty. If the operator is Exists or
+ DoesNotExist, the values array must be empty.
+ This array is replaced during a strategic merge
+ patch.
+ items:
+ type: string
+ type: array
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ matchLabels:
+ additionalProperties:
+ type: string
+ description: matchLabels is a map of {key,value} pairs.
+ A single {key,value} in the matchLabels map is equivalent
+ to an element of matchExpressions, whose key field is
+ "key", the operator is "In", and the values array contains
+ only "value". The requirements are ANDed.
+ type: object
+ type: object
+ type: object
+ staticConfig:
+ description: 'StaticConfig defines static targets which are considers
+ for probing. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#static_config.'
+ properties:
+ labels:
+ additionalProperties:
+ type: string
+ description: Labels assigned to all metrics scraped from the
+ targets.
+ type: object
+ static:
+ description: Targets is a list of URLs to probe using the
+ configured prober.
+ items:
+ type: string
+ type: array
+ type: object
+ type: object
+ type: object
+ required:
+ - spec
+ type: object
+ served: true
+ storage: true
+status:
+ acceptedNames:
+ kind: ""
+ plural: ""
+ conditions: []
+ storedVersions: []
diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
index 3c2126c834b4ec8d49c80ea197ebe65ef53af392..802f97c522a4ebba81da8781617efe2d2d409ba3 100644
--- a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -900,6 +900,11 @@ spec:
required:
- alertmanagers
type: object
+ allowOverlappingBlocks:
+ description: AllowOverlappingBlocks enables vertical compaction and
+ vertical query merge in Prometheus. This is still experimental in
+ Prometheus so it may change in any upcoming release.
+ type: boolean
apiserverConfig:
description: APIServerConfig allows specifying a host and auth methods
to access apiserver. If left empty, Prometheus is assumed to run
@@ -1097,7 +1102,8 @@ spec:
type: boolean
type: object
baseImage:
- description: Base image to use for a Prometheus deployment.
+ description: 'Base image to use for a Prometheus deployment. Deprecated:
+ use ''image'' instead'
type: string
configMaps:
description: ConfigMaps is a list of ConfigMaps in the same namespace
@@ -3432,6 +3438,95 @@ spec:
priorityClassName:
description: Priority class assigned to the Pods
type: string
+ probeNamespaceSelector:
+ description: '*Experimental* Namespaces to be selected for Probe discovery.
+ If nil, only check own namespace.'
+ properties:
+ matchExpressions:
+ description: matchExpressions is a list of label selector requirements.
+ The requirements are ANDed.
+ items:
+ description: A label selector requirement is a selector that
+ contains values, a key, and an operator that relates the key
+ and values.
+ properties:
+ key:
+ description: key is the label key that the selector applies
+ to.
+ type: string
+ operator:
+ description: operator represents a key's relationship to
+ a set of values. Valid operators are In, NotIn, Exists
+ and DoesNotExist.
+ type: string
+ values:
+ description: values is an array of string values. If the
+ operator is In or NotIn, the values array must be non-empty.
+ If the operator is Exists or DoesNotExist, the values
+ array must be empty. This array is replaced during a strategic
+ merge patch.
+ items:
+ type: string
+ type: array
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ matchLabels:
+ additionalProperties:
+ type: string
+ description: matchLabels is a map of {key,value} pairs. A single
+ {key,value} in the matchLabels map is equivalent to an element
+ of matchExpressions, whose key field is "key", the operator
+ is "In", and the values array contains only "value". The requirements
+ are ANDed.
+ type: object
+ type: object
+ probeSelector:
+ description: '*Experimental* Probes to be selected for target discovery.'
+ properties:
+ matchExpressions:
+ description: matchExpressions is a list of label selector requirements.
+ The requirements are ANDed.
+ items:
+ description: A label selector requirement is a selector that
+ contains values, a key, and an operator that relates the key
+ and values.
+ properties:
+ key:
+ description: key is the label key that the selector applies
+ to.
+ type: string
+ operator:
+ description: operator represents a key's relationship to
+ a set of values. Valid operators are In, NotIn, Exists
+ and DoesNotExist.
+ type: string
+ values:
+ description: values is an array of string values. If the
+ operator is In or NotIn, the values array must be non-empty.
+ If the operator is Exists or DoesNotExist, the values
+ array must be empty. This array is replaced during a strategic
+ merge patch.
+ items:
+ type: string
+ type: array
+ required:
+ - key
+ - operator
+ type: object
+ type: array
+ matchLabels:
+ additionalProperties:
+ type: string
+ description: matchLabels is a map of {key,value} pairs. A single
+ {key,value} in the matchLabels map is equivalent to an element
+ of matchExpressions, whose key field is "key", the operator
+ is "In", and the values array contains only "value". The requirements
+ are ANDed.
+ type: object
+ type: object
prometheusExternalLabelName:
description: Name of Prometheus external label used to denote Prometheus
instance name. Defaults to the value of `prometheus`. External label
@@ -4374,10 +4469,11 @@ spec:
type: object
type: object
sha:
- description: SHA of Prometheus container image to be deployed. Defaults
+ 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.
+ if SHA is set. Deprecated: use ''image'' instead. The image digest
+ can be specified as part of the image URL.'
type: string
storage:
description: Storage spec to specify how storage shall be used.
@@ -4638,8 +4734,10 @@ spec:
type: object
type: object
tag:
- description: Tag of Prometheus container image to be deployed. Defaults
- to the value of `version`. Version is ignored if Tag is set.
+ description: 'Tag of Prometheus container image to be deployed. Defaults
+ to the value of `version`. Version is ignored if Tag is set. Deprecated:
+ use ''image'' instead. The image tag can be specified as part of
+ the image URL.'
type: string
thanos:
description: "Thanos configuration allows configuring various aspects
@@ -4649,7 +4747,8 @@ spec:
without backward compatibility in any release."
properties:
baseImage:
- description: Thanos base image if other than default.
+ description: 'Thanos base image if other than default. Deprecated:
+ use ''image'' instead'
type: string
grpcServerTlsConfig:
description: 'GRPCServerTLSConfig configures the gRPC server from
@@ -4842,15 +4941,17 @@ spec:
type: object
type: object
sha:
- description: SHA of Thanos container image to be deployed. Defaults
+ 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.
+ if SHA is set. Deprecated: use ''image'' instead. The image
+ digest can be specified as part of the image URL.'
type: string
tag:
- description: Tag of Thanos sidecar container image to be deployed.
+ description: 'Tag of Thanos sidecar container image to be deployed.
Defaults to the value of `version`. Version is ignored if Tag
- is set.
+ is set. Deprecated: use ''image'' instead. The image tag can
+ be specified as part of the image URL.'
type: string
tracingConfig:
description: TracingConfig configures tracing in Thanos. This
diff --git a/manifests/setup/prometheus-operator-clusterRole.yaml b/manifests/setup/prometheus-operator-clusterRole.yaml
index b3d490a797638d31def47bd34f7d653b7575315d..1864e529c0240bc5d9362332ee62f3f2dca05de0 100644
--- a/manifests/setup/prometheus-operator-clusterRole.yaml
+++ b/manifests/setup/prometheus-operator-clusterRole.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.40.0
+ app.kubernetes.io/version: v0.41.1
name: prometheus-operator
rules:
- apiGroups:
@@ -18,6 +18,7 @@ rules:
- thanosrulers/finalizers
- servicemonitors
- podmonitors
+ - probes
- prometheusrules
verbs:
- '*'
diff --git a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
index 5ac1066ff657e96d015e1e8e008627b72812cf3d..cd772902ea1c645e5674803f5f9136706deb0f24 100644
--- a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
+++ b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.40.0
+ app.kubernetes.io/version: v0.41.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml
index e54a21f0fb7e43453c4e755a03810b4d61ca1645..225da8c9fcdf3b4a3cefeb1ebc58973513f4156d 100644
--- a/manifests/setup/prometheus-operator-deployment.yaml
+++ b/manifests/setup/prometheus-operator-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.40.0
+ app.kubernetes.io/version: v0.41.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -18,15 +18,15 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.40.0
+ app.kubernetes.io/version: v0.41.1
spec:
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- - --config-reloader-image=jimmidyson/configmap-reload:v0.3.0
- - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.40.0
- image: quay.io/coreos/prometheus-operator:v0.40.0
+ - --config-reloader-image=jimmidyson/configmap-reload:v0.4.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.41.1
+ image: quay.io/coreos/prometheus-operator:v0.41.1
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/setup/prometheus-operator-service.yaml b/manifests/setup/prometheus-operator-service.yaml
index 3f8dd96e04332ed17f61331d1d27c87b0a96c345..f936f1d4761c0ba0862f4d44e9b3ba1e2c84378e 100644
--- a/manifests/setup/prometheus-operator-service.yaml
+++ b/manifests/setup/prometheus-operator-service.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.40.0
+ app.kubernetes.io/version: v0.41.1
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/setup/prometheus-operator-serviceAccount.yaml b/manifests/setup/prometheus-operator-serviceAccount.yaml
index c0bffc96cd258c3857773b0e6bc695966dfe9b71..0a1327bbe6d380a4cd85506b01c00c1c190de021 100644
--- a/manifests/setup/prometheus-operator-serviceAccount.yaml
+++ b/manifests/setup/prometheus-operator-serviceAccount.yaml
@@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
- app.kubernetes.io/version: v0.40.0
+ app.kubernetes.io/version: v0.41.1
name: prometheus-operator
namespace: monitoring