From fa4c735e09625a7c400e0f372d40c599f3594112 Mon Sep 17 00:00:00 2001 From: Rongfeng Fu Date: Fri, 10 Jun 2022 15:02:14 +0800 Subject: [PATCH] Update example & deps (#120) * update deps * add appname --- example/distributed-example.yaml | 2 ++ example/local-example.yaml | 4 +++- example/mini-distributed-example.yaml | 2 ++ example/mini-local-example.yaml | 2 ++ example/mini-single-example.yaml | 2 ++ .../obagent/distributed-with-obproxy-and-obagent-example.yaml | 4 +++- example/single-example.yaml | 4 +++- requirements.txt | 2 +- requirements3.txt | 4 ++-- 9 files changed, 20 insertions(+), 6 deletions(-) diff --git a/example/distributed-example.yaml b/example/distributed-example.yaml index e0f59ab..9351403 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 6bd3515..89a852b 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 d60ec0a..3abc5ae 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 a7b0d4e..1eb815f 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 73a750f..7250148 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 abccf29..eb965af 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 c6c53e1..2a2aa32 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 7fdf0ea..9e5ddec 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 b78e607..d7e4937 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 -- GitLab