Skip to content

Commit 7bbc1e2

Browse files
author
breezeli
committed
Merge branch 'v3.3.x' of https://github.com/Tencent/bk-cmdb into v3.3.x
2 parents 27dc8bc + 7f1e6b8 commit 7bbc1e2

File tree

222 files changed

+3254
-6173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+3254
-6173
lines changed

‎scripts/generate.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ class DockerfileTemplate(Template):
1515
delimiter='$'
1616

1717
def generate_docker_file(image, src_dir, dst_dir, output):
18-
19-
#print src_dir
18+
2019
run_cmd_params = []
2120
copy_cmd_params = []
2221
list_dirs = os.walk(src_dir)
@@ -52,23 +51,23 @@ def main(argv):
5251
try:
5352
opts, _ = getopt.getopt(argv,"ht:i:o:",["help","target=","base_image=","output="])
5453
except getopt.GetoptError:
55-
print 'generate.py -t <target> -i <base_image> -o <output>'
54+
print('generate.py -t <target> -i <base_image> -o <output>')
5655
sys.exit(2)
5756
if len(opts) == 0:
58-
print 'generate.py -t <target> -i <base_image> -o <output>'
57+
print('generate.py -t <target> -i <base_image> -o <output>')
5958
sys.exit(2)
60-
#print opts
59+
6160
for opt, arg in opts:
6261
if opt in ('-h','--help'):
63-
print 'generate.py -t <target> -i <base_image> -o <output>'
62+
print('generate.py -t <target> -i <base_image> -o <output>')
6463
sys.exit()
6564
elif opt in ("-t", "--target"):
6665
target = arg
6766
elif opt in ("-i","--base_image"):
6867
image = arg
6968
elif opt in ("-o","--output"):
7069
output = arg
71-
#print image, target
70+
7271
list_dir(image, os.path.abspath(target), output)
7372

7473
if __name__=="__main__":

‎scripts/init.py

+59-56
Original file line numberDiff line numberDiff line change
@@ -412,119 +412,122 @@ def main(argv):
412412
,"mongo_user=","mongo_pass=","blueking_cmdb_url=","blueking_paas_url=","listen_port="])
413413

