kube-prometheus: Update dependencies
This commit is contained in:
Frederic Branczyk
@@ -8,7 +8,7 @@
|
||||
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
|
||||
}
|
||||
},
|
||||
"version": "3dc6ff1b6a3b3efe8152bdaddd8a41fb2f6cbf37"
|
||||
"version": "793d90134afffc41c07d0482794379962f3e14ec"
|
||||
},
|
||||
{
|
||||
"name": "ksonnet",
|
||||
|
||||
@@ -23,8 +23,8 @@ spec:
|
||||
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: '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'
|
||||
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:
|
||||
affinity:
|
||||
description: Affinity is a group of affinity scheduling rules.
|
||||
@@ -1687,6 +1687,10 @@ spec:
|
||||
to Limits if that is explicitly specified, otherwise to an implementation-defined
|
||||
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
|
||||
type: object
|
||||
retention:
|
||||
description: Time duration Alertmanager shall retain data for. Default
|
||||
is '120h'.
|
||||
type: string
|
||||
routePrefix:
|
||||
description: The route prefix Alertmanager registers HTTP handlers for.
|
||||
This is useful, if using ExternalURL and a proxy is rewriting HTTP
|
||||
@@ -2372,9 +2376,9 @@ spec:
|
||||
description: Version the cluster should be on.
|
||||
type: string
|
||||
status:
|
||||
description: 'Most recent observed status of the Alertmanager cluster. Read-only.
|
||||
Not included when requesting from the apiserver, only from the Prometheus
|
||||
Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
|
||||
description: 'AlertmanagerStatus is the most recent observed status of the
|
||||
Alertmanager cluster. Read-only. Not included when requesting from the
|
||||
apiserver, only from the Prometheus Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
|
||||
properties:
|
||||
availableReplicas:
|
||||
description: Total number of available pods (ready for at least minReadySeconds)
|
||||
|
||||
@@ -23,8 +23,8 @@ spec:
|
||||
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: 'Specification of the desired behavior of the Prometheus cluster.
|
||||
More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
|
||||
description: 'PrometheusSpec is a specification of the desired behavior
|
||||
of the Prometheus cluster. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
|
||||
properties:
|
||||
additionalAlertManagerConfigs:
|
||||
description: SecretKeySelector selects a key of a Secret.
|
||||
@@ -671,6 +671,76 @@ spec:
|
||||
type: array
|
||||
required:
|
||||
- alertmanagers
|
||||
apiserverConfig:
|
||||
description: 'APIServerConfig defines a host and auth methods to access
|
||||
apiserver. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config'
|
||||
properties:
|
||||
basicAuth:
|
||||
description: 'BasicAuth allow an endpoint to authenticate over basic
|
||||
authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints'
|
||||
properties:
|
||||
password:
|
||||
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
|
||||
username:
|
||||
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
|
||||
bearerToken:
|
||||
description: Bearer token for accessing apiserver.
|
||||
type: string
|
||||
bearerTokenFile:
|
||||
description: File to read bearer token for accessing apiserver.
|
||||
type: string
|
||||
host:
|
||||
description: Host of apiserver. A valid string consisting of a hostname
|
||||
or IP followed by an optional port number
|
||||
type: string
|
||||
tlsConfig:
|
||||
description: TLSConfig specifies TLS configuration parameters.
|
||||
properties:
|
||||
caFile:
|
||||
description: The CA cert to use for the targets.
|
||||
type: string
|
||||
certFile:
|
||||
description: The client cert file for the targets.
|
||||
type: string
|
||||
insecureSkipVerify:
|
||||
description: Disable target certificate validation.
|
||||
type: boolean
|
||||
keyFile:
|
||||
description: The client key file for the targets.
|
||||
type: string
|
||||
serverName:
|
||||
description: Used to verify the hostname for the targets.
|
||||
type: string
|
||||
required:
|
||||
- host
|
||||
baseImage:
|
||||
description: Base image to use for a Prometheus deployment.
|
||||
type: string
|
||||
@@ -2024,7 +2094,8 @@ spec:
|
||||
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
|
||||
type: object
|
||||
retention:
|
||||
description: Time duration Prometheus shall retain data for.
|
||||
description: Time duration Prometheus shall retain data for. Default
|
||||
is '24h'.
|
||||
type: string
|
||||
routePrefix:
|
||||
description: The route prefix Prometheus registers HTTP handlers for.
|
||||
@@ -2858,11 +2929,41 @@ spec:
|
||||
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
|
||||
peers:
|
||||
description: Peers is a DNS name for Thanos to discover peers through.
|
||||
type: string
|
||||
resources:
|
||||
description: ResourceRequirements describes the compute resource
|
||||
requirements.
|
||||
properties:
|
||||
limits:
|
||||
description: 'Limits describes the maximum amount of compute
|
||||
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
|
||||
type: object
|
||||
requests:
|
||||
description: 'Requests describes the minimum amount of compute
|
||||
resources required. If Requests is omitted for a container,
|
||||
it defaults to Limits if that is explicitly specified, otherwise
|
||||
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
|
||||
type: object
|
||||
s3:
|
||||
description: ThanosSpec defines parameters for of AWS Simple Storage
|
||||
description: ThanosS3Spec defines parameters for of AWS Simple Storage
|
||||
Service (S3) with Thanos. (S3 compatible services apply as well)
|
||||
properties:
|
||||
accessKey:
|
||||
@@ -2884,6 +2985,9 @@ spec:
|
||||
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
|
||||
@@ -2961,9 +3065,9 @@ spec:
|
||||
description: Version of Prometheus to be deployed.
|
||||
type: string
|
||||
status:
|
||||
description: 'Most recent observed status of the Prometheus cluster. Read-only.
|
||||
Not included when requesting from the apiserver, only from the Prometheus
|
||||
Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
|
||||
description: 'PrometheusStatus is the most recent observed status of the
|
||||
Prometheus cluster. Read-only. Not included when requesting from the apiserver,
|
||||
only from the Prometheus Operator API itself. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status'
|
||||
properties:
|
||||
availableReplicas:
|
||||
description: Total number of available pods (ready for at least minReadySeconds)
|
||||
|
||||
@@ -169,7 +169,7 @@ spec:
|
||||
description: The label to use to retrieve the job name from.
|
||||
type: string
|
||||
namespaceSelector:
|
||||
description: A selector for selecting namespaces either selecting all
|
||||
description: NamespaceSelector is a selector for selecting either all
|
||||
namespaces or a list of namespaces.
|
||||
properties:
|
||||
any:
|
||||
|
||||
@@ -18,9 +18,10 @@ 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.22.2
|
||||
image: quay.io/coreos/prometheus-operator:v0.22.2
|
||||
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.0
|
||||
image: quay.io/coreos/prometheus-operator:v0.23.0
|
||||
name: prometheus-operator
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
@@ -28,10 +29,13 @@ spec:
|
||||
resources:
|
||||
limits:
|
||||
cpu: 200m
|
||||
memory: 100Mi
|
||||
memory: 200Mi
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 50Mi
|
||||
memory: 100Mi
|
||||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
readOnlyRootFilesystem: true
|
||||
nodeSelector:
|
||||
beta.kubernetes.io/os: linux
|
||||
securityContext:
|
||||
|
||||
@@ -7,7 +7,8 @@ metadata:
|
||||
namespace: monitoring
|
||||
spec:
|
||||
endpoints:
|
||||
- port: http
|
||||
- honorLabels: true
|
||||
port: http
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: prometheus-operator
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
apiVersion: v1
|
||||
data:
|
||||
dashboards.yaml: |-
|
||||
[
|
||||
{
|
||||
"folder": "",
|
||||
"name": "0",
|
||||
"options": {
|
||||
"path": "/grafana-dashboard-definitions/0"
|
||||
},
|
||||
"org_id": 1,
|
||||
"type": "file"
|
||||
}
|
||||
]
|
||||
{
|
||||
"apiVersion": 1,
|
||||
"providers": [
|
||||
{
|
||||
"folder": "",
|
||||
"name": "0",
|
||||
"options": {
|
||||
"path": "/grafana-dashboard-definitions/0"
|
||||
},
|
||||
"orgId": 1,
|
||||
"type": "file"
|
||||
}
|
||||
]
|
||||
}
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: grafana-dashboards
|
||||
|
||||
Reference in New Issue
Block a user