From 830500cfc71a559a397775b408b502108671e445 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Wed, 24 Oct 2018 15:29:20 +0200
Subject: [PATCH] kube-prometheus: Re-generate
---
jsonnetfile.lock.json | 14 ++--
...0alertmanagerCustomResourceDefinition.yaml | 61 +++++++++++---
...r-0prometheusCustomResourceDefinition.yaml | 80 +++++++++++++++----
...rometheusruleCustomResourceDefinition.yaml | 11 +--
.../0prometheus-operator-deployment.yaml | 4 +-
manifests/prometheus-rules.yaml | 3 +-
6 files changed, 130 insertions(+), 43 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 390820de..a62c4f16 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "230f671aab6ece196aa7a0f618da38173b4daf71"
+ "version": "72cd517798083622b2d31943e3f4e38b6b1a204f"
},
{
"name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": ""
}
},
- "version": "d24c4066aa2653370e1403812202eb38b2e70210"
+ "version": "9d393239bd361c6ff9883f6d8c8e9bf0b1f1dd13"
},
{
"name": "grafonnet",
@@ -38,7 +38,7 @@
"subdir": "grafonnet"
}
},
- "version": "64147daa1267a2571ef95609550b782ec9807c52"
+ "version": "bce2b3ae55983435f175045d59d0d5431570e120"
},
{
"name": "grafana-builder",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "bce24b0b087f7dc09c9e9f066f3e554a851792e9"
+ "version": "282ae11a6f4fa47bf844a68f8a3eee9dd26a14be"
},
{
"name": "grafana",
@@ -58,7 +58,7 @@
"subdir": "grafana"
}
},
- "version": "850525cfa7a82115cf7a8a85f5ca632f4632be3d"
+ "version": "455e08134e1a135f41e1032576487921a759cf51"
},
{
"name": "prometheus-operator",
@@ -68,7 +68,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "8c6a68760010347134e41f3aa3d73c68eb094a1b"
+ "version": "82a6ad2071ff653e38b3b4719ecb789d73f3ab05"
},
{
"name": "etcd-mixin",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "7a759c18d294698f537f8be91927354818a71e51"
+ "version": "965ba5ca8bbf015b68abe3ad45c99270dc1022fb"
}
]
}
diff --git a/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
index 7c5ff668..22248a54 100644
--- a/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
@@ -593,6 +593,13 @@ spec:
baseImage:
description: Base image that is used to deploy pods, without tag.
type: string
+ configMaps:
+ description: ConfigMaps is a list of ConfigMaps in the same namespace
+ as the Alertmanager object, which shall be mounted into the Alertmanager
+ Pods. The ConfigMaps are mounted into /etc/alertmanager/configmaps/<configmap-name>.
+ items:
+ type: string
+ type: array
containers:
description: Containers allows injecting additional containers. This
is meant to allow adding an authentication proxy to an Alertmanager
@@ -1057,8 +1064,8 @@ spec:
to by services.
type: string
protocol:
- description: Protocol for port. Must be UDP or TCP. Defaults
- to "TCP".
+ description: Protocol for port. Must be UDP, TCP, or SCTP.
+ Defaults to "TCP".
type: string
required:
- containerPort
@@ -1211,6 +1218,13 @@ spec:
privileged containers are essentially equivalent to root
on the host. Defaults to false.
type: boolean
+ procMount:
+ description: procMount denotes the type of proc mount to use
+ for the containers. The default is DefaultProcMount which
+ uses the container runtime defaults for readonly paths and
+ masked paths. This requires the ProcMountType feature flag
+ to be enabled.
+ type: string
readOnlyRootFilesystem:
description: Whether this container has a read-only root filesystem.
Default is false.
@@ -1333,8 +1347,8 @@ spec:
mountPropagation:
description: mountPropagation determines how mounts are
propagated from the host to container and the other way
- around. When not set, MountPropagationHostToContainer
- is used. This field is beta in 1.10.
+ around. When not set, MountPropagationNone is used. This
+ field is beta in 1.10.
type: string
name:
description: This must match the Name of a Volume.
@@ -1569,11 +1583,12 @@ spec:
the server has more data available. The value is opaque
and may be used to issue another request to the endpoint
that served this list to retrieve the next set of
- available objects. Continuing a list may not be possible
- if the server configuration has changed or more than
- a few minutes have passed. The resourceVersion field
- returned when using this continue value will be identical
- to the value in the first response.
+ available objects. Continuing a consistent list may
+ not be possible if the server configuration has changed
+ or more than a few minutes have passed. The resourceVersion
+ field returned when using this continue value will
+ be identical to the value in the first response, unless
+ you have received this token from an error message.
type: string
resourceVersion:
description: 'String that identifies the server''s internal
@@ -2093,12 +2108,14 @@ spec:
available. The value is opaque and may be
used to issue another request to the endpoint
that served this list to retrieve the next
- set of available objects. Continuing a list
- may not be possible if the server configuration
+ set of available objects. Continuing a consistent
+ list may not be possible if the server configuration
has changed or more than a few minutes have
passed. The resourceVersion field returned
when using this continue value will be identical
- to the value in the first response.
+ to the value in the first response, unless
+ you have received this token from an error
+ message.
type: string
resourceVersion:
description: 'String that identifies the server''s
@@ -2216,6 +2233,26 @@ spec:
items:
type: string
type: array
+ dataSource:
+ description: TypedLocalObjectReference contains enough information
+ to let you locate the typed referenced object inside the
+ same namespace.
+ properties:
+ apiGroup:
+ description: APIGroup is the group for the resource
+ being referenced. If APIGroup is not specified, the
+ specified Kind must be in the core API group. For
+ any other third-party types, APIGroup is required.
+ type: string
+ kind:
+ description: Kind is the type of resource being referenced
+ type: string
+ name:
+ description: Name is the name of resource being referenced
+ type: string
+ required:
+ - kind
+ - name
resources:
description: ResourceRequirements describes the compute
resource requirements.
diff --git a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
index 0117d343..58265136 100644
--- a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -41,6 +41,21 @@ spec:
type: boolean
required:
- key
+ additionalAlertRelabelConfigs:
+ 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
additionalScrapeConfigs:
description: SecretKeySelector selects a key of a Secret.
properties:
@@ -744,6 +759,13 @@ spec:
baseImage:
description: Base image to use for a Prometheus deployment.
type: string
+ configMaps:
+ description: ConfigMaps is a list of ConfigMaps in the same namespace
+ as the Prometheus object, which shall be mounted into the Prometheus
+ Pods. The ConfigMaps are mounted into /etc/prometheus/configmaps/<configmap-name>.
+ items:
+ type: string
+ type: array
containers:
description: Containers allows injecting additional containers. This
is meant to allow adding an authentication proxy to a Prometheus pod.
@@ -1207,8 +1229,8 @@ spec:
to by services.
type: string
protocol:
- description: Protocol for port. Must be UDP or TCP. Defaults
- to "TCP".
+ description: Protocol for port. Must be UDP, TCP, or SCTP.
+ Defaults to "TCP".
type: string
required:
- containerPort
@@ -1361,6 +1383,13 @@ spec:
privileged containers are essentially equivalent to root
on the host. Defaults to false.
type: boolean
+ procMount:
+ description: procMount denotes the type of proc mount to use
+ for the containers. The default is DefaultProcMount which
+ uses the container runtime defaults for readonly paths and
+ masked paths. This requires the ProcMountType feature flag
+ to be enabled.
+ type: string
readOnlyRootFilesystem:
description: Whether this container has a read-only root filesystem.
Default is false.
@@ -1483,8 +1512,8 @@ spec:
mountPropagation:
description: mountPropagation determines how mounts are
propagated from the host to container and the other way
- around. When not set, MountPropagationHostToContainer
- is used. This field is beta in 1.10.
+ around. When not set, MountPropagationNone is used. This
+ field is beta in 1.10.
type: string
name:
description: This must match the Name of a Volume.
@@ -1725,11 +1754,12 @@ spec:
the server has more data available. The value is opaque
and may be used to issue another request to the endpoint
that served this list to retrieve the next set of
- available objects. Continuing a list may not be possible
- if the server configuration has changed or more than
- a few minutes have passed. The resourceVersion field
- returned when using this continue value will be identical
- to the value in the first response.
+ available objects. Continuing a consistent list may
+ not be possible if the server configuration has changed
+ or more than a few minutes have passed. The resourceVersion
+ field returned when using this continue value will
+ be identical to the value in the first response, unless
+ you have received this token from an error message.
type: string
resourceVersion:
description: 'String that identifies the server''s internal
@@ -2199,10 +2229,6 @@ spec:
description: Secrets is a list of Secrets in the same namespace as the
Prometheus object, which shall be mounted into the Prometheus Pods.
The Secrets are mounted into /etc/prometheus/secrets/<secret-name>.
- Secrets changes after initial creation of a Prometheus object are
- not reflected in the running Pods. To change the secrets mounted into
- the Prometheus Pods, the object must be deleted and recreated with
- the new list of secrets.
items:
type: string
type: array
@@ -2668,12 +2694,14 @@ spec:
available. The value is opaque and may be
used to issue another request to the endpoint
that served this list to retrieve the next
- set of available objects. Continuing a list
- may not be possible if the server configuration
+ set of available objects. Continuing a consistent
+ list may not be possible if the server configuration
has changed or more than a few minutes have
passed. The resourceVersion field returned
when using this continue value will be identical
- to the value in the first response.
+ to the value in the first response, unless
+ you have received this token from an error
+ message.
type: string
resourceVersion:
description: 'String that identifies the server''s
@@ -2791,6 +2819,26 @@ spec:
items:
type: string
type: array
+ dataSource:
+ description: TypedLocalObjectReference contains enough information
+ to let you locate the typed referenced object inside the
+ same namespace.
+ properties:
+ apiGroup:
+ description: APIGroup is the group for the resource
+ being referenced. If APIGroup is not specified, the
+ specified Kind must be in the core API group. For
+ any other third-party types, APIGroup is required.
+ type: string
+ kind:
+ description: Kind is the type of resource being referenced
+ type: string
+ name:
+ description: Name is the name of resource being referenced
+ type: string
+ required:
+ - kind
+ - name
resources:
description: ResourceRequirements describes the compute
resource requirements.
diff --git a/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
index 52587192..877fadac 100644
--- a/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
@@ -196,11 +196,12 @@ spec:
server has more data available. The value is opaque and
may be used to issue another request to the endpoint that
served this list to retrieve the next set of available
- objects. Continuing a list may not be possible if the
- server configuration has changed or more than a few minutes
- have passed. The resourceVersion field returned when using
- this continue value will be identical to the value in
- the first response.
+ objects. Continuing a consistent list may not be possible
+ if the server configuration has changed or more than a
+ few minutes have passed. The resourceVersion field returned
+ when using this continue value will be identical to the
+ value in the first response, unless you have received
+ this token from an error message.
type: string
resourceVersion:
description: 'String that identifies the server''s internal
diff --git a/manifests/0prometheus-operator-deployment.yaml b/manifests/0prometheus-operator-deployment.yaml
index 9c9c485a..a82bf6f3 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.24.0
- image: quay.io/coreos/prometheus-operator:v0.24.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.25.0
+ image: quay.io/coreos/prometheus-operator:v0.25.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 0565661a..a049cf46 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -787,7 +787,8 @@ spec:
- alert: CPUThrottlingHigh
annotations:
message: '{{ printf "%0.0f" $value }}% throttling of CPU in namespace {{ $labels.namespace
- }} for {{ $labels.container_name }}.'
+ }} for container {{ $labels.container_name }} in pod {{ $labels.pod_name
+ }}.'
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-cputhrottlinghigh
expr: "100 * sum(increase(container_cpu_cfs_throttled_periods_total[5m])) by
(container_name, pod_name, namespace) \n / \nsum(increase(container_cpu_cfs_periods_total[5m]))
--
GitLab