414414
except getopt.GetoptError as e:
415-
print "\n \t",e.msg
416-
print "\n\tusage:" \
417-
,"\n\t-discovery <discovery> the ZooKeeper server address, eg:127.0.0.1:2181"\
418-
,"\n\t--database <database> the database name, default cmdb"\
419-
,"\n\t--redis_ip <redis_ip> the redis ip, eg:127.0.0.1"\
420-
,"\n\t--redis_port <redis_port> the redis port, default:6379"\
421-
,"\n\t--redis_pass <redis_pass> the redis user password"\
422-
,"\n\t--mongo_ip <mongo_ip> the mongo ip ,eg:127.0.0.1"\
423-
,"\n\t--mongo_port <mongo_port> the mongo port, eg:27017"\
424-
,"\n\t--mongo_user <mongo_user> the mongo user name, default:cc"\
425-
,"\n\t--mongo_pass <mongo_pass> the mongo password"\
426-
,"\n\t--blueking_cmdb_url <blueking_cmdb_url> the cmdb site url, eg: http://127.0.0.1:8088 or http://bk.tencent.com"\
427-
,"\n\t--blueking_paas_url <blueking_paas_url> the blueking pass url, eg: http://127.0.0.1:8088 or http://bk.tencent.com"\
428-
,"\n\t--listen_port <listen_port> the cmdb_webserver listen port, should be the port as same as -c <blueking_cmdb_url> specified, default:8083"
429-
415+
print("\n \t",e.msg)
416+
print('''
417+
usage:
418+
--discovery <discovery> the ZooKeeper server address, eg:127.0.0.1:2181
419+
--database <database> the database name, default cmdb
420+
--redis_ip <redis_ip> the redis ip, eg:127.0.0.1
421+
--redis_port <redis_port> the redis port, default:6379
422+
--redis_pass <redis_pass> the redis user password
423+
--mongo_ip <mongo_ip> the mongo ip ,eg:127.0.0.1
424+
--mongo_port <mongo_port> the mongo port, eg:27017
425+
--mongo_user <mongo_user> the mongo user name, default:cc
426+
--mongo_pass <mongo_pass> the mongo password
427+
--blueking_cmdb_url <blueking_cmdb_url> the cmdb site url, eg: http://127.0.0.1:8088 or http://bk.tencent.com
428+
--blueking_paas_url <blueking_paas_url> the blueking paas url, eg: http://127.0.0.1:8088 or http://bk.tencent.com
429+
--listen_port <listen_port> the cmdb_webserver listen port, should be the port as same as -c <blueking_cmdb_url> specified, default:8083
430+
''')
431+
430432
sys.exit(2)
431433
if len(opts) == 0:
432-
print "\n\tusage:" \
433-
,"\n\t--discovery <discovery> the ZooKeeper server address, eg:127.0.0.1:2181"\
434-
,"\n\t--database <database> the database name, default cmdb"\
435-
,"\n\t--redis_ip <redis_ip> the redis ip, eg:127.0.0.1"\
436-
,"\n\t--redis_port <redis_port> the redis port, default:6379"\
437-
,"\n\t--redis_pass <redis_pass> the redis user password"\
438-
,"\n\t--mongo_ip <mongo_ip> the mongo ip ,eg:127.0.0.1"\
439-
,"\n\t--mongo_port <mongo_port> the mongo port, eg:27017"\
440-
,"\n\t--mongo_user <mongo_user> the mongo user name, default:cc"\
441-
,"\n\t--mongo_pass <mongo_pass> the mongo password"\
442-
,"\n\t--blueking_cmdb_url <blueking_cmdb_url> the cmdb site url, eg: http://127.0.0.1:8088 or http://bk.tencent.com"\
443-
,"\n\t--blueking_paas_url <blueking_paas_url> the blueking paas url, eg: http://127.0.0.1:8088 or http://bk.tencent.com"\
444-
,"\n\t--listen_port <listen_port> the cmdb_webserver listen port, should be the port as same as -c <blueking_cmdb_url> specified, default:8083"
445-
434+
print('''
435+
usage:
436+
--discovery <discovery> the ZooKeeper server address, eg:127.0.0.1:2181
437+
--database <database> the database name, default cmdb
438+
--redis_ip <redis_ip> the redis ip, eg:127.0.0.1
439+
--redis_port <redis_port> the redis port, default:6379
440+
--redis_pass <redis_pass> the redis user password
441+
--mongo_ip <mongo_ip> the mongo ip ,eg:127.0.0.1
442+
--mongo_port <mongo_port> the mongo port, eg:27017
443+
--mongo_user <mongo_user> the mongo user name, default:cc
444+
--mongo_pass <mongo_pass> the mongo password
445+
--blueking_cmdb_url <blueking_cmdb_url> the cmdb site url, eg: http://127.0.0.1:8088 or http://bk.tencent.com
446+
--blueking_paas_url <blueking_paas_url> the blueking paas url, eg: http://127.0.0.1:8088 or http://bk.tencent.com
447+
--listen_port <listen_port> the cmdb_webserver listen port, should be the port as same as -c <blueking_cmdb_url> specified, default:8083
448+
''')
446449
sys.exit(2)
447-
#print opts
450+
448451
for opt, arg in opts:
449452
if opt in ('-h','--help'):
450-
print 'init.py --discovery <discovery> --database <database> --redis_ip <redis_ip> --redis_port <redis_port> --redis_pass <redis_pass> --mongo_ip <mongo_ip> --mongo_port <mongo_port> --mongo_user <mongo_user> --mongo_pass <mongo_pass> --blueking_cmdb_url <blueking_cmdb_url> --blueking_paas_url <blueking_paas_url> --listen_port <listen_port>'
453+
print('init.py --discovery <discovery> --database <database> --redis_ip <redis_ip> --redis_port <redis_port> --redis_pass <redis_pass> --mongo_ip <mongo_ip> --mongo_port <mongo_port> --mongo_user <mongo_user> --mongo_pass <mongo_pass> --blueking_cmdb_url <blueking_cmdb_url> --blueking_paas_url <blueking_paas_url> --listen_port <listen_port>')
451454
sys.exit()
452455
elif opt in ("-d", "--discovery"):
453456
rd_server=arg
454-
print 'rd_server:'+rd_server
457+
print('rd_server:'+rd_server)
455458
elif opt in ("-D", "--database"):
456459
db_name=arg
457-
print 'database:',db_name
460+
print('database:',db_name)
458461
elif opt in ("-r", "--redis_ip"):
459462
redis_ip= arg
460-
print 'redis_ip:'+redis_ip
463+
print('redis_ip:'+redis_ip)
461464
elif opt in ("-p","--redis_port"):
462465
redis_port = arg
463-
print 'redis_port:',redis_port
466+
print('redis_port:',redis_port)
464467
elif opt in ("-s","--redis_pass"):
465468
redis_pass = arg
466-
print 'redis_pass:',redis_pass
469+
print('redis_pass:',redis_pass)
467470
elif opt in ("-m","--mongo_ip"):
468471
mongo_ip=arg
469-
print 'mongo_ip:',mongo_ip
472+
print('mongo_ip:',mongo_ip)
470473
elif opt in("-P","--mongo_port"):
471474
mongo_port=arg
472-
print 'mongo_port:',mongo_port
475+
print('mongo_port:',mongo_port)
473476
elif opt in ("-X","--mongo_user"):
474477
mongo_user = arg
475-
print 'mongo_user:',mongo_user
478+
print('mongo_user:',mongo_user)
476479
elif opt in ("-S","--mongo_pass"):
477480
mongo_pass = arg
478-
print 'mongo_pass:',mongo_pass
481+
print('mongo_pass:',mongo_pass)
479482
elif opt in("-u","--blueking_cmdb_url"):
480483
cc_url=arg
481-
print 'blueking_cmdb_url:',cc_url
484+
print('blueking_cmdb_url:',cc_url)
482485
elif opt in("-U","--blueking_paas_url"):
483486
paas_url = arg
484-
print 'blueking_pass_url:',paas_url
487+
print('blueking_pass_url:',paas_url)
485488
elif opt in("-l","--listen_port"):
486489
server_ports["cmdb_webserver"]=arg
487-
print "listen_port:",server_ports["cmdb_webserver"]
490+
print("listen_port:",server_ports["cmdb_webserver"])
488491

