diff --git a/example/distributed-example.yaml b/example/distributed-example.yaml index e0f59abb2b1123ec6e258e6cac0abbe2ee8d6fe7..9351403b3fc0ca51a44a990a8bb5b54bce186d9a 100644 --- a/example/distributed-example.yaml +++ b/example/distributed-example.yaml @@ -30,6 +30,8 @@ oceanbase-ce: max_syslog_file_count: 4 # The maximum number of reserved log files before enabling auto recycling. The default value is 0. skip_proxy_sys_private_check: true enable_strict_kernel_release: false + # observer cluster name, consistent with obproxy's cluster_name + appname: obcluster # root_password: # root user password # In this example , support multiple ob process in single node, so different process use different ports. # If deploy ob cluster in multiple nodes, the port and path setting can be same. diff --git a/example/local-example.yaml b/example/local-example.yaml index 6bd3515fa035840aad1286207b3f94963db4d2b4..89a852b044665b9cfd425e6fcef56697fb69aaf9 100644 --- a/example/local-example.yaml +++ b/example/local-example.yaml @@ -25,4 +25,6 @@ oceanbase-ce: enable_syslog_wf: false # Print system logs whose levels are higher than WARNING to a separate log file. The default value is true. enable_syslog_recycle: true # Enable auto system log recycling or not. The default value is false. max_syslog_file_count: 4 # The maximum number of reserved log files before enabling auto recycling. The default value is 0. - # root_password: # root user password, can be empty \ No newline at end of file + # observer cluster name, consistent with obproxy's cluster_name + appname: obcluster + # root_password: # root user password, can be empty diff --git a/example/mini-distributed-example.yaml b/example/mini-distributed-example.yaml index d60ec0acc380f0fce0d354697ff3ecfcba98ac49..3abc5aee1efd9f9dfe3cac6713210e6db9793532 100644 --- a/example/mini-distributed-example.yaml +++ b/example/mini-distributed-example.yaml @@ -40,6 +40,8 @@ oceanbase-ce: enable_syslog_wf: false # Print system logs whose levels are higher than WARNING to a separate log file. The default value is true. enable_syslog_recycle: true # Enable auto system log recycling or not. The default value is false. max_syslog_file_count: 4 # The maximum number of reserved log files before enabling auto recycling. The default value is 0. + # observer cluster name, consistent with obproxy's cluster_name + appname: obcluster # root_password: # root user password, can be empty server1: mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started. diff --git a/example/mini-local-example.yaml b/example/mini-local-example.yaml index a7b0d4edd944168686569d47ce243b173b00ba5d..1eb815fb6c6765b9403f2752eec5b7a41ea69df2 100755 --- a/example/mini-local-example.yaml +++ b/example/mini-local-example.yaml @@ -37,4 +37,6 @@ oceanbase-ce: enable_syslog_wf: false # Print system logs whose levels are higher than WARNING to a separate log file. The default value is true. enable_syslog_recycle: true # Enable auto system log recycling or not. The default value is false. max_syslog_file_count: 4 # The maximum number of reserved log files before enabling auto recycling. The default value is 0. + # observer cluster name, consistent with obproxy's cluster_name + appname: obcluster # root_password: # root user password, can be empty diff --git a/example/mini-single-example.yaml b/example/mini-single-example.yaml index 73a750f0ed6932d22ac9c870d5ae6bd129aea881..725014815f6072fad48a808101fffa00819fe4d0 100755 --- a/example/mini-single-example.yaml +++ b/example/mini-single-example.yaml @@ -44,4 +44,6 @@ oceanbase-ce: enable_syslog_wf: false # Print system logs whose levels are higher than WARNING to a separate log file. The default value is true. enable_syslog_recycle: true # Enable auto system log recycling or not. The default value is false. max_syslog_file_count: 4 # The maximum number of reserved log files before enabling auto recycling. The default value is 0. + # observer cluster name, consistent with obproxy's cluster_name + appname: obcluster # root_password: # root user password, can be empty diff --git a/example/obagent/distributed-with-obproxy-and-obagent-example.yaml b/example/obagent/distributed-with-obproxy-and-obagent-example.yaml index abccf29541252821cc06c37c9a31b832f922ecdb..eb965affb7dcb0bfa0fa3e21ef81def397491163 100644 --- a/example/obagent/distributed-with-obproxy-and-obagent-example.yaml +++ b/example/obagent/distributed-with-obproxy-and-obagent-example.yaml @@ -28,6 +28,8 @@ oceanbase-ce: enable_syslog_wf: false # Print system logs whose levels are higher than WARNING to a separate log file. The default value is true. enable_syslog_recycle: true # Enable auto system log recycling or not. The default value is false. max_syslog_file_count: 4 # The maximum number of reserved log files before enabling auto recycling. The default value is 0. + # observer cluster name, consistent with obproxy's cluster_name + appname: obcluster # root_password: # root user password # In this example , support multiple ob process in single node, so different process use different ports. # If deploy ob cluster in multiple nodes, the port and path setting can be same. @@ -150,4 +152,4 @@ obagent: # Whether to disable the basic authentication for HTTP service. True is to disable. False is to enable. The default value is false. disable_http_basic_auth: false # Whether to disable the basic authentication for the debug interface. True is to disable. False is to enable. The default value is false. - disable_pprof_basic_auth: false \ No newline at end of file + disable_pprof_basic_auth: false diff --git a/example/single-example.yaml b/example/single-example.yaml index c6c53e1f7bf67b90cf843685c454fc428e13686f..2a2aa324e665f8feb733040dfcaecb290ee6a634 100644 --- a/example/single-example.yaml +++ b/example/single-example.yaml @@ -32,4 +32,6 @@ oceanbase-ce: enable_syslog_wf: false # Print system logs whose levels are higher than WARNING to a separate log file. The default value is true. enable_syslog_recycle: true # Enable auto system log recycling or not. The default value is false. max_syslog_file_count: 4 # The maximum number of reserved log files before enabling auto recycling. The default value is 0. - # root_password: # root user password, can be empty \ No newline at end of file + # observer cluster name, consistent with obproxy's cluster_name + appname: obcluster + # root_password: # root user password, can be empty diff --git a/requirements.txt b/requirements.txt index 7fdf0eaca6b15b26cb242b556695fc36d835ffd7..9e5ddec64d1978393b5d3359c0c9ac854f31d4c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ requests==2.24.0 rpmfile==1.0.8 -paramiko==2.7.2 +paramiko==2.10.1 backports.lzma==0.0.14 MySQL-python==1.2.5 ruamel.yaml.clib==0.2.2 diff --git a/requirements3.txt b/requirements3.txt index b78e60708ddba8c6d474df6570b2f0f9466812f1..d7e49371884f6767908b73765b92e7364761cafb 100644 --- a/requirements3.txt +++ b/requirements3.txt @@ -1,5 +1,5 @@ rpmfile==1.0.8 -paramiko==2.7.2 +paramiko==2.10.1 requests==2.25.1 PyMySQL==1.0.2 ruamel.yaml==0.17.4 @@ -7,4 +7,4 @@ subprocess32==3.5.4 prettytable==2.1.0 progressbar==2.5 halo==0.0.31 -pycryptodome==3.10.1 \ No newline at end of file +pycryptodome==3.10.1