[manager,collector]mariadb,postgresql支持timeout,fix jdbc解析异常 (#36)

* [manager,collector]fix jdbc解析异常,mariadb支持timeout

* [manager]postgresql支持timeout设置

manager/src/main/resources/define/app/mariadb.yml

@@ -16,6 +16,8 @@ configmap:
     type: 2
   - key: database
     type: 1
+  - key: timeout
+    type: 0
   - key: url
     type: 1
 # 指标组列表
@@ -61,6 +63,7 @@ metrics:
       username: ^_^username^_^
       password: ^_^password^_^
       database: ^_^database^_^
+      timeout: ^_^timeout^_^
       # SQL查询方式： oneRow, multiRow, columns
       queryType: columns
       # sql
@@ -102,6 +105,7 @@ metrics:
       username: ^_^username^_^
       password: ^_^password^_^
       database: ^_^database^_^
+      timeout: ^_^timeout^_^
       # SQL查询方式： oneRow, multiRow, columns
       queryType: columns
       # sql
@@ -134,6 +138,7 @@ metrics:
       username: ^_^username^_^
       password: ^_^password^_^
       database: ^_^database^_^
+      timeout: ^_^timeout^_^
       # SQL查询方式： oneRow, multiRow, columns
       queryType: columns
       # sql

manager/src/main/resources/define/app/mysql.yml

@@ -18,8 +18,6 @@ configmap:
     type: 1
   - key: timeout
     type: 0
-    required: false
-    defaultValue: 3
   - key: url
     type: 1
 # 指标组列表
@@ -107,6 +105,7 @@ metrics:
       username: ^_^username^_^
       password: ^_^password^_^
       database: ^_^database^_^
+      timeout: ^_^timeout^_^
       # SQL查询方式： oneRow, multiRow, columns
       queryType: columns
       # sql
@@ -139,6 +138,7 @@ metrics:
       username: ^_^username^_^
       password: ^_^password^_^
       database: ^_^database^_^
+      timeout: ^_^timeout^_^
       # SQL查询方式： oneRow, multiRow, columns
       queryType: columns
       # sql

manager/src/main/resources/define/app/postgresql.yml

@@ -18,6 +18,8 @@ configmap:
     type: 1
   - key: url
     type: 1
+  - key: timeout
+    type: 0
 # 指标组列表
 metrics:
   - name: basic
@@ -45,6 +47,7 @@ metrics:
       host: ^_^host^_^
       # 端口
       port: ^_^port^_^
+      timeout: ^_^timeout^_^
       platform: postgresql
       username: ^_^username^_^
       password: ^_^password^_^
@@ -87,6 +90,7 @@ metrics:
       host: ^_^host^_^
       # 端口
       port: ^_^port^_^
+      timeout: ^_^timeout^_^
       platform: postgresql
       username: ^_^username^_^
       password: ^_^password^_^
@@ -110,6 +114,7 @@ metrics:
       host: ^_^host^_^
       # 端口
       port: ^_^port^_^
+      timeout: ^_^timeout^_^
       platform: postgresql
       username: ^_^username^_^
       password: ^_^password^_^

manager/src/main/resources/define/param/mariadb.yml

@@ -11,6 +11,12 @@ param:
     required: true
     defaultValue: 80
     placeholder: '请输入端口'
+  - field: timeout
+    name: 查询超时时间
+    type: number
+    required: false
+    defaultValue: 3000
+    placeholder: '查询超时时间'
   - field: database
     name: 数据库名称
     type: text

manager/src/main/resources/define/param/mysql.yml

@@ -11,6 +11,12 @@ param:
     required: true
     defaultValue: 80
     placeholder: '请输入端口'
+  - field: timeout
+    name: 查询超时时间
+    type: number
+    required: false
+    defaultValue: 3000
+    placeholder: '查询超时时间'
   - field: database
     name: 数据库名称
     type: text
@@ -27,10 +33,4 @@ param:
   - field: url
     name: URL
     type: text
-    required: false
-  - field: timeout
-    name: 超时时间
-    type: number
-    required: false
-    defaultValue: 3
-    placeholder: '请输入mysql可接受的超时时间'
+    required: false

manager/src/main/resources/define/param/postgresql.yml

@@ -11,6 +11,12 @@ param:
     required: true
     defaultValue: 5432
     placeholder: '请输入端口'
+  - field: timeout
+    name: 查询超时时间
+    type: number
+    required: false
+    defaultValue: 3000
+    placeholder: '查询超时时间'
   - field: database
     name: 数据库名称
     type: text