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-45.23.0

pull/1282/head
gjmzj 2023-05-02 16:40:50 +08:00
parent 890aff2ead
commit 97f3eac8ea
4 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ezdown
View File

@ -34,7 +34,7 @@ pauseVer=3.9
ciliumVer=1.13.2 ciliumVer=1.13.2
flannelVer=v0.21.4 flannelVer=v0.21.4
nfsProvisionerVer=v4.0.2 nfsProvisionerVer=v4.0.2
promChartVer=39.11.0 promChartVer=45.23.0
# images not downloaded # images not downloaded
kubeRouterVer=v0.3.1 kubeRouterVer=v0.3.1
@ -447,46 +447,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.5.0 && \ docker pull easzlab/kube-state-metrics:v2.8.2 && \
docker pull easzlab/kube-webhook-certgen:v1.2.0 && \ docker pull easzlab/kube-webhook-certgen:v1.5.1 && \
docker pull grafana/grafana:9.0.5 && \ docker pull grafana/grafana:9.4.7 && \
docker pull quay.io/kiwigrid/k8s-sidecar:1.19.2 && \ docker pull quay.io/kiwigrid/k8s-sidecar:1.22.0 && \
docker pull quay.io/prometheus-operator/prometheus-config-reloader:v0.58.0 && \ docker pull quay.io/prometheus-operator/prometheus-config-reloader:v0.63.0 && \
docker pull quay.io/prometheus-operator/prometheus-operator:v0.58.0 && \ docker pull quay.io/prometheus-operator/prometheus-operator:v0.63.0 && \
docker pull quay.io/prometheus/alertmanager:v0.24.0 && \ docker pull quay.io/prometheus/alertmanager:v0.25.0 && \
docker pull quay.io/prometheus/node-exporter:v1.3.1 && \ docker pull quay.io/prometheus/node-exporter:v1.5.0 && \
docker pull quay.io/prometheus/prometheus:v2.37.0 && \ docker pull quay.io/prometheus/prometheus:v2.42.0 && \
docker save -o "$imageDir/prometheus-chart_$promChartVer.tar" \ docker save -o "$imageDir/prometheus-chart_$promChartVer.tar" \
easzlab/kube-state-metrics:v2.5.0 \ easzlab/kube-state-metrics:v2.8.2 \
easzlab/kube-webhook-certgen:v1.2.0 \ easzlab/kube-webhook-certgen:v1.5.1 \
grafana/grafana:9.0.5 \ grafana/grafana:9.4.7 \
quay.io/kiwigrid/k8s-sidecar:1.19.2 \ quay.io/kiwigrid/k8s-sidecar:1.22.0 \
quay.io/prometheus-operator/prometheus-config-reloader:v0.58.0 \ quay.io/prometheus-operator/prometheus-config-reloader:v0.63.0 \
quay.io/prometheus-operator/prometheus-operator:v0.58.0 \ quay.io/prometheus-operator/prometheus-operator:v0.63.0 \
quay.io/prometheus/alertmanager:v0.24.0 \ quay.io/prometheus/alertmanager:v0.25.0 \
quay.io/prometheus/node-exporter:v1.3.1 \ quay.io/prometheus/node-exporter:v1.5.0 \
quay.io/prometheus/prometheus:v2.37.0 quay.io/prometheus/prometheus:v2.42.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.5.0 easzlab.io.local:5000/prometheus/kube-state-metrics:v2.5.0 docker tag easzlab/kube-state-metrics:v2.8.2 easzlab.io.local:5000/prometheus/kube-state-metrics:v2.8.2
docker push easzlab.io.local:5000/prometheus/kube-state-metrics:v2.5.0 docker push easzlab.io.local:5000/prometheus/kube-state-metrics:v2.8.2
docker tag easzlab/kube-webhook-certgen:v1.2.0 easzlab.io.local:5000/prometheus/kube-webhook-certgen:v1.2.0 docker tag easzlab/kube-webhook-certgen:v1.5.1 easzlab.io.local:5000/prometheus/kube-webhook-certgen:v1.5.1
docker push easzlab.io.local:5000/prometheus/kube-webhook-certgen:v1.2.0 docker push easzlab.io.local:5000/prometheus/kube-webhook-certgen:v1.5.1
docker tag grafana/grafana:9.0.5 easzlab.io.local:5000/prometheus/grafana:9.0.5 docker tag grafana/grafana:9.4.7 easzlab.io.local:5000/prometheus/grafana:9.4.7
docker push easzlab.io.local:5000/prometheus/grafana:9.0.5 docker push easzlab.io.local:5000/prometheus/grafana:9.4.7
docker tag quay.io/kiwigrid/k8s-sidecar:1.19.2 easzlab.io.local:5000/prometheus/k8s-sidecar:1.19.2 docker tag quay.io/kiwigrid/k8s-sidecar:1.22.0 easzlab.io.local:5000/prometheus/k8s-sidecar:1.22.0
docker push easzlab.io.local:5000/prometheus/k8s-sidecar:1.19.2 docker push easzlab.io.local:5000/prometheus/k8s-sidecar:1.22.0
docker tag quay.io/prometheus-operator/prometheus-config-reloader:v0.58.0 easzlab.io.local:5000/prometheus/prometheus-config-reloader:v0.58.0 docker tag quay.io/prometheus-operator/prometheus-config-reloader:v0.63.0 easzlab.io.local:5000/prometheus/prometheus-config-reloader:v0.63.0
docker push easzlab.io.local:5000/prometheus/prometheus-config-reloader:v0.58.0 docker push easzlab.io.local:5000/prometheus/prometheus-config-reloader:v0.63.0
docker tag quay.io/prometheus-operator/prometheus-operator:v0.58.0 easzlab.io.local:5000/prometheus/prometheus-operator:v0.58.0 docker tag quay.io/prometheus-operator/prometheus-operator:v0.63.0 easzlab.io.local:5000/prometheus/prometheus-operator:v0.63.0
docker push easzlab.io.local:5000/prometheus/prometheus-operator:v0.58.0 docker push easzlab.io.local:5000/prometheus/prometheus-operator:v0.63.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.25.0 easzlab.io.local:5000/prometheus/alertmanager:v0.25.0
docker push easzlab.io.local:5000/prometheus/alertmanager:v0.24.0 docker push easzlab.io.local:5000/prometheus/alertmanager:v0.25.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.5.0 easzlab.io.local:5000/prometheus/node-exporter:v1.5.0
docker push easzlab.io.local:5000/prometheus/node-exporter:v1.3.1 docker push easzlab.io.local:5000/prometheus/node-exporter:v1.5.0
docker tag quay.io/prometheus/prometheus:v2.37.0 easzlab.io.local:5000/prometheus/prometheus:v2.37.0 docker tag quay.io/prometheus/prometheus:v2.42.0 easzlab.io.local:5000/prometheus/prometheus:v2.42.0
docker push easzlab.io.local:5000/prometheus/prometheus:v2.37.0 docker push easzlab.io.local:5000/prometheus/prometheus:v2.42.0
} }
function download_all() { function download_all() {

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

Binary file not shown.

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

Binary file not shown.

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

@ -3,11 +3,9 @@ kubeTargetVersionOverride: "{{ K8S_VER }}"
## Configuration for alertmanager ## Configuration for alertmanager
alertmanager: alertmanager:
enabled: true
alertmanagerSpec: alertmanagerSpec:
image: image:
repository: easzlab.io.local:5000/prometheus/alertmanager registry: easzlab.io.local:5000
service: service:
nodePort: 30902 nodePort: 30902
type: NodePort type: NodePort
@ -15,6 +13,7 @@ alertmanager:
## Using default values from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml ## Using default values from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
grafana: grafana:
enabled: true enabled: true
adminUser: admin
adminPassword: Admin1234! adminPassword: Admin1234!
image: image:
repository: easzlab.io.local:5000/prometheus/grafana repository: easzlab.io.local:5000/prometheus/grafana
@ -61,6 +60,9 @@ kubeEtcd:
{% for h in groups['etcd'] %} {% for h in groups['etcd'] %}
- {{ h }} - {{ h }}
{% endfor %} {% endfor %}
service:
port: 2379
targetPort: 2379
serviceMonitor: serviceMonitor:
scheme: https scheme: https
insecureSkipVerify: true insecureSkipVerify: true
@ -102,16 +104,14 @@ kubeStateMetrics:
## 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 registry: easzlab.io.local:5000
repository: prometheus/kube-state-metrics
## Deploy node exporter as a daemonset to all nodes
nodeExporter:
enabled: true
## Configuration for prometheus-node-exporter subchart ## Configuration for prometheus-node-exporter subchart
prometheus-node-exporter: prometheus-node-exporter:
image: image:
repository: easzlab.io.local:5000/prometheus/node-exporter registry: easzlab.io.local:5000
repository: prometheus/node-exporter
## Manages Prometheus and Alertmanager components ## Manages Prometheus and Alertmanager components
prometheusOperator: prometheusOperator:
@ -121,16 +121,20 @@ prometheusOperator:
patch: patch:
enabled: true enabled: true
image: image:
repository: easzlab.io.local:5000/prometheus/kube-webhook-certgen registry: easzlab.io.local:5000
repository: prometheus/kube-webhook-certgen
tag: v1.5.1
image: image:
repository: easzlab.io.local:5000/prometheus/prometheus-operator registry: easzlab.io.local:5000
repository: prometheus/prometheus-operator
service: service:
nodePort: 30899 nodePort: 30899
nodePortTls: 30900 nodePortTls: 30900
type: NodePort type: NodePort
prometheusConfigReloader: prometheusConfigReloader:
image: image:
repository: easzlab.io.local:5000/prometheus/prometheus-config-reloader registry: easzlab.io.local:5000
repository: prometheus/prometheus-config-reloader
## Deploy a Prometheus instance ## Deploy a Prometheus instance
prometheus: prometheus:
@ -141,7 +145,7 @@ prometheus:
prometheusSpec: prometheusSpec:
image: image:
repository: easzlab.io.local:5000/prometheus/prometheus registry: easzlab.io.local:5000
replicas: 1 replicas: 1
secrets: secrets:
- etcd-client-cert - etcd-client-cert