Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support-Multi-version-TiDB-monitor #666

Merged
merged 11 commits into from
Jul 29, 2019
Merged

Support-Multi-version-TiDB-monitor #666

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4483b15
Multi-version-TiDB-monitor
qiffang Jul 18, 2019
441a686
Multi-version-TiDB-monitor
qiffang Jul 18, 2019
4223832
Multi-version-TiDB-monitor
qiffang Jul 18, 2019
851647d
Multi-version-TiDB-monitor
qiffang Jul 23, 2019
f4f8436
Multi-version-TiDB-monitor
qiffang Jul 23, 2019
31d1092
Multi-version-TiDB-monitor
qiffang Jul 24, 2019
0874edb
Merge branch 'master' into Multi-version-TiDB-monitor
qiffang Jul 24, 2019
a33da70
Multi-version-TiDB-monitor
qiffang Jul 24, 2019
18c72eb
Merge branch 'Multi-version-TiDB-monitor' of https://github.com/qiffa…
qiffang Jul 24, 2019
c891d96
Multi-version-TiDB-monitor
qiffang Jul 28, 2019
19f82d6
Merge branch 'master' into Multi-version-TiDB-monitor
tennix Jul 29, 2019
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
602 changes: 0 additions & 602 deletions charts/tidb-cluster/templates/config/_alert-rules-config.tpl
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion charts/tidb-cluster/templates/config/_prometheus-config.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ scrape_configs:
action: replace
target_label: cluster
rule_files:
- 'alert.rules'
- '/prometheus-rules/rules/*.rules.yml'
Loading