diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index a6b1a35d8c..0e23f88fda 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -1211,11 +1211,6 @@ _`container_infra_prefix` * gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1 * gcr.io/google-containers/hyperkube:v1.12.1 * 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 * docker.io/planetlabs/draino:abf028a * 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: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': * docker.io/k8scloudprovider/cinder-csi-plugin:v1.16.0 * quay.io/k8scsi/csi-attacher:v2.0.0 diff --git a/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh b/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh index 55e50cd790..8953d35fae 100644 --- a/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh +++ b/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh @@ -8,6 +8,7 @@ step="prometheus-adapter" printf "Starting to run ${step}\n" ### Configuration +# This configuration is dependent on the helm installed prometheus-operator. ############################################################################### CHART_NAME="prometheus-adapter" diff --git a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh index 11c3281c8f..0e49e39059 100644 --- a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh +++ b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh @@ -176,6 +176,19 @@ data: 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" + + resources: {} + # requests: + # cpu: 5m + # memory: 10Mi image: repository: ${CONTAINER_INFRA_PREFIX:-quay.io/coreos/}prometheus-operator configmapReloadImage: @@ -183,7 +196,7 @@ data: prometheusConfigReloaderImage: repository: ${CONTAINER_INFRA_PREFIX:-quay.io/coreos/}prometheus-config-reloader hyperkubeImage: - repository: ${CONTAINER_INFRA_PREFIX:-gcr.io/google-containers/}hyperkube + repository: ${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube prometheus: prometheusSpec: @@ -192,6 +205,8 @@ data: image: repository: ${CONTAINER_INFRA_PREFIX:-quay.io/prometheus/}prometheus retention: 14d + externalLabels: + cluster_uuid: ${CLUSTER_UUID} resources: requests: cpu: ${PROMETHEUS_SERVER_CPU}m diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 04555917ce..a86613f86c 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -691,7 +691,7 @@ parameters: prometheus_operator_chart_tag: type: string description: The stable/prometheus-operator chart version to use. - default: v8.2.2 + default: v8.12.13 prometheus_adapter_enabled: type: boolean diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml index 441f6c585e..88116f722e 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml @@ -468,12 +468,10 @@ parameters: monitoring_enabled: type: boolean description: Enable or disable prometheus-operator monitoring solution. - default: false prometheus_operator_chart_tag: type: string description: The stable/prometheus-operator chart version to use. - default: 5.12.3 prometheus_adapter_enabled: type: boolean diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml index c5fee2ca08..6dd9efa269 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml @@ -699,7 +699,7 @@ parameters: prometheus_operator_chart_tag: type: string description: The stable/prometheus-operator chart version to use. - default: v8.2.2 + default: v8.12.13 prometheus_adapter_enabled: type: boolean diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml index 96ecb6f1bf..78e81da934 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml @@ -472,12 +472,10 @@ parameters: monitoring_enabled: type: boolean description: Enable or disable prometheus-operator monitoring solution. - default: false prometheus_operator_chart_tag: type: string description: The stable/prometheus-operator chart version to use. - default: 5.12.3 prometheus_adapter_enabled: type: boolean diff --git a/releasenotes/notes/update_prometheus_monitoring-342a86f826be6579.yaml b/releasenotes/notes/update_prometheus_monitoring-342a86f826be6579.yaml new file mode 100644 index 0000000000..41456fbb22 --- /dev/null +++ b/releasenotes/notes/update_prometheus_monitoring-342a86f826be6579.yaml @@ -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.