update example (#48)

example/autodeploy/distributed-example.yaml

@@ -7,12 +7,12 @@
 #   timeout: ssh connection timeout (second), default 30
 oceanbase-ce:
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 172.19.33.2
-    - name: z2
+    - name: server2
       ip: 172.19.33.3
-    - name: z3
+    - name: server3
       ip: 172.19.33.4
   global:
     # The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -51,9 +51,9 @@ oceanbase-ce:
     # root_password:
     # Password for proxyro. proxyro_password must be the same as observer_sys_password. The default value is empty.
     # proxyro_password:
-  z1:
+  server1:
     zone: zone1
-  z2:
+  server2:
     zone: zone2
-  z3:
+  server3:
     zone: zone3

example/autodeploy/distributed-with-obproxy-and-obagent-example.yaml

@@ -7,12 +7,12 @@
 #   timeout: ssh connection timeout (second), default 30
 oceanbase-ce:
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 172.19.33.2
-    - name: z2
+    - name: server2
       ip: 172.19.33.3
-    - name: z3
+    - name: server3
       ip: 172.19.33.4
   global:
     # The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -51,11 +51,11 @@ oceanbase-ce:
     # root_password:
     # Password for proxyro. proxyro_password must be the same as observer_sys_password. The default value is empty.
     # proxyro_password:
-  z1:
+  server1:
     zone: zone1
-  z2:
+  server2:
     zone: zone2
-  z3:
+  server3:
     zone: zone3
 obproxy:
   servers:
@@ -80,12 +80,12 @@ obproxy:
 obagent:
   # The list of servers to be monitored. This list is consistent with the servers in oceanbase-ce. 
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP is supported.
       ip: 172.19.33.2
-    - name: z2
+    - name: server2
       ip: 172.19.33.3
-    - name: z3
+    - name: server3
       ip: 172.19.33.4
   # Set dependent components for the component.
   # When the associated configurations are not done, OBD will automatically get the these configurations from the dependent components.
@@ -94,6 +94,7 @@ obagent:
   global:
     # The working directory for obagent. obagent is started under this directory. This is a required field.
     home_path: /root/observer
+    skip_proxy_sys_private_check: true
     # The port that pulls and manages the metrics. The default port number is 8088.
     # server_port: 8088
     # Debug port for pprof. The default port number is 8089.

example/autodeploy/distributed-with-obproxy-example.yaml

@@ -7,12 +7,12 @@
 #   timeout: ssh connection timeout (second), default 30
 oceanbase-ce:
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 192.168.1.2
-    - name: z2
+    - name: server2
       ip: 192.168.1.3
-    - name: z3
+    - name: server3
       ip: 192.168.1.4
   global:
     # The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -51,11 +51,11 @@ oceanbase-ce:
     # root_password:
     # Password for proxyro. proxyro_password must be the same as observer_sys_password. The default value is empty.
     # proxyro_password:
-  z1:
+  server1:
     zone: zone1
-  z2:
+  server2:
     zone: zone2
-  z3:
+  server3:
     zone: zone3
 obproxy:
   servers:

example/distributed-example.yaml

@@ -7,12 +7,12 @@
 #   timeout: ssh connection timeout (second), default 30
 oceanbase-ce:
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 172.19.33.2
-    - name: z2
+    - name: server2
       ip: 172.19.33.3
-    - name: z3
+    - name: server3
       ip: 172.19.33.4
   global:
     # Please set devname as the network adaptor's name whose ip is  in the setting of severs.
@@ -28,10 +28,11 @@ 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.
+    skip_proxy_sys_private_check: true
     # 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. 
-  z1:
+  server1:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     # The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -41,7 +42,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone1
-  z2:
+  server2:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -51,7 +52,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone2
-  z3:
+  server3:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.

example/distributed-with-obproxy-example.yaml

@@ -7,12 +7,12 @@
 #   timeout: ssh connection timeout (second), default 30
 oceanbase-ce:
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 192.168.1.2
-    - name: z2
+    - name: server2
       ip: 192.168.1.3
-    - name: z3
+    - name: server3
       ip: 192.168.1.4
   global:
     # Please set devname as the network adaptor's name whose ip is  in the setting of severs.
@@ -34,7 +34,7 @@ oceanbase-ce:
     # proxyro_password: # proxyro user pasword, consistent with obproxy's observer_sys_password, can be empty
   # 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. 
-  z1:
+  server1:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -44,7 +44,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone1
-  z2:
+  server2:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -54,7 +54,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone2
-  z3:
+  server3:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -77,5 +77,6 @@ obproxy:
     enable_cluster_checkout: false
     # observer cluster name, consistent with oceanbase-ce's appname. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     cluster_name: obcluster
+    skip_proxy_sys_private_check: true
     # obproxy_sys_password: # obproxy sys user password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     # observer_sys_password: # proxyro user pasword, consistent with oceanbase-ce's proxyro_password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.

example/mini-distributed-example.yaml

@@ -7,12 +7,12 @@
 #   timeout: ssh connection timeout (second), default 30
 oceanbase-ce:
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 172.19.33.2
-    - name: z2
+    - name: server2
       ip: 172.19.33.3
-    - name: z3
+    - name: server3
       ip: 172.19.33.4
   global:
     # Please set devname as the network adaptor's name whose ip is  in the setting of severs.
@@ -41,7 +41,7 @@ oceanbase-ce:
     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
-  z1:
+  server1:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -51,7 +51,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone1
-  z2:
+  server2:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -61,7 +61,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone2
-  z3:
+  server3:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.

example/mini-distributed-with-obproxy-example.yaml

@@ -7,12 +7,12 @@
 #   timeout: ssh connection timeout (second), default 30
 oceanbase-ce:
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 192.168.1.2
-    - name: z2
+    - name: server2
       ip: 192.168.1.3
-    - name: z3
+    - name: server3
       ip: 192.168.1.4
   global:
     # Please set devname as the network adaptor's name whose ip is  in the setting of severs.
@@ -44,7 +44,7 @@ oceanbase-ce:
     appname: obcluster
     # root_password: # root user password, can be empty
     # proxyro_password: # proxyro user pasword, consistent with obproxy's observer_sys_password, can be empty
-  z1:
+  server1:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -54,7 +54,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone1
-  z2:
+  server2:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -64,7 +64,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone2
-  z3:
+  server3:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -87,5 +87,6 @@ obproxy:
     enable_cluster_checkout: false
     # observer cluster name, consistent with oceanbase-ce's appname. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     cluster_name: obcluster
+    skip_proxy_sys_private_check: true
     # obproxy_sys_password: # obproxy sys user password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     # observer_sys_password: # proxyro user pasword, consistent with oceanbase-ce's proxyro_password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.

example/mini-single-with-obproxy-example.yaml

@@ -61,5 +61,6 @@ obproxy:
     enable_cluster_checkout: false
     # observer cluster name, consistent with oceanbase-ce's appname. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     cluster_name: obcluster
+    skip_proxy_sys_private_check: true
     # obproxy_sys_password: # obproxy sys user password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     # observer_sys_password: # proxyro user pasword, consistent with oceanbase-ce's proxyro_password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.

example/obagent/distributed-with-obproxy-and-obagent-example.yaml

@@ -7,12 +7,12 @@
 #   timeout: ssh connection timeout (second), default 30
 oceanbase-ce:
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 172.19.33.2
-    - name: z2
+    - name: server2
       ip: 172.19.33.3
-    - name: z3
+    - name: server3
       ip: 172.19.33.4
   global:
     # Please set devname as the network adaptor's name whose ip is  in the setting of severs.
@@ -31,7 +31,7 @@ oceanbase-ce:
     # 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. 
-  z1:
+  server1:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     # The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -41,7 +41,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone1
-  z2:
+  server2:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -51,7 +51,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone2
-  z3:
+  server3:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -78,17 +78,18 @@ obproxy:
     enable_cluster_checkout: false
     # observer cluster name, consistent with oceanbase-ce's appname. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     # cluster_name: obcluster
+    skip_proxy_sys_private_check: true
     # obproxy_sys_password: # obproxy sys user password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     # observer_sys_password: # proxyro user pasword, consistent with oceanbase-ce's proxyro_password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
 obagent:
   # The list of servers to be monitored. This list is consistent with the servers in oceanbase-ce. 
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 172.19.33.2
-    - name: z2
+    - name: server2
       ip: 172.19.33.3
-    - name: z3
+    - name: server3
       ip: 172.19.33.4
   # Set dependent components for the component.
   # When the associated configurations are not done, OBD will automatically get the these configurations from the dependent components.

example/obproxy/distributed-with-obproxy-example.yaml

@@ -7,12 +7,12 @@
 #   timeout: ssh connection timeout (second), default 30
 oceanbase-ce:
   servers:
-    - name: z1
+    - name: server1
       # Please don't use hostname, only IP can be supported
       ip: 192.168.1.2
-    - name: z2
+    - name: server2
       ip: 192.168.1.3
-    - name: z3
+    - name: server3
       ip: 192.168.1.4
   global:
     # Please set devname as the network adaptor's name whose ip is  in the setting of severs.
@@ -34,7 +34,7 @@ oceanbase-ce:
     # proxyro_password: # proxyro user pasword, consistent with obproxy's observer_sys_password, can be empty
   # 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. 
-  z1:
+  server1:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -44,7 +44,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone1
-  z2:
+  server2:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -54,7 +54,7 @@ oceanbase-ce:
     # The directory for clog, ilog, and slog. The default value is the same as the data_dir value.
     # redo_dir: /redo
     zone: zone2
-  z3:
+  server3:
     mysql_port: 2881 # External port for OceanBase Database. The default value is 2881. DO NOT change this value after the cluster is started.
     rpc_port: 2882 # Internal port for OceanBase Database. The default value is 2882. DO NOT change this value after the cluster is started.
     #  The working directory for OceanBase Database. OceanBase Database is started under this directory. This is a required field.
@@ -81,5 +81,6 @@ obproxy:
     enable_cluster_checkout: false
     # observer cluster name, consistent with oceanbase-ce's appname. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     # cluster_name: obcluster
+    skip_proxy_sys_private_check: true
     # obproxy_sys_password: # obproxy sys user password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     # observer_sys_password: # proxyro user pasword, consistent with oceanbase-ce's proxyro_password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.

example/obproxy/obproxy-only-example.yaml

@@ -18,5 +18,6 @@ obproxy:
     enable_cluster_checkout: false
     # observer cluster name, consistent with oceanbase-ce's appname. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     cluster_name: obcluster
+    skip_proxy_sys_private_check: true
     # obproxy_sys_password: # obproxy sys user password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     # observer_sys_password: # proxyro user pasword, consistent with oceanbase-ce's proxyro_password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.

example/single-with-obproxy-example.yaml

@@ -49,5 +49,6 @@ obproxy:
     enable_cluster_checkout: false
     # observer cluster name, consistent with oceanbase-ce's appname. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     cluster_name: obcluster
+    skip_proxy_sys_private_check: true
     # obproxy_sys_password: # obproxy sys user password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.
     # observer_sys_password: # proxyro user pasword, consistent with oceanbase-ce's proxyro_password, can be empty. When a depends exists, OBD gets this value from the oceanbase-ce of the depends.