This commit is contained in:
cdllp2 2022-09-20 13:10:09 +08:00
commit d228b8739f
4 changed files with 7 additions and 7 deletions

View File

@ -45,7 +45,7 @@ new_prometheus = [
"quay.io/prometheus-operator/prometheus-operator:v0.46.0",
'quay.io/prometheus-operator/prometheus-operator:v0.56.1',
"k8s.gcr.io/prometheus-adapter/prometheus-adapter:v0.9.1",
'grafana/grafana:7.5.2'
'grafana/grafana:9.1.5'
]
istio=[

View File

@ -105,7 +105,7 @@
},
{
"exemplar": true,
"expr": "sum by (node,namespace,pod) (rate(container_cpu_usage_seconds_total{job=\"kubelet\", image!=\"\",container_name!=\"POD\",pod!=\"\",namespace=~\"pipeline|jupyter|service|katib\"}[1m]))",
"expr": "sum by (node,namespace,pod) (rate(container_cpu_usage_seconds_total{job=\"kubelet\", image!=\"\",container_name!=\"POD\",pod!=\"\",namespace=~\"pipeline|jupyter|service|katib\"}[2m]))",
"format": "table",
"hide": false,
"instant": true,
@ -406,7 +406,7 @@
"targets": [
{
"exemplar": true,
"expr": "sum by (pod) (rate(container_cpu_usage_seconds_total{job=\"kubelet\", image!=\"\",container_name!=\"POD\",pod=~\".*$pod.*\"}[1m]))",
"expr": "sum by (pod) (rate(container_cpu_usage_seconds_total{job=\"kubelet\", image!=\"\",container_name!=\"POD\",pod=~\".*$pod.*\"}[2m]))",
"format": "time_series",
"instant": false,
"interval": "30s",
@ -718,7 +718,7 @@
"targets": [
{
"exemplar": true,
"expr": "sum by (pod) (rate(container_network_receive_bytes_total{job=\"kubelet\", image!=\"\",container_name!=\"POD\",pod=~\".*$pod.*\"}[1m]))",
"expr": "sum by (pod) (rate(container_network_receive_bytes_total{job=\"kubelet\", image!=\"\",container_name!=\"POD\",pod=~\".*$pod.*\"}[2m]))",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
@ -727,7 +727,7 @@
},
{
"exemplar": true,
"expr": "- sum by (pod) (rate(container_network_transmit_bytes_total{job=\"kubelet\", image!=\"\",container_name!=\"POD\",pod=~\".*$pod.*\"}[1m]))",
"expr": "- sum by (pod) (rate(container_network_transmit_bytes_total{job=\"kubelet\", image!=\"\",container_name!=\"POD\",pod=~\".*$pod.*\"}[2m]))",
"format": "time_series",
"interval": "",
"intervalFactor": 1,

View File

@ -26,7 +26,7 @@ spec:
- "true"
containers:
- name: grafana
image: grafana/grafana:7.5.2
image: grafana/grafana:9.1.5
env:
- name: GRAFANA_PORT
value: "3000"

View File

@ -36,7 +36,7 @@ docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-prometheus:v2.
docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-prometheus:v2.3.1 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-prometheus:v2.3.1 quay.io/prometheus/prometheus:v2.3.1 &
docker pull ccr.ccs.tencentyun.com/cube-studio/kubesigs-kube-batch:v0.5 && docker tag ccr.ccs.tencentyun.com/cube-studio/kubesigs-kube-batch:v0.5 kubesigs/kube-batch:v0.5 &
docker pull ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-node-exporter:v0.15.2 && docker tag ccr.ccs.tencentyun.com/cube-studio/quay.io-prometheus-node-exporter:v0.15.2 quay.io/prometheus/node-exporter:v0.15.2 &
docker pull ccr.ccs.tencentyun.com/cube-studio/grafana-grafana:7.5.2 && docker tag ccr.ccs.tencentyun.com/cube-studio/grafana-grafana:7.5.2 grafana/grafana:7.5.2 &
docker pull ccr.ccs.tencentyun.com/cube-studio/grafana-grafana:9.1.5 && docker tag ccr.ccs.tencentyun.com/cube-studio/grafana-grafana:9.1.5 grafana/grafana:9.1.5 &
docker pull ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator && docker tag ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator ccr.ccs.tencentyun.com/cube-studio/kubeflow:training-operator &
docker pull ccr.ccs.tencentyun.com/cube-studio/metacontroller-metacontroller:v0.3.0 && docker tag ccr.ccs.tencentyun.com/cube-studio/metacontroller-metacontroller:v0.3.0 metacontroller/metacontroller:v0.3.0 &
docker pull ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-workflow-controller:v2.12.9-license-compliance && docker tag ccr.ccs.tencentyun.com/cube-studio/gcr.io-ml-pipeline-workflow-controller:v2.12.9-license-compliance gcr.io/ml-pipeline/workflow-controller:v2.12.9-license-compliance &