Update prometheus monitoring chart and images
Features: * Add to prometheus federation exported metrics the cluster_uuid label Updates: * prometheus-operator chart tag bumped to 8.12.13 * Update container_infra_prefix to missing prometheusOperator images task: 39540 task: 39541 story: 2006765 Change-Id: I76bca268bf4e0b8c253f112c5665bd2b43fc8d44 Signed-off-by: Diogo Guerra <diogo.filipe.tomas.guerra@cern.ch>
This commit is contained in:
parent
2ca71f4bc9
commit
62a4b8ba09
|
@ -1211,11 +1211,6 @@ _`container_infra_prefix`
|
||||||
* gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
|
* gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
|
||||||
* gcr.io/google-containers/hyperkube:v1.12.1
|
* gcr.io/google-containers/hyperkube:v1.12.1
|
||||||
* gcr.io/google_containers/metrics-server-amd64:v0.3.6
|
* gcr.io/google_containers/metrics-server-amd64:v0.3.6
|
||||||
* quay.io/coreos/configmap-reload:v0.0.1
|
|
||||||
* quay.io/coreos/prometheus-config-reloader:v0.30.1
|
|
||||||
* quay.io/coreos/prometheus-operator:v0.30.1
|
|
||||||
* quay.io/prometheus/alertmanager:v0.17.0
|
|
||||||
* quay.io/prometheus/prometheus:v2.9.1
|
|
||||||
* k8s.gcr.io/node-problem-detector:v0.6.2
|
* k8s.gcr.io/node-problem-detector:v0.6.2
|
||||||
* docker.io/planetlabs/draino:abf028a
|
* docker.io/planetlabs/draino:abf028a
|
||||||
* docker.io/openstackmagnum/cluster-autoscaler:v1.0
|
* docker.io/openstackmagnum/cluster-autoscaler:v1.0
|
||||||
|
@ -1226,6 +1221,15 @@ _`container_infra_prefix`
|
||||||
* quay.io/coreos/flannel-cni:v0.3.0
|
* quay.io/coreos/flannel-cni:v0.3.0
|
||||||
* quay.io/coreos/flannel:v0.12.0-amd64
|
* quay.io/coreos/flannel:v0.12.0-amd64
|
||||||
|
|
||||||
|
Images that might be needed if 'monitoring_enabled' is 'true':
|
||||||
|
* quay.io/prometheus/alertmanager:v0.20.0
|
||||||
|
* docker.io/squareup/ghostunnel:v1.5.2
|
||||||
|
* docker.io/jettech/kube-webhook-certgen:v1.0.0
|
||||||
|
* quay.io/coreos/prometheus-operator:v0.37.0
|
||||||
|
* quay.io/coreos/configmap-reload:v0.0.1
|
||||||
|
* quay.io/coreos/prometheus-config-reloader:v0.37.0
|
||||||
|
* quay.io/prometheus/prometheus:v2.15.2
|
||||||
|
|
||||||
Images that might be needed if 'cinder_csi_enabled' is 'true':
|
Images that might be needed if 'cinder_csi_enabled' is 'true':
|
||||||
* docker.io/k8scloudprovider/cinder-csi-plugin:v1.16.0
|
* docker.io/k8scloudprovider/cinder-csi-plugin:v1.16.0
|
||||||
* quay.io/k8scsi/csi-attacher:v2.0.0
|
* quay.io/k8scsi/csi-attacher:v2.0.0
|
||||||
|
|
|
@ -8,6 +8,7 @@ step="prometheus-adapter"
|
||||||
printf "Starting to run ${step}\n"
|
printf "Starting to run ${step}\n"
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
# This configuration is dependent on the helm installed prometheus-operator.
|
||||||
###############################################################################
|
###############################################################################
|
||||||
CHART_NAME="prometheus-adapter"
|
CHART_NAME="prometheus-adapter"
|
||||||
|
|
||||||
|
|
|
@ -176,6 +176,19 @@ data:
|
||||||
|
|
||||||
prometheusOperator:
|
prometheusOperator:
|
||||||
priorityClassName: "system-cluster-critical"
|
priorityClassName: "system-cluster-critical"
|
||||||
|
tlsProxy:
|
||||||
|
image:
|
||||||
|
repository: ${CONTAINER_INFRA_PREFIX:-squareup/}ghostunnel
|
||||||
|
admissionWebhooks:
|
||||||
|
patch:
|
||||||
|
image:
|
||||||
|
repository: ${CONTAINER_INFRA_PREFIX:-jettech/}kube-webhook-certgen
|
||||||
|
priorityClassName: "system-cluster-critical"
|
||||||
|
|
||||||
|
resources: {}
|
||||||
|
# requests:
|
||||||
|
# cpu: 5m
|
||||||
|
# memory: 10Mi
|
||||||
image:
|
image:
|
||||||
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/coreos/}prometheus-operator
|
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/coreos/}prometheus-operator
|
||||||
configmapReloadImage:
|
configmapReloadImage:
|
||||||
|
@ -183,7 +196,7 @@ data:
|
||||||
prometheusConfigReloaderImage:
|
prometheusConfigReloaderImage:
|
||||||
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/coreos/}prometheus-config-reloader
|
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/coreos/}prometheus-config-reloader
|
||||||
hyperkubeImage:
|
hyperkubeImage:
|
||||||
repository: ${CONTAINER_INFRA_PREFIX:-gcr.io/google-containers/}hyperkube
|
repository: ${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube
|
||||||
|
|
||||||
prometheus:
|
prometheus:
|
||||||
prometheusSpec:
|
prometheusSpec:
|
||||||
|
@ -192,6 +205,8 @@ data:
|
||||||
image:
|
image:
|
||||||
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/prometheus/}prometheus
|
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/prometheus/}prometheus
|
||||||
retention: 14d
|
retention: 14d
|
||||||
|
externalLabels:
|
||||||
|
cluster_uuid: ${CLUSTER_UUID}
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: ${PROMETHEUS_SERVER_CPU}m
|
cpu: ${PROMETHEUS_SERVER_CPU}m
|
||||||
|
|
|
@ -691,7 +691,7 @@ parameters:
|
||||||
prometheus_operator_chart_tag:
|
prometheus_operator_chart_tag:
|
||||||
type: string
|
type: string
|
||||||
description: The stable/prometheus-operator chart version to use.
|
description: The stable/prometheus-operator chart version to use.
|
||||||
default: v8.2.2
|
default: v8.12.13
|
||||||
|
|
||||||
prometheus_adapter_enabled:
|
prometheus_adapter_enabled:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
|
@ -468,12 +468,10 @@ parameters:
|
||||||
monitoring_enabled:
|
monitoring_enabled:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: Enable or disable prometheus-operator monitoring solution.
|
description: Enable or disable prometheus-operator monitoring solution.
|
||||||
default: false
|
|
||||||
|
|
||||||
prometheus_operator_chart_tag:
|
prometheus_operator_chart_tag:
|
||||||
type: string
|
type: string
|
||||||
description: The stable/prometheus-operator chart version to use.
|
description: The stable/prometheus-operator chart version to use.
|
||||||
default: 5.12.3
|
|
||||||
|
|
||||||
prometheus_adapter_enabled:
|
prometheus_adapter_enabled:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
|
@ -699,7 +699,7 @@ parameters:
|
||||||
prometheus_operator_chart_tag:
|
prometheus_operator_chart_tag:
|
||||||
type: string
|
type: string
|
||||||
description: The stable/prometheus-operator chart version to use.
|
description: The stable/prometheus-operator chart version to use.
|
||||||
default: v8.2.2
|
default: v8.12.13
|
||||||
|
|
||||||
prometheus_adapter_enabled:
|
prometheus_adapter_enabled:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
|
@ -472,12 +472,10 @@ parameters:
|
||||||
monitoring_enabled:
|
monitoring_enabled:
|
||||||
type: boolean
|
type: boolean
|
||||||
description: Enable or disable prometheus-operator monitoring solution.
|
description: Enable or disable prometheus-operator monitoring solution.
|
||||||
default: false
|
|
||||||
|
|
||||||
prometheus_operator_chart_tag:
|
prometheus_operator_chart_tag:
|
||||||
type: string
|
type: string
|
||||||
description: The stable/prometheus-operator chart version to use.
|
description: The stable/prometheus-operator chart version to use.
|
||||||
default: 5.12.3
|
|
||||||
|
|
||||||
prometheus_adapter_enabled:
|
prometheus_adapter_enabled:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Add to prometheus federation exported metrics the cluster_uuid label.
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Bumped prometheus-operator chart tag to 8.12.13.
|
||||||
|
Added container_infra_prefix to missing prometheusOperator images.
|
Loading…
Reference in New Issue