UCP: support monitor mount external configuration #2294
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| # Source: tidb-cluster/templates/monitor-configmap.yaml | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: external-config | ||
| labels: | ||
| app.kubernetes.io/name: tidb-cluster | ||
| app.kubernetes.io/managed-by: Helm | ||
| app.kubernetes.io/instance: test | ||
| app.kubernetes.io/component: monitor | ||
| helm.sh/chart: tidb-cluster-dev | ||
| data: | ||
| prometheus-config: |- | ||
| global: | ||
| scrape_interval: 15s | ||
| evaluation_interval: 15s | ||
| scrape_configs: | ||
| - job_name: 'pd' | ||
| scrape_interval: 15s | ||
| honor_labels: true | ||
| kubernetes_sd_configs: | ||
| - role: pod | ||
| namespaces: | ||
| names: | ||
| - default | ||
| scheme: http | ||
| tls_config: | ||
| insecure_skip_verify: true | ||
| relabel_configs: | ||
| - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance] | ||
| action: keep | ||
| regex: test | ||
| - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_component] | ||
| action: keep | ||
| regex: pd | ||
| - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape] | ||
| action: keep | ||
| regex: true | ||
| - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path] | ||
| action: replace | ||
| target_label: __metrics_path__ | ||
| regex: (.+) | ||
| - source_labels: [__meta_kubernetes_pod_name, __meta_kubernetes_pod_label_app_kubernetes_io_instance, | ||
| __meta_kubernetes_pod_annotation_prometheus_io_port] | ||
| regex: (.+);(.+);(.+) | ||
| target_label: __address__ | ||
| replacement: $1.$2-pd-peer:$3 | ||
| action: replace | ||
| - source_labels: [__meta_kubernetes_namespace] | ||
| action: replace | ||
| target_label: kubernetes_namespace | ||
| - source_labels: [__meta_kubernetes_pod_node_name] | ||
| action: replace | ||
| target_label: kubernetes_node | ||
| - source_labels: [__meta_kubernetes_pod_ip] | ||
| action: replace | ||
| target_label: kubernetes_pod_ip | ||
| - source_labels: [__meta_kubernetes_pod_name] | ||
| action: replace | ||
| target_label: instance | ||
| - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance] | ||
| action: replace | ||
| target_label: cluster | ||
| - job_name: 'tidb' | ||
| scrape_interval: 15s | ||
| honor_labels: true | ||
| kubernetes_sd_configs: | ||
| - role: pod | ||
| namespaces: | ||
| names: | ||
| - default | ||
| scheme: http | ||
| tls_config: | ||
| insecure_skip_verify: true | ||
| relabel_configs: | ||
| - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance] | ||
| action: keep | ||
| regex: test | ||
| - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_component] | ||
| action: keep | ||
| regex: tidb | ||
| - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape] | ||
| action: keep | ||
| regex: true | ||
| - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path] | ||
| action: replace | ||
| target_label: __metrics_path__ | ||
| regex: (.+) | ||
| - source_labels: [__meta_kubernetes_pod_name, __meta_kubernetes_pod_label_app_kubernetes_io_instance, | ||
| __meta_kubernetes_pod_annotation_prometheus_io_port] | ||
| regex: (.+);(.+);(.+) | ||
| target_label: __address__ | ||
| replacement: $1.$2-tidb-peer:$3 | ||
| action: replace | ||
| - source_labels: [__meta_kubernetes_namespace] | ||
| action: replace | ||
| target_label: kubernetes_namespace | ||
| - source_labels: [__meta_kubernetes_pod_node_name] | ||
| action: replace | ||
| target_label: kubernetes_node | ||
| - source_labels: [__meta_kubernetes_pod_ip] | ||
| action: replace | ||
| target_label: kubernetes_pod_ip | ||
| - source_labels: [__meta_kubernetes_pod_name] | ||
| action: replace | ||
| target_label: instance | ||
| - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance] | ||
| action: replace | ||
| target_label: cluster | ||
| - job_name: 'tikv' | ||
| scrape_interval: 15s | ||
| honor_labels: true | ||
| kubernetes_sd_configs: | ||
| - role: pod | ||
| namespaces: | ||
| names: | ||
| - default | ||
| scheme: http | ||
| tls_config: | ||
| insecure_skip_verify: true | ||
| # TiKV doesn't support scheme https for now. | ||
| # And we should fix it after TiKV fix this issue: https://github.com/tikv/tikv/issues/5340 | ||
| # | ||
| # scheme: http | ||
| # tls_config: | ||
| # insecure_skip_verify: true | ||
| # | ||
| relabel_configs: | ||
| - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance] | ||
| action: keep | ||
| regex: test | ||
| - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_component] | ||
| action: keep | ||
| regex: tikv | ||
| - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape] | ||
| action: keep | ||
| regex: true | ||
| - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path] | ||
| action: replace | ||
| target_label: __metrics_path__ | ||
| regex: (.+) | ||
| - source_labels: [__meta_kubernetes_pod_name, __meta_kubernetes_pod_label_app_kubernetes_io_instance, | ||
| __meta_kubernetes_pod_annotation_prometheus_io_port] | ||
| regex: (.+);(.+);(.+) | ||
| target_label: __address__ | ||
| replacement: $1.$2-tikv-peer:$3 | ||
| action: replace | ||
| - source_labels: [__meta_kubernetes_namespace] | ||
| action: replace | ||
| target_label: kubernetes_namespace | ||
| - source_labels: [__meta_kubernetes_pod_node_name] | ||
| action: replace | ||
| target_label: kubernetes_node | ||
| - source_labels: [__meta_kubernetes_pod_ip] | ||
| action: replace | ||
| target_label: kubernetes_pod_ip | ||
| - source_labels: [__meta_kubernetes_pod_name] | ||
| action: replace | ||
| target_label: instance | ||
| - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance] | ||
| action: replace | ||
| target_label: cluster | ||
| rule_files: | ||
| - '/prometheus-rules/rules/*.rules.yml' | ||
|
|
||
| dashboard-config: |- | ||
| { | ||
| "apiVersion": 1, | ||
| "providers": [ | ||
| { | ||
| "folder": "", | ||
| "name": "0", | ||
| "options": { | ||
| "path": "/grafana-dashboard-definitions/tidb" | ||
|
There was a problem hiding this comment. How to support additional dashboards for tidb monitor in this pr? We should support this as well There was a problem hiding this comment. It seems we could also export grafana config in the configmap. There was a problem hiding this comment. If we support custom dashboards by configMap , we will need to append extra configMap to volumes and VolumeMounts . reference tidb-operator/pkg/monitor/monitor/util.go Line 312 in 7ccb528 And I think users can dynamically add dashboard in Grafana.So, this feature is not important. |
||
| }, | ||
| "orgId": 1, | ||
| "type": "file" | ||
| } | ||
| ] | ||
| } | ||
| start-command: |- | ||
|
There was a problem hiding this comment. IMO the This approach is more recommended since it can help specify something other than the start commands for Prometheus, like env vars, volumes, etc There was a problem hiding this comment. I have only support command field patch in container, other field patch I think is not important now. |
||
| /bin/prometheus | ||
| --web.enable-admin-api | ||
| --web.enable-lifecycle | ||
| --log.level=info | ||
| --config.file=/etc/prometheus/prometheus.yml | ||
| --storage.tsdb.path=/data/prometheus | ||
| --storage.tsdb.retention=12d | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,6 +79,13 @@ type PrometheusSpec struct { | |
| Service ServiceSpec `json:"service,omitempty"` | ||
| // +optional | ||
| ReserveDays int `json:"reserveDays,omitempty"` | ||
|
There was a problem hiding this comment. @Yisaer Not related to this pr, but I am curious about this field. So we only support retention with unit There was a problem hiding this comment. I think you are right. Maybe we would create a new proper property for this in the future. There was a problem hiding this comment. I have support custom command ,so I think |
||
| // +optional | ||
| Config *Configuration `json:"config,omitempty"` | ||
| } | ||
|
|
||
| // Config is the the desired state of Prometheus Configuration | ||
mikechengwei marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| type Configuration struct { | ||
|
There was a problem hiding this comment. I think only |
||
| ExternalConfigMap string `json:"externalConfigMap,omitempty"` | ||
|
There was a problem hiding this comment. What about use |
||
| } | ||
|
|
||
| // GrafanaSpec is the desired state of grafana | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the difference between this configuration and the configuration auto-generated by tidbmonitor? I don't think we should make mounting external configuration as the default choice for tidbmonitor.