forked from kubernetes/perf-tests
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kubernetes#1594 from marseel/feature/upgrade_prome…
…theus_operator Upgrade prometheus-operator to 0.31.0 and improve requests/limits
- Loading branch information
Showing
9 changed files
with
874 additions
and
110 deletions.
There are no files selected for viewing
207 changes: 198 additions & 9 deletions
207
.../pkg/prometheus/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
236 changes: 236 additions & 0 deletions
236
...r2/pkg/prometheus/manifests/0prometheus-operator-0podmonitorCustomResourceDefinition.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,236 @@ | ||
--- | ||
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 |
Oops, something went wrong.