489492
if 0 == len(rd_server):
490-
print 'please input the ZooKeeper address, eg:127.0.0.1:2181'
493+
print('please input the ZooKeeper address, eg:127.0.0.1:2181')
491494
sys.exit()
492495
if 0 == len(db_name):
493-
print 'please input the database name, eg:cmdb'
496+
print('please input the database name, eg:cmdb')
494497
sys.exit()
495498
if 0 == len(redis_ip):
496-
print 'please input the redis ip, eg: 127.0.0.1'
499+
print('please input the redis ip, eg: 127.0.0.1')
497500
sys.exit()
498501
if redis_port < 0:
499-
print 'please input the redis port, eg:6379'
502+
print('please input the redis port, eg:6379')
500503
sys.exit()
501504
if 0 == len(redis_pass):
502-
print 'please input the redis password'
505+
print('please input the redis password')
503506
sys.exit()
504507
if 0 == len(mongo_ip):
505-
print 'please input the mongo ip, eg:127.0.0.1'
508+
print('please input the mongo ip, eg:127.0.0.1')
506509
sys.exit()
507510
if mongo_port < 0:
508-
print 'please input the mongo port, eg:27017'
511+
print('please input the mongo port, eg:27017')
509512
sys.exit()
510513
if 0 == len(mongo_user):
511-
print 'please input the mongo user, eg:cc'
514+
print('please input the mongo user, eg:cc')
512515
sys.exit()
513516
if 0 == len(mongo_pass):
514-
print 'please input the mongo password'
517+
print ('please input the mongo password')
515518
sys.exit()
516519
if 0 == len(cc_url):
517-
print 'please input the blueking cmdb url'
520+
print('please input the blueking cmdb url')
518521
sys.exit()
519522
if 0 == len(paas_url):
520-
print 'please input the blueking paas url'
523+
print('please input the blueking paas url')
521524
sys.exit()
522525
if not cc_url.startswith("http://"):
523-
print 'blueking cmdb url not start with http://'
526+
print('blueking cmdb url not start with http://')
524527
sys.exit()
525528

