easzlab
/
kubeasz
mirror of https://github.com/easzlab/kubeasz.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update kube-prometheus-stack-39.11.0

pull/1186/head
jin.gjm 2022-09-09 13:55:42 +08:00
parent 885c28dcac
commit fe63fdf186
5 changed files with 53 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/guide/prometheus.md
View File

@ -6,7 +6,8 @@
kubeasz 集成安装 kubeasz 集成安装
- 1.修改 /etc/kubeasz/clusters/xxxx/config.yml 中配置项 prom_install: "yes" - 1.修改 /etc/kubeasz/clusters/xxxx/config.yml 中配置项 prom_install: "yes"
- 2.安装 /etc/kubeasz/ezctl setup xxxx 07 - 2.下载镜像 /etc/kubeasz/ezdown -X
- 3.安装 /etc/kubeasz/ezctl setup xxxx 07
生成的charts自定义配置在/etc/kubeasz/clusters/xxxx/yml/prom-values.yaml 生成的charts自定义配置在/etc/kubeasz/clusters/xxxx/yml/prom-values.yaml

58
ezdown
View File

@ -34,7 +34,7 @@ pauseVer=3.8
ciliumVer=1.11.6 ciliumVer=1.11.6
flannelVer=v0.15.1 flannelVer=v0.15.1
nfsProvisionerVer=v4.0.2 nfsProvisionerVer=v4.0.2
promChartVer=35.5.1 promChartVer=39.11.0
# images not downloaded # images not downloaded
kubeRouterVer=v0.3.1 kubeRouterVer=v0.3.1
@ -441,46 +441,46 @@ function get_extra_images() {
# prometheus chart # prometheus chart
if [[ ! -f "$imageDir/prometheus-chart_$promChartVer.tar" ]];then if [[ ! -f "$imageDir/prometheus-chart_$promChartVer.tar" ]];then
docker pull easzlab/kube-state-metrics:v2.4.1 && \ docker pull easzlab/kube-state-metrics:v2.5.0 && \
docker pull easzlab/kube-webhook-certgen:v1.1.1 && \ docker pull easzlab/kube-webhook-certgen:v1.2.0 && \
docker pull grafana/grafana:8.5.3 && \ docker pull grafana/grafana:9.0.5 && \
docker pull quay.io/kiwigrid/k8s-sidecar:1.15.6 && \ docker pull quay.io/kiwigrid/k8s-sidecar:1.19.2 && \
docker pull quay.io/prometheus-operator/prometheus-config-reloader:v0.56.3 && \ docker pull quay.io/prometheus-operator/prometheus-config-reloader:v0.58.0 && \
docker pull quay.io/prometheus-operator/prometheus-operator:v0.56.3 && \ docker pull quay.io/prometheus-operator/prometheus-operator:v0.58.0 && \
docker pull quay.io/prometheus/alertmanager:v0.24.0 && \ docker pull quay.io/prometheus/alertmanager:v0.24.0 && \
docker pull quay.io/prometheus/node-exporter:v1.3.1 && \ docker pull quay.io/prometheus/node-exporter:v1.3.1 && \
docker pull quay.io/prometheus/prometheus:v2.35.0 && \ docker pull quay.io/prometheus/prometheus:v2.37.0 && \
docker save -o "$imageDir/prometheus-chart_$promChartVer.tar" \ docker save -o "$imageDir/prometheus-chart_$promChartVer.tar" \
easzlab/kube-state-metrics:v2.4.1 \ easzlab/kube-state-metrics:v2.5.0 \
easzlab/kube-webhook-certgen:v1.1.1 \ easzlab/kube-webhook-certgen:v1.2.0 \
grafana/grafana:8.5.3 \ grafana/grafana:9.0.5 \
quay.io/kiwigrid/k8s-sidecar:1.15.6 \ quay.io/kiwigrid/k8s-sidecar:1.19.2 \
quay.io/prometheus-operator/prometheus-config-reloader:v0.56.3 \ quay.io/prometheus-operator/prometheus-config-reloader:v0.58.0 \
quay.io/prometheus-operator/prometheus-operator:v0.56.3 \ quay.io/prometheus-operator/prometheus-operator:v0.58.0 \
quay.io/prometheus/alertmanager:v0.24.0 \ quay.io/prometheus/alertmanager:v0.24.0 \
quay.io/prometheus/node-exporter:v1.3.1 \ quay.io/prometheus/node-exporter:v1.3.1 \
quay.io/prometheus/prometheus:v2.35.0 quay.io/prometheus/prometheus:v2.37.0
else else
docker load -i "$imageDir/prometheus-chart_$promChartVer.tar" docker load -i "$imageDir/prometheus-chart_$promChartVer.tar"
fi fi
docker tag easzlab/kube-state-metrics:v2.4.1 easzlab.io.local:5000/prometheus/kube-state-metrics:v2.4.1 docker tag easzlab/kube-state-metrics:v2.5.0 easzlab.io.local:5000/prometheus/kube-state-metrics:v2.5.0
docker push easzlab.io.local:5000/prometheus/kube-state-metrics:v2.4.1 docker push easzlab.io.local:5000/prometheus/kube-state-metrics:v2.5.0
docker tag easzlab/kube-webhook-certgen:v1.1.1 easzlab.io.local:5000/prometheus/kube-webhook-certgen:v1.1.1 docker tag easzlab/kube-webhook-certgen:v1.2.0 easzlab.io.local:5000/prometheus/kube-webhook-certgen:v1.2.0
docker push easzlab.io.local:5000/prometheus/kube-webhook-certgen:v1.1.1 docker push easzlab.io.local:5000/prometheus/kube-webhook-certgen:v1.2.0
docker tag grafana/grafana:8.5.3 easzlab.io.local:5000/prometheus/grafana:8.5.3 docker tag grafana/grafana:9.0.5 easzlab.io.local:5000/prometheus/grafana:9.0.5
docker push easzlab.io.local:5000/prometheus/grafana:8.5.3 docker push easzlab.io.local:5000/prometheus/grafana:9.0.5
docker tag quay.io/kiwigrid/k8s-sidecar:1.15.6 easzlab.io.local:5000/prometheus/k8s-sidecar:1.15.6 docker tag quay.io/kiwigrid/k8s-sidecar:1.19.2 easzlab.io.local:5000/prometheus/k8s-sidecar:1.19.2
docker push easzlab.io.local:5000/prometheus/k8s-sidecar:1.15.6 docker push easzlab.io.local:5000/prometheus/k8s-sidecar:1.19.2
docker tag quay.io/prometheus-operator/prometheus-config-reloader:v0.56.3 easzlab.io.local:5000/prometheus/prometheus-config-reloader:v0.56.3 docker tag quay.io/prometheus-operator/prometheus-config-reloader:v0.58.0 easzlab.io.local:5000/prometheus/prometheus-config-reloader:v0.58.0
docker push easzlab.io.local:5000/prometheus/prometheus-config-reloader:v0.56.3 docker push easzlab.io.local:5000/prometheus/prometheus-config-reloader:v0.58.0
docker tag quay.io/prometheus-operator/prometheus-operator:v0.56.3 easzlab.io.local:5000/prometheus/prometheus-operator:v0.56.3 docker tag quay.io/prometheus-operator/prometheus-operator:v0.58.0 easzlab.io.local:5000/prometheus/prometheus-operator:v0.58.0
docker push easzlab.io.local:5000/prometheus/prometheus-operator:v0.56.3 docker push easzlab.io.local:5000/prometheus/prometheus-operator:v0.58.0
docker tag quay.io/prometheus/alertmanager:v0.24.0 easzlab.io.local:5000/prometheus/alertmanager:v0.24.0 docker tag quay.io/prometheus/alertmanager:v0.24.0 easzlab.io.local:5000/prometheus/alertmanager:v0.24.0
docker push easzlab.io.local:5000/prometheus/alertmanager:v0.24.0 docker push easzlab.io.local:5000/prometheus/alertmanager:v0.24.0
docker tag quay.io/prometheus/node-exporter:v1.3.1 easzlab.io.local:5000/prometheus/node-exporter:v1.3.1 docker tag quay.io/prometheus/node-exporter:v1.3.1 easzlab.io.local:5000/prometheus/node-exporter:v1.3.1
docker push easzlab.io.local:5000/prometheus/node-exporter:v1.3.1 docker push easzlab.io.local:5000/prometheus/node-exporter:v1.3.1
docker tag quay.io/prometheus/prometheus:v2.35.0 easzlab.io.local:5000/prometheus/prometheus:v2.35.0 docker tag quay.io/prometheus/prometheus:v2.37.0 easzlab.io.local:5000/prometheus/prometheus:v2.37.0
docker push easzlab.io.local:5000/prometheus/prometheus:v2.35.0 docker push easzlab.io.local:5000/prometheus/prometheus:v2.37.0
} }
function download_all() { function download_all() {

BIN
roles/cluster-addon/files/kube-prometheus-stack-35.5.1.tgz
View File

Binary file not shown.

BIN
roles/cluster-addon/files/kube-prometheus-stack-39.11.0.tgz 100644
View File

Binary file not shown.

47
roles/cluster-addon/templates/prometheus/values.yaml.j2
View File

@ -1,21 +1,13 @@
## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6 ## Provide a k8s version to auto dashboard import script example: kubeTargetVersionOverride: 1.16.6
kubeTargetVersionOverride: "{{ K8S_VER }}" kubeTargetVersionOverride: "{{ K8S_VER }}"
## Configuration for alertmanager
alertmanager: alertmanager:
enabled: true enabled: true
#config:
# route:
# receiver: dingtalk
# receivers:
# - name: dingtalk
# webhook_configs:
# - send_resolved: false
# url: http://webhook-dingtalk.monitor.svc.cluster.local:8060/dingtalk/webhook1/send
alertmanagerSpec: alertmanagerSpec:
image: image:
repository: easzlab.io.local:5000/prometheus/alertmanager repository: easzlab.io.local:5000/prometheus/alertmanager
## Configuration for Alertmanager service
service: service:
nodePort: 30902 nodePort: 30902
type: NodePort type: NodePort
@ -34,6 +26,7 @@ grafana:
repository: easzlab.io.local:5000/prometheus/k8s-sidecar repository: easzlab.io.local:5000/prometheus/k8s-sidecar
skipTlsVerify: true skipTlsVerify: true
## Component scraping the kube api server ## Component scraping the kube api server
kubeApiServer: kubeApiServer:
enabled: true enabled: true
@ -76,7 +69,6 @@ kubeEtcd:
certFile: /etc/prometheus/secrets/etcd-client-cert/etcd-client certFile: /etc/prometheus/secrets/etcd-client-cert/etcd-client
keyFile: /etc/prometheus/secrets/etcd-client-cert/etcd-client-key keyFile: /etc/prometheus/secrets/etcd-client-cert/etcd-client-key
## Component scraping kube scheduler ## Component scraping kube scheduler
kubeScheduler: kubeScheduler:
enabled: true enabled: true
@ -104,17 +96,30 @@ kubeProxy:
{% endif %} {% endif %}
{% endfor %} {% endfor %}
kubeStateMetrics:
enabled: true
## Configuration for kube-state-metrics subchart ## Configuration for kube-state-metrics subchart
kube-state-metrics: kube-state-metrics:
image: image:
repository: easzlab.io.local:5000/prometheus/kube-state-metrics repository: easzlab.io.local:5000/prometheus/kube-state-metrics
## Deploy node exporter as a daemonset to all nodes
nodeExporter:
enabled: true
## Configuration for prometheus-node-exporter subchart
prometheus-node-exporter:
image:
repository: easzlab.io.local:5000/prometheus/node-exporter
## Manages Prometheus and Alertmanager components ## Manages Prometheus and Alertmanager components
prometheusOperator: prometheusOperator:
enabled: true enabled: true
admissionWebhooks: admissionWebhooks:
enabled: true enabled: true
patch: patch:
enabled: true
image: image:
repository: easzlab.io.local:5000/prometheus/kube-webhook-certgen repository: easzlab.io.local:5000/prometheus/kube-webhook-certgen
image: image:
@ -130,8 +135,6 @@ prometheusOperator:
## Deploy a Prometheus instance ## Deploy a Prometheus instance
prometheus: prometheus:
enabled: true enabled: true
## Configuration for Prometheus service
service: service:
nodePort: 30901 nodePort: 30901
type: NodePort type: NodePort
@ -140,27 +143,7 @@ prometheus:
image: image:
repository: easzlab.io.local:5000/prometheus/prometheus repository: easzlab.io.local:5000/prometheus/prometheus
replicas: 1 replicas: 1
secrets: secrets:
- etcd-client-cert - etcd-client-cert
storageSpec: {} storageSpec: {}
## Using PersistentVolumeClaim
##
# volumeClaimTemplate:
# spec:
# storageClassName: gluster
# accessModes: ["ReadWriteOnce"]
# resources:
# requests:
# storage: 50Gi
# selector: {}
## Using tmpfs volume
##
# emptyDir:
# medium: Memory
prometheus-node-exporter:
image:
repository: easzlab.io.local:5000/prometheus/node-exporter