From b28a65534f6f0613c15d3a08cb638a27504275c5 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Thu, 20 Jun 2019 13:04:46 +0200
Subject: [PATCH] *: Re-generate
---
jsonnetfile.lock.json | 6 +-
kustomization.yaml | 1 +
...r-0podmonitorCustomResourceDefinition.yaml | 235 ++++++++++++++++++
...r-0prometheusCustomResourceDefinition.yaml | 187 +++++++-------
.../0prometheus-operator-clusterRole.yaml | 7 +-
...rometheus-operator-clusterRoleBinding.yaml | 6 +-
.../0prometheus-operator-deployment.yaml | 23 +-
manifests/0prometheus-operator-service.yaml | 10 +-
.../0prometheus-operator-serviceAccount.yaml | 6 +-
.../0prometheus-operator-serviceMonitor.yaml | 12 +-
10 files changed, 362 insertions(+), 131 deletions(-)
create mode 100644 manifests/0prometheus-operator-0podmonitorCustomResourceDefinition.yaml
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 9aade1cd..0009cf7e 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "jsonnet/kube-prometheus"
}
},
- "version": "3f6d0c6dd3288d0c8b600a0d526ea62f0999af19"
+ "version": "bdf84bf1865e66d76c027eb2cea7bf776acd18a4"
},
{
"name": "ksonnet",
@@ -68,7 +68,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "18fbf558ab7f8809fd610a3dc50bf483508dc1bb"
+ "version": "f05d5228fe02bcd370acaa234c15f3d9fdef4a60"
},
{
"name": "etcd-mixin",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "53891cbf9716b942b4f9c5929bbd2781180bf8e0"
+ "version": "9ff762857712c9c5c2037e6ddd9a692a488224bf"
}
]
}
diff --git a/kustomization.yaml b/kustomization.yaml
index 75847a07..a580ed8e 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -3,6 +3,7 @@ kind: Kustomization
resources:
- ./manifests/00namespace-namespace.yaml
- ./manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
+- ./manifests/0prometheus-operator-0podmonitorCustomResourceDefinition.yaml
- ./manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
- ./manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
- ./manifests/0prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
diff --git a/manifests/0prometheus-operator-0podmonitorCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0podmonitorCustomResourceDefinition.yaml
new file mode 100644
index 00000000..ff67150f
--- /dev/null
+++ b/manifests/0prometheus-operator-0podmonitorCustomResourceDefinition.yaml
@@ -0,0 +1,235 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+ creationTimestamp: null
+ name: podmonitors.monitoring.coreos.com
+spec:
+ group: monitoring.coreos.com
+ names:
+ kind: PodMonitor
+ plural: podmonitors
+ scope: Namespaced
+ validation:
+ openAPIV3Schema:
+ 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/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/api-conventions.md#types-kinds'
+ type: string
+ spec:
+ description: PodMonitorSpec contains specification parameters for a PodMonitor.
+ properties:
+ jobLabel:
+ description: The label to use to retrieve the job name from.
+ type: string
+ namespaceSelector:
+ description: NamespaceSelector is a selector for selecting either all
+ namespaces or a list of namespaces.
+ 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
+ podMetricsEndpoints:
+ description: A list of endpoints allowed as part of this PodMonitor.
+ items:
+ description: PodMetricsEndpoint defines a scrapeable endpoint of a
+ Kubernetes Pod serving Prometheus metrics.
+ properties:
+ honorLabels:
+ description: HonorLabels chooses the metric's labels on collisions
+ with target labels.
+ type: boolean
+ interval:
+ description: Interval at which metrics should be scraped
+ type: string
+ metricRelabelings:
+ description: MetricRelabelConfigs to apply to samples before ingestion.
+ 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: object
+ type: array
+ params:
+ description: Optional HTTP URL parameters
+ type: object
+ path:
+ description: HTTP path to scrape for metrics.
+ type: string
+ port:
+ description: Name of the port this endpoint refers to. Mutually
+ exclusive with targetPort.
+ type: string
+ proxyUrl:
+ 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: object
+ type: array
+ scheme:
+ description: HTTP scheme to use for scraping.
+ type: string
+ scrapeTimeout:
+ description: Timeout after which the scrape is ended
+ type: string
+ targetPort:
+ anyOf:
+ - type: string
+ - type: integer
+ type: object
+ 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
+ label selector matches all objects. A null label selector matches
+ no objects.
+ 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:
+ 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
+ required:
+ - podMetricsEndpoints
+ - selector
+ type: object
+ type: object
+ version: v1
diff --git a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
index 7dd7912e..dde967ae 100644
--- a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -2015,6 +2015,94 @@ spec:
Populated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids
type: string
type: object
+ podMonitorNamespaceSelector:
+ description: A label selector is a label query over a set of resources.
+ The result of matchLabels and matchExpressions are ANDed. An empty
+ label selector matches all objects. A null label selector matches
+ no objects.
+ 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:
+ 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
+ podMonitorSelector:
+ description: A label selector is a label query over a set of resources.
+ The result of matchLabels and matchExpressions are ANDed. An empty
+ label selector matches all objects. A null label selector matches
+ no objects.
+ 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:
+ 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
priorityClassName:
description: Priority class assigned to the Pods
type: string
@@ -2337,6 +2425,9 @@ spec:
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
+ retentionSize:
+ description: Maximum amount of disk space used by blocks.
+ type: string
routePrefix:
description: The route prefix Prometheus registers HTTP handlers for.
This is useful, if using ExternalURL and a proxy is rewriting HTTP
@@ -3215,42 +3306,6 @@ spec:
baseImage:
description: Thanos base image if other than default.
type: string
- clusterAdvertiseAddress:
- description: Explicit (external) ip:port address to advertise for
- gossip in gossip cluster. Used internally for membership only.
- type: string
- gcs:
- description: 'Deprecated: ThanosGCSSpec should be configured with
- an ObjectStorageConfig secret starting with Thanos v0.2.0. ThanosGCSSpec
- will be removed.'
- properties:
- bucket:
- description: Google Cloud Storage bucket name for stored blocks.
- If empty it won't store any block inside Google Cloud Storage.
- type: string
- credentials:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
- type: string
- optional:
- description: Specify whether the Secret or it's key must
- be defined
- type: boolean
- required:
- - key
- type: object
- type: object
- grpcAdvertiseAddress:
- description: Explicit (external) host:port address to advertise
- for gRPC StoreAPI in gossip cluster. If empty, 'grpc-address'
- will be used.
- type: string
image:
description: Image if specified has precedence over baseImage, tag
and sha combinations. Specifying the version is still necessary
@@ -3274,9 +3329,6 @@ spec:
required:
- key
type: object
- peers:
- description: Peers is a DNS name for Thanos to discover peers through.
- type: string
resources:
description: ResourceRequirements describes the compute resource
requirements.
@@ -3292,63 +3344,6 @@ spec:
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
type: object
- s3:
- description: 'Deprecated: ThanosS3Spec should be configured with
- an ObjectStorageConfig secret starting with Thanos v0.2.0. ThanosS3Spec
- will be removed.'
- properties:
- accessKey:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
- type: string
- optional:
- description: Specify whether the Secret or it's key must
- be defined
- type: boolean
- required:
- - key
- type: object
- bucket:
- description: S3-Compatible API bucket name for stored blocks.
- type: string
- encryptsse:
- description: Whether to use Server Side Encryption
- type: boolean
- endpoint:
- description: S3-Compatible API endpoint for stored blocks.
- type: string
- insecure:
- description: Whether to use an insecure connection with an S3-Compatible
- API.
- type: boolean
- secretKey:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
- type: string
- optional:
- description: Specify whether the Secret or it's key must
- be defined
- type: boolean
- required:
- - key
- type: object
- signatureVersion2:
- description: Whether to use S3 Signature Version 2; otherwise
- Signature Version 4 will be used.
- type: boolean
- type: object
sha:
description: SHA of Thanos container image to be deployed. Defaults
to the value of `version`. Similar to a tag, but the SHA explicitly
diff --git a/manifests/0prometheus-operator-clusterRole.yaml b/manifests/0prometheus-operator-clusterRole.yaml
index 5881ce8c..adcaf195 100644
--- a/manifests/0prometheus-operator-clusterRole.yaml
+++ b/manifests/0prometheus-operator-clusterRole.yaml
@@ -2,9 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
- apps.kubernetes.io/version: v0.30.0
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/version: v0.31.0
name: prometheus-operator
rules:
- apiGroups:
@@ -21,6 +21,7 @@ rules:
- prometheuses/finalizers
- alertmanagers/finalizers
- servicemonitors
+ - podmonitors
- prometheusrules
verbs:
- '*'
diff --git a/manifests/0prometheus-operator-clusterRoleBinding.yaml b/manifests/0prometheus-operator-clusterRoleBinding.yaml
index f0f1640b..583f5225 100644
--- a/manifests/0prometheus-operator-clusterRoleBinding.yaml
+++ b/manifests/0prometheus-operator-clusterRoleBinding.yaml
@@ -2,9 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
- apps.kubernetes.io/version: v0.30.0
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/version: v0.31.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/0prometheus-operator-deployment.yaml b/manifests/0prometheus-operator-deployment.yaml
index 3d9891a9..ef28a2fc 100644
--- a/manifests/0prometheus-operator-deployment.yaml
+++ b/manifests/0prometheus-operator-deployment.yaml
@@ -1,32 +1,32 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
kind: Deployment
metadata:
labels:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
- apps.kubernetes.io/version: v0.30.0
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/version: v0.31.0
name: prometheus-operator
namespace: monitoring
spec:
replicas: 1
selector:
matchLabels:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
template:
metadata:
labels:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
- apps.kubernetes.io/version: v0.30.0
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/version: v0.31.0
spec:
containers:
- args:
- --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.30.0
- image: quay.io/coreos/prometheus-operator:v0.30.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.31.0
+ image: quay.io/coreos/prometheus-operator:v0.31.0
name: prometheus-operator
ports:
- containerPort: 8080
@@ -40,7 +40,6 @@ spec:
memory: 100Mi
securityContext:
allowPrivilegeEscalation: false
- readOnlyRootFilesystem: true
nodeSelector:
beta.kubernetes.io/os: linux
securityContext:
diff --git a/manifests/0prometheus-operator-service.yaml b/manifests/0prometheus-operator-service.yaml
index 0884420d..a4a57067 100644
--- a/manifests/0prometheus-operator-service.yaml
+++ b/manifests/0prometheus-operator-service.yaml
@@ -2,9 +2,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
- apps.kubernetes.io/version: v0.30.0
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/version: v0.31.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -14,5 +14,5 @@ spec:
port: 8080
targetPort: http
selector:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
diff --git a/manifests/0prometheus-operator-serviceAccount.yaml b/manifests/0prometheus-operator-serviceAccount.yaml
index fa0b5cc4..0cb145c3 100644
--- a/manifests/0prometheus-operator-serviceAccount.yaml
+++ b/manifests/0prometheus-operator-serviceAccount.yaml
@@ -2,8 +2,8 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
- apps.kubernetes.io/version: v0.30.0
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/version: v0.31.0
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/0prometheus-operator-serviceMonitor.yaml b/manifests/0prometheus-operator-serviceMonitor.yaml
index f68eec86..ad8255e6 100644
--- a/manifests/0prometheus-operator-serviceMonitor.yaml
+++ b/manifests/0prometheus-operator-serviceMonitor.yaml
@@ -2,9 +2,9 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
- apps.kubernetes.io/version: v0.30.0
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/version: v0.31.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -13,6 +13,6 @@ spec:
port: http
selector:
matchLabels:
- apps.kubernetes.io/component: controller
- apps.kubernetes.io/name: prometheus-operator
- apps.kubernetes.io/version: v0.30.0
+ app.kubernetes.io/component: controller
+ app.kubernetes.io/name: prometheus-operator
+ app.kubernetes.io/version: v0.31.0
--
GitLab