Update magnum k8s monitoring infra
* Update prometheus-operator helm chart and tag. * Update prometheus-adapter version. * Deprecation notice for prometheus_monitoring component. task: 41569 story: 2006765 Signed-off-by: Diogo Guerra <diogo.filipe.tomas.guerra@cern.ch> Change-Id: I05e8c2be4e4c8e66a166b485ec7851875dca8b1c
This commit is contained in:
Diogo Guerra
parent
bfffeca927
commit
b1865e12c9
|
|
@ -1264,13 +1264,14 @@ _`container_infra_prefix`
|
|||
|
||||
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
|
||||
* quay.io/prometheus/alertmanager:v0.21.0
|
||||
* docker.io/jettech/kube-webhook-certgen:v1.5.0
|
||||
* quay.io/prometheus-operator/prometheus-operator:v0.44.0
|
||||
* docker.io/jimmidyson/configmap-reload:v0.4.0
|
||||
* quay.io/prometheus-operator/prometheus-config-reloader:v0.44.0
|
||||
* quay.io/prometheus/prometheus:v2.22.1
|
||||
* quay.io/prometheus/node-exporter:v1.0.1
|
||||
* docker.io/directxman12/k8s-prometheus-adapter:v0.8.2
|
||||
|
||||
Images that might be needed if 'cinder_csi_enabled' is 'true':
|
||||
|
||||
|
|
|
|||
|
|
@ -35,15 +35,15 @@ _`metrics_server_enabled`
|
|||
|
||||
_`monitoring_enabled`
|
||||
Enable installation of cluster monitoring solution provided by the
|
||||
stable/prometheus-operator helm chart.
|
||||
prometheus-community/kube-prometheus-stack helm chart.
|
||||
To use this service tiller_enabled must be true when using
|
||||
helm_client_tag<v3.0.0.
|
||||
Default: false
|
||||
|
||||
_`prometheus_adapter_enabled`
|
||||
Enable installation of cluster custom metrics provided by the
|
||||
stable/prometheus-adapter helm chart. This service depends on
|
||||
monitoring_enabled.
|
||||
prometheus-community/prometheus-adapter helm chart.
|
||||
This service depends on monitoring_enabled.
|
||||
Default: true
|
||||
|
||||
To control deployed versions, extra labels are available:
|
||||
|
|
@ -55,14 +55,17 @@ _`metrics_server_chart_tag`
|
|||
|
||||
_`prometheus_operator_chart_tag`
|
||||
Add prometheus_operator_chart_tag to select version of the
|
||||
stable/prometheus-operator chart to install. When installing the chart,
|
||||
helm will use the default values of the tag defined and overwrite them based
|
||||
on the prometheus-operator-config ConfigMap currently defined. You must
|
||||
certify that the versions are compatible.
|
||||
prometheus-community/kube-prometheus-stack chart to install.
|
||||
When installing the chart, helm will use the default values of the tag
|
||||
defined and overwrite them based on the prometheus-operator-config
|
||||
ConfigMap currently defined.
|
||||
You must certify that the versions are compatible.
|
||||
Wallaby-default: 14.5.0
|
||||
|
||||
_`prometheus_adapter_chart_tag`
|
||||
The stable/prometheus-adapter helm chart version to use.
|
||||
The prometheus-community/prometheus-adapter helm chart version to use.
|
||||
Train-default: 1.4.0
|
||||
Wallaby-default: 2.12.1
|
||||
|
||||
Full fledged cluster monitoring
|
||||
+++++++++++++++++++++++++++++++
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ prometheus-adapter:
|
|||
repository: ${CONTAINER_INFRA_PREFIX:-docker.io/directxman12/}k8s-prometheus-adapter-${ARCH}
|
||||
priorityClassName: "system-cluster-critical"
|
||||
prometheus:
|
||||
url: http://web.tcp.prometheus-prometheus.kube-system.svc.cluster.local
|
||||
url: http://web.tcp.magnum-kube-prometheus-sta-prometheus.kube-system.svc.cluster.local
|
||||
resources:
|
||||
requests:
|
||||
cpu: 150m
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ set +x
|
|||
. /etc/sysconfig/heat-params
|
||||
set -ex
|
||||
|
||||
CHART_NAME="prometheus-operator"
|
||||
CHART_NAME="kube-prometheus-stack"
|
||||
|
||||
if [ "$(echo ${MONITORING_ENABLED} | tr '[:upper:]' '[:lower:]')" = "true" ]; then
|
||||
echo "Writing ${CHART_NAME} config"
|
||||
|
|
@ -88,7 +88,7 @@ EOF
|
|||
fi
|
||||
|
||||
cat << EOF >> ${HELM_CHART_DIR}/values.yaml
|
||||
prometheus-operator:
|
||||
kube-prometheus-stack:
|
||||
|
||||
defaultRules:
|
||||
rules:
|
||||
|
|
@ -131,7 +131,8 @@ ${APP_INGRESS_BASIC_AUTH_ANNOTATIONS}
|
|||
repository: ${CONTAINER_INFRA_PREFIX:-grafana/}grafana
|
||||
#enabled: ${ENABLE_GRAFANA}
|
||||
sidecar:
|
||||
image: ${CONTAINER_INFRA_PREFIX:-kiwigrid/}k8s-sidecar:0.1.99
|
||||
image:
|
||||
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/kiwigrid/}k8s-sidecar
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
|
|
@ -162,21 +163,10 @@ ${APP_INGRESS_ANNOTATIONS}
|
|||
domain: ${CLUSTER_ROOT_DOMAIN_NAME}
|
||||
root_url: https://${CLUSTER_ROOT_DOMAIN_NAME}/grafana
|
||||
serve_from_sub_path: true
|
||||
paths:
|
||||
data: /var/lib/grafana/data
|
||||
logs: /var/log/grafana
|
||||
plugins: /var/lib/grafana/plugins
|
||||
provisioning: /etc/grafana/provisioning
|
||||
analytics:
|
||||
check_for_updates: true
|
||||
log:
|
||||
mode: console
|
||||
log.console:
|
||||
format: json
|
||||
grafana_net:
|
||||
url: https://grafana.net
|
||||
plugins:
|
||||
- grafana-piechart-panel
|
||||
|
||||
kubeApiServer:
|
||||
tlsConfig:
|
||||
|
|
@ -280,14 +270,11 @@ ${APP_INGRESS_ANNOTATIONS}
|
|||
|
||||
prometheusOperator:
|
||||
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"
|
||||
#priorityClassName: "system-cluster-critical"
|
||||
|
||||
resources: {}
|
||||
# requests:
|
||||
|
|
@ -295,13 +282,11 @@ ${APP_INGRESS_ANNOTATIONS}
|
|||
# memory: 10Mi
|
||||
logFormat: json
|
||||
image:
|
||||
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/coreos/}prometheus-operator
|
||||
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/prometheus-operator/}prometheus-operator
|
||||
configmapReloadImage:
|
||||
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/coreos/}configmap-reload
|
||||
repository: ${CONTAINER_INFRA_PREFIX:-docker.io/jimmidyson/configmap-reload}configmap-reload
|
||||
prometheusConfigReloaderImage:
|
||||
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/coreos/}prometheus-config-reloader
|
||||
hyperkubeImage:
|
||||
repository: ${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube
|
||||
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/prometheus-operator/}prometheus-config-reloader
|
||||
|
||||
prometheus:
|
||||
ingress:
|
||||
|
|
|
|||
|
|
@ -740,8 +740,8 @@ parameters:
|
|||
|
||||
prometheus_operator_chart_tag:
|
||||
type: string
|
||||
description: The stable/prometheus-operator chart version to use.
|
||||
default: v8.12.13
|
||||
description: The prometheus-community/kube-prometheus-stack chart version to use.
|
||||
default: 14.5.0
|
||||
|
||||
prometheus_adapter_enabled:
|
||||
type: boolean
|
||||
|
|
@ -750,8 +750,8 @@ parameters:
|
|||
|
||||
prometheus_adapter_chart_tag:
|
||||
type: string
|
||||
description: The stable/prometheus-adapter chart version to use.
|
||||
default: 1.4.0
|
||||
description: The prometheus-community/prometheus-adapter chart version to use.
|
||||
default: 2.12.1
|
||||
|
||||
prometheus_adapter_configmap:
|
||||
type: string
|
||||
|
|
|
|||
|
|
@ -750,8 +750,8 @@ parameters:
|
|||
|
||||
prometheus_operator_chart_tag:
|
||||
type: string
|
||||
description: The stable/prometheus-operator chart version to use.
|
||||
default: v8.12.13
|
||||
description: The prometheus-community/kube-prometheus-stack chart version to use.
|
||||
default: 14.5.0
|
||||
|
||||
prometheus_adapter_enabled:
|
||||
type: boolean
|
||||
|
|
@ -760,8 +760,8 @@ parameters:
|
|||
|
||||
prometheus_adapter_chart_tag:
|
||||
type: string
|
||||
description: The stable/prometheus-adapter chart version to use.
|
||||
default: 1.4.0
|
||||
description: The prometheus-community/prometheus-adapter chart version to use.
|
||||
default: 2.12.1
|
||||
|
||||
prometheus_adapter_configmap:
|
||||
type: string
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
---
|
||||
upgrade:
|
||||
- Prometheus-Adapter helm chart updated to 2.12.1 from 1.4.0.
|
||||
- Prometheus-Operator helm chart updated to kube-prometheus-stack:14.5.0
|
||||
from prometheus-operator:v8.12.13.
|
||||
|
||||
deprecations:
|
||||
- Enabling monitoring using the prometheus_monitoring label is deprecated
|
||||
and will be removed in the X cycle.
|
||||
Loading…
Reference in New Issue