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 NG Monitoring #4287

Merged
merged 37 commits into from Dec 13, 2021
Merged

Support NG Monitoring #4287

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e6ad6ad
add types
KanShiori Nov 29, 2021
32d6881
update all
KanShiori Nov 29, 2021
61727b2
update types
KanShiori Nov 29, 2021
1474c46
update all
KanShiori Nov 29, 2021
61d0830
update all
KanShiori Dec 2, 2021
ba06875
core logic
KanShiori Dec 2, 2021
5ddb081
move some utils to pkg manager/utils
KanShiori Dec 3, 2021
6763527
fix
KanShiori Dec 3, 2021
bede5c0
Merge branch 'master-upstream' into ng_monitor_cr
KanShiori Dec 3, 2021
bc060b9
update all
KanShiori Dec 3, 2021
a030ea7
fix e2e
KanShiori Dec 3, 2021
fae9062
fix lint
KanShiori Dec 3, 2021
3f22319
fix lint
KanShiori Dec 3, 2021
7682133
fix lint
KanShiori Dec 3, 2021
ad45962
Merge branch 'master-upstream' into ng_monitor_cr
KanShiori Dec 6, 2021
66aed7d
add Pod Name ENV
KanShiori Dec 6, 2021
5930444
optimize code
KanShiori Dec 7, 2021
139bc5d
modify start script to support cluster domain
KanShiori Dec 7, 2021
ae977a5
Change CR name to TidbNGMonitoring
KanShiori Dec 7, 2021
362ce89
udpate all
KanShiori Dec 7, 2021
05c545a
fix
KanShiori Dec 7, 2021
556091b
Merge branch 'master-upstream' into ng_monitor_cr
KanShiori Dec 7, 2021
72b286c
add validate and move `Name` function to manager
KanShiori Dec 7, 2021
884cffd
Merge branch 'master' into ng_monitor_cr
KanShiori Dec 7, 2021
287b7f4
fix ut
KanShiori Dec 7, 2021
598baa2
Merge branch 'master' into ng_monitor_cr
KanShiori Dec 8, 2021
f7a244e
rename file
KanShiori Dec 8, 2021
0649a20
enable status subresource
KanShiori Dec 9, 2021
4efaea5
remomve validate annotation
KanShiori Dec 9, 2021
4d09da3
fix some bug
KanShiori Dec 10, 2021
3750111
Merge branch 'master-upstream' into ng_monitor_cr
KanShiori Dec 10, 2021
79259f0
use config-file as key in configmap
KanShiori Dec 10, 2021
c110a63
fix empty line
KanShiori Dec 10, 2021
72cc593
validate cluster length
KanShiori Dec 10, 2021
5d42ce1
Merge branch 'master' into ng_monitor_cr
ti-chi-bot Dec 13, 2021
b5af28b
Merge branch 'master' into ng_monitor_cr
DanielZhangQD Dec 13, 2021
f1a38b6
Merge branch 'master-upstream' into ng_monitor_cr
KanShiori Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/controller-manager/main.go
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@ import (
"github.com/pingcap/tidb-operator/pkg/controller/tidbcluster"
"github.com/pingcap/tidb-operator/pkg/controller/tidbinitializer"
"github.com/pingcap/tidb-operator/pkg/controller/tidbmonitor"
"github.com/pingcap/tidb-operator/pkg/controller/tidbngmonitoring"
"github.com/pingcap/tidb-operator/pkg/features"
"github.com/pingcap/tidb-operator/pkg/metrics"
"github.com/pingcap/tidb-operator/pkg/scheme"
Expand Down Expand Up @@ -165,6 +166,7 @@ func main() {
backupschedule.NewController(deps),
tidbinitializer.NewController(deps),
tidbmonitor.NewController(deps),
tidbngmonitoring.NewController(deps),
}
if cliCfg.PodWebhookEnabled {
controllers = append(controllers, periodicity.NewController(deps))
Expand Down