Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/http-service/examples/create-cluster.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"port":4000
},
"prometheus":{
"version":"v2.27.1",
"version":"v3.5.0",
"resource":{
"cpu":2,
"memory":4
Expand Down
4 changes: 2 additions & 2 deletions cmd/http-service/idl/api/service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ message Prometheus {

string version = 1 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
description: "The version of the Prometheus. Only official versions are supported now.",
example: "\"v2.27.1\""
example: "\"v3.5.0\""
}];
Resource resource = 2 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {description: "The resource of the Prometheus."}];
map<string, string> config = 3 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
Expand Down Expand Up @@ -679,7 +679,7 @@ message PrometheusStatus {

string version = 1 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
description: "The version of the Prometheus component.",
example: "\"v2.27.1\""
example: "\"v3.5.0\""
}];
Resource resource = 2 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {description: "The resource of the Prometheus component."}];
map<string, string> config = 3 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {description: "The command options config of the Prometheus. ref https://prometheus.io/docs/prometheus/latest/command-line/prometheus/"}];
Expand Down
2 changes: 1 addition & 1 deletion cmd/http-service/pbgen/oas/openapi-spec.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@
"properties": {
"version": {
"type": "string",
"example": "v2.27.1",
"example": "v3.5.0",
"description": "The version of the Prometheus. Only official versions are supported now."
},
"resource": {
Expand Down
4 changes: 2 additions & 2 deletions deploy/aliyun/manifests/db-monitor.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
service:
portName: http-prometheus
type: NodePort
version: v2.27.1
version: v3.5.0
reloader:
baseImage: pingcap/tidb-monitor-reloader
imagePullPolicy: IfNotPresent
Expand All @@ -82,7 +82,7 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
storage: 100Gi
storageClassName: alicloud-disk-available
tolerations: []
Expand Down
4 changes: 2 additions & 2 deletions deploy/aws/manifests/db-monitor.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
service:
portName: http-prometheus
type: NodePort
version: v2.27.1
version: v3.5.0
reloader:
baseImage: pingcap/tidb-monitor-reloader
imagePullPolicy: IfNotPresent
Expand All @@ -80,7 +80,7 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
storage: 100Gi
storageClassName: ebs-gp2
tolerations: []
Expand Down
4 changes: 2 additions & 2 deletions deploy/gcp/manifests/db-monitor.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
service:
portName: http-prometheus
type: NodePort
version: v2.27.1
version: v3.5.0
reloader:
baseImage: pingcap/tidb-monitor-reloader
imagePullPolicy: IfNotPresent
Expand All @@ -80,7 +80,7 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
storage: 100Gi
storageClassName: pd-ssd
tolerations: []
4 changes: 2 additions & 2 deletions examples/Runbooks/EKS/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
service:
portName: http-prometheus
type: NodePort
version: v2.27.1
version: v3.5.0
reloader:
baseImage: pingcap/tidb-monitor-reloader
imagePullPolicy: IfNotPresent
Expand All @@ -53,6 +53,6 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
storage: 10Gi
storageClassName: gp2
4 changes: 2 additions & 2 deletions examples/Runbooks/GKE/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
service:
portName: http-prometheus
type: NodePort
version: v2.27.1
version: v3.5.0
reloader:
baseImage: pingcap/tidb-monitor-reloader
imagePullPolicy: IfNotPresent
Expand All @@ -53,6 +53,6 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
storage: 10Gi
storageClassName: gp2
4 changes: 2 additions & 2 deletions examples/Runbooks/K8s/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
service:
portName: http-prometheus
type: NodePort
version: v2.27.1
version: v3.5.0
reloader:
baseImage: pingcap/tidb-monitor-reloader
imagePullPolicy: IfNotPresent
Expand All @@ -53,6 +53,6 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
storage: 10Gi
storageClassName: gp2
6 changes: 3 additions & 3 deletions examples/advanced/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ spec:
## ImagePullPolicy of prometheus.
# imagePullPolicy: IfNotPresent
## Prometheus version.
version: v2.27.1
version: v3.5.0

## Describes the compute resource requirements and limits of Prometheus.
## Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
Expand Down Expand Up @@ -402,7 +402,7 @@ spec:
## ImagePullPolicy of prometheusReloader.
# ImagePullPolicy: IfNotPresent
# PrometheusReloader version.
# version: v0.49.0
# version: v0.85.0
## Describes the compute resource requirements and limits of prometheusReloader.
## Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
# requests:
Expand Down Expand Up @@ -453,7 +453,7 @@ spec:
# # ImagePullPolicy of thanos.
# imagePullPolicy: IfNotPresent
# # Thanos version.
# version: v0.17.2
# version: v0.39.2

## Describes the compute resource requirements and limits of thanos.
## Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
Expand Down
4 changes: 2 additions & 2 deletions examples/aks/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
service:
portName: http-prometheus
type: NodePort
version: v2.27.1
version: v3.5.0
reloader:
baseImage: pingcap/tidb-monitor-reloader
imagePullPolicy: IfNotPresent
Expand All @@ -50,5 +50,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
storage: 100Gi
4 changes: 2 additions & 2 deletions examples/aws/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
service:
portName: http-prometheus
type: NodePort
version: v2.27.1
version: v3.5.0
reloader:
baseImage: pingcap/tidb-monitor-reloader
imagePullPolicy: IfNotPresent
Expand All @@ -53,5 +53,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
storage: 100Gi
4 changes: 2 additions & 2 deletions examples/basic-cn/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
- name: basic
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -19,5 +19,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent
4 changes: 2 additions & 2 deletions examples/basic-storagevolumes/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
- name: basic
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -19,5 +19,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent
4 changes: 2 additions & 2 deletions examples/basic-tls/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
- name: basic-tls
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -19,5 +19,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent
4 changes: 2 additions & 2 deletions examples/basic/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
- name: basic
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -20,5 +20,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent
4 changes: 2 additions & 2 deletions examples/dm/dm-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -17,7 +17,7 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
dm:
clusters:
- name: basic
Expand Down
4 changes: 2 additions & 2 deletions examples/gcp/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
service:
portName: http-prometheus
type: NodePort
version: v2.27.1
version: v3.5.0
reloader:
baseImage: pingcap/tidb-monitor-reloader
imagePullPolicy: IfNotPresent
Expand All @@ -51,5 +51,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
storage: 100Gi
4 changes: 2 additions & 2 deletions examples/heterogeneous-tls/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
- name: heterogeneous
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -20,6 +20,6 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent

4 changes: 2 additions & 2 deletions examples/heterogeneous/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
- name: basic-heterogeneous
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -20,5 +20,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent
4 changes: 2 additions & 2 deletions examples/istio/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
- name: basic
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -20,5 +20,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent
4 changes: 2 additions & 2 deletions examples/monitor-dynamic-configmap/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
namespace: ns2
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -23,5 +23,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent
4 changes: 2 additions & 2 deletions examples/monitor-grafana-secret/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
- name: basic
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -25,5 +25,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent
4 changes: 2 additions & 2 deletions examples/monitor-multiple-cluster-non-tls/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
namespace: ns2
prometheus:
baseImage: prom/prometheus
version: v2.27.1
version: v3.5.0
grafana:
baseImage: grafana/grafana
version: 7.5.11
Expand All @@ -23,5 +23,5 @@ spec:
version: v1.0.1
prometheusReloader:
baseImage: quay.io/prometheus-operator/prometheus-config-reloader
version: v0.49.0
version: v0.85.0
imagePullPolicy: IfNotPresent
Loading