526529
generate_config_file(rd_server,db_name,redis_ip,redis_port,redis_user,redis_pass,mongo_ip,mongo_port,mongo_user,mongo_pass,cc_url,paas_url)
527530
update_start_script(rd_server, server_ports)
528-
print 'initial configurations success, configs could be found at cmdb_adminserver/configures'
531+
print('initial configurations success, configs could be found at cmdb_adminserver/configures')
529532
if __name__=="__main__":
530533
main(sys.argv[1:])

‎scripts/ip.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
ip = s.getsockname()[0]
99
finally:
1010
s.close()
11-
print ip
11+
print(ip)

‎scripts/license.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'''
1919

2020
def update_license(target_file, temp_file):
21-
print "update: " +target_file
21+
print("update: " +target_file)
2222
with open(target_file,'r') as src_file, open(temp_file,'w') as tmp_file:
2323
tmp_file.write(license_content)
2424
is_begin=False
@@ -43,14 +43,14 @@ def main(argv):
4343
try:
4444
opts, _ = getopt.getopt(argv,"hd:",["help","dir="])
4545
except getopt.GetoptError:
46-
print 'license.py -d <directory>'
46+
print('license.py -d <directory>')
4747
sys.exit(2)
4848
if len(opts) == 0:
49-
print 'license.py -d <directory>'
49+
print('license.py -d <directory>')
5050
sys.exit(2)
5151
for opt, arg in opts:
5252
if opt in ('-h','--help'):
53-
print 'license.py -d <directory>'
53+
print('license.py -d <directory>')
5454
sys.exit()
5555
elif opt in ("-d", "--dir"):
5656
inner_dir = arg

‎scripts/start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
pushd ${BASH_SOURCE%/*} >/dev/null
66
DIRS=$(find * -maxdepth 0 -type d | grep cmdb_)
77

8-
# into the directory to stop the all cmdb process
8+
# into the directory to start the all cmdb process
99
for tmp_dir in $DIRS;do
1010
pushd $(pwd) > /dev/null
1111
echo -e "starting: $tmp_dir"

‎src/api_server/api_server.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import (
2020

2121
_ "net/http/pprof"
2222

23-
"github.com/spf13/pflag"
24-
2523
"configcenter/src/api_server/app"
2624
"configcenter/src/api_server/app/options"
2725
"configcenter/src/common"
2826
"configcenter/src/common/blog"
2927
"configcenter/src/common/types"
3028
"configcenter/src/common/util"
29+
30+
"github.com/spf13/pflag"
3131
)
3232

3333
func main() {
@@ -44,6 +44,7 @@ func main() {
4444

4545
if err := app.Run(context.Background(), op); err != nil {
4646
fmt.Fprintf(os.Stderr, "%v\n", err)
47+
blog.Errorf("process stoped by %v", err)
4748
blog.CloseLogs()
4849
os.Exit(1)
4950
}

‎src/api_server/app/server.go

+9-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import (
1717
"fmt"
1818
"os"
1919

20-
"github.com/emicklei/go-restful"
21-
2220
"configcenter/src/api_server/app/options"
2321
apisvc "configcenter/src/api_server/service"
2422
"configcenter/src/api_server/service/v3"
@@ -29,6 +27,8 @@ import (
2927
cc "configcenter/src/common/backbone/configcenter"
3028
"configcenter/src/common/types"
3129
"configcenter/src/common/version"
30+
31+
"github.com/emicklei/go-restful"
3232
)
3333

3434
func Run(ctx context.Context, op *options.ServerOption) error {
@@ -37,14 +37,18 @@ func Run(ctx context.Context, op *options.ServerOption) error {
3737
return fmt.Errorf("wrap server info failed, err: %v", err)
3838
}
3939

40+
discover, err := discovery.NewDiscoveryInterface(op.ServConf.RegDiscover)
41+
if err != nil {
42+
return fmt.Errorf("connect zookeeper [%s] failed: %v", op.ServConf.RegDiscover, err)
43+
}
44+
4045
c := &util.APIMachineryConfig{
41-
ZkAddr: op.ServConf.RegDiscover,
4246
QPS: 1000,
4347
Burst: 2000,
4448
TLSConfig: nil,
4549
}
4650

47-
machinery, err := apimachinery.NewApiMachinery(c)
51+
machinery, err := apimachinery.NewApiMachinery(c, discover)
4852
if err != nil {
4953
return fmt.Errorf("new api machinery failed, err: %v", err)
5054
}
@@ -86,6 +90,7 @@ func Run(ctx context.Context, op *options.ServerOption) error {
8690
types.CC_MODULE_APISERVER,
8791
op.ServConf.ExConfig,
8892
apiSvr.onHostConfigUpdate,
93+
discover,
8994
bonC)
9095

9196
if err != nil {

‎src/apimachinery/clientset.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,12 @@ type ClientSetInterface interface {
4747
Healthz() healthz.HealthzInterface
4848
}
4949

50-
func NewApiMachinery(c *util.APIMachineryConfig) (ClientSetInterface, error) {
50+
func NewApiMachinery(c *util.APIMachineryConfig, discover discovery.DiscoveryInterface) (ClientSetInterface, error) {
5151
client, err := util.NewClient(c.TLSConfig)
5252
if err != nil {
5353
return nil, err
5454
}
5555

56-
discover, err := discovery.NewDiscoveryInterface(c.ZkAddr)
57-
if err != nil {
58-
return nil, err
59-
}
60-
6156
flowcontrol := flowctrl.NewRateLimiter(c.QPS, c.Burst)
6257
return NewClientSet(client, discover, flowcontrol), nil
6358
}

‎src/apimachinery/discovery/discovery.go

+5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ type DiscoveryInterface interface {
3434
ProcCtrl() Interface
3535
GseProcServ() Interface
3636
CoreService() Interface
37+
TMServer() Interface
3738
}
3839

3940
type Interface interface {
@@ -120,3 +121,7 @@ func (d *discover) GseProcServ() Interface {
120121
func (d *discover) CoreService() Interface {
121122
return d.servers[types.CC_MODULE_CORESERVICE]
122123
}
124+
125+
func (d *discover) TMServer() Interface {
126+
return d.servers[types.CC_MODULE_TXC]
127+
}

‎src/apimachinery/discovery/discovery_mock.go

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ func (d *MockDiscovery) CoreService() Interface {
7070
return &mockServer{}
7171
}
7272

73+
func (d *MockDiscovery) TMServer() Interface {
74+
return &mockServer{}
75+
}
76+
7377
type mockServer struct{}
7478

7579
func (*mockServer) GetServers() ([]string, error) {

‎src/apimachinery/util/type.go

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import (
1818
)
1919

2020
type APIMachineryConfig struct {
21-
// the address of zookeeper address, comma separated.
22-
ZkAddr string
2321
// request's qps value
2422
QPS int64
2523
// request's burst value

0 commit comments

Comments
 (0)