merge develop

1 files changed, 374 insertions, 50 deletions

diff --git a/samples/dtail.schema.json b/samples/dtail.schema.json
index 0497fbf..bf07525 100755
--- a/samples/dtail.schema.json
+++ b/samples/dtail.schema.json
@@ -1,18 +1,372 @@
 {
   "$schema": "https://json-schema.org/2019-09/schema",
   "description": "Schema for dtail.json",
+  "definitions": {
+    "loglevel": {
+      "type": "string",
+      "enum": [
+        "None",
+        "Fatal",
+        "Error",
+        "Warn",
+        "Info",
+        "Default",
+        "Verbose",
+        "Debug",
+        "Devel",
+        "Trace",
+        "All"
+      ]
+    },
+    "logger": {
+      "type": "string",
+      "enum": [
+        "None",
+        "Stdout",
+        "File",
+        "Fout"
+      ]
+    },
+    "logrotation": {
+      "type": "string",
+      "enum": [
+        "Daily",
+        "Signal"
+      ]
+    },
+    "color": {
+      "type": "string",
+      "enum": [
+        "Black",
+        "Red",
+        "Green",
+        "Yellow",
+        "Blue",
+        "Magenta",
+        "Cyan",
+        "White"
+      ]
+    },
+    "attribute": {
+      "type": "string",
+      "enum": [
+        "None",
+        "Bold",
+        "Dim",
+        "Italic",
+        "Underline",
+        "Blink",
+        "SlowBlink",
+        "RapidBlink",
+        "Reverse",
+        "Hidden"
+      ]
+    }
+  },
   "type": "object",
+  "additionalProperties": false,
   "properties": {
     "Client": {
-      "properties": {},
-      "additionalProperties": false
+      "additionalProperties": false,
+      "properties": {
+        "TermColorsEnable": {
+          "type": "boolean"
+        },
+        "TermColors": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "Remote": {
+              "additionalProperties": false,
+              "properties": {
+                "DelimiterAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "DelimiterBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "DelimiterFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "RemoteAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "RemoteBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "RemoteFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "CountAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "CountBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "CountFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "HostnameAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "HostnameBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "HostnameFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "IDAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "IDBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "IDFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "StatsOkAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "StatsOkBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "StatsOkFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "StatsWarnAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "StatsWarnBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "StatsWarnFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "TextAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "TextBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "TextFg": {
+                  "$ref": "#/definitions/color"
+                }
+              }
+            },
+            "Client": {
+              "additionalProperties": false,
+              "properties": {
+                "DelimiterAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "DelimiterBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "DelimiterFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "ClientAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "ClientBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "ClientFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "HostnameAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "HostnameBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "HostnameFg": {
+                  "$ref": "#/definitions/color"
+                },
+                "TextAttr": {
+                  "$ref": "#/definitions/attribute"
+                },
+                "TextBg": {
+                  "$ref": "#/definitions/color"
+                },
+                "TextFg": {
+                  "$ref": "#/definitions/color"
+                }
+              }
+            },
+            "Server": {
+              "additionalProperties": false,
+              "properties": {
+                "DelimiterAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "DelimiterBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "DelimiterFg": {
+                  "#ref": "#/definitions/color"
+                },
+                "ServerAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "ServerBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "ServerFg": {
+                  "#ref": "#/definitions/color"
+                },
+                "HostnameAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "HostnameBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "HostnameFg": {
+                  "#ref": "#/definitions/color"
+                },
+                "TextAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "TextBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "TextFg": {
+                  "#ref": "#/definitions/color"
+                }
+              }
+            },
+            "Common": {
+              "additionalProperties": false,
+              "properties": {
+                "SeverityErrorAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "SeverityErrorBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "SeverityErrorFg": {
+                  "#ref": "#/definitions/color"
+                },
+                "SeverityFatalAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "SeverityFatalBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "SeverityFatalFg": {
+                  "#ref": "#/definitions/color"
+                },
+                "SeverityWarnAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "SeverityWarnBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "SeverityWarnFg": {
+                  "#ref": "#/definitions/color"
+                }
+              }
+            },
+            "MaprTable": {
+              "additionalProperties": false,
+              "properties": {
+                "DataAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "DataBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "DataFg": {
+                  "#ref": "#/definitions/color"
+                },
+                "DelimiterAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "DelimiterBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "DelimiterFg": {
+                  "#ref": "#/definitions/color"
+                },
+                "HeaderAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "HeaderBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "HeaderFg": {
+                  "#ref": "#/definitions/color"
+                },
+                "HeaderDelimiterAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "HeaderDelimiterBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "HeaderDelimiterFg": {
+                  "#ref": "#/definitions/color"
+                },
+                "HeaderSortKeyAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "HeaderGroupKeyAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "RawQueryAttr": {
+                  "#ref": "#/definitions/attribute"
+                },
+                "RawQueryBg": {
+                  "#ref": "#/definitions/color"
+                },
+                "RawQueryFg": {
+                  "#ref": "#/definitions/color"
+                }
+              }
+            }
+          }
+        }
+      }
     },
     "Server": {
+      "additionalProperties": false,
       "properties": {
+        "SSHBindAddress": {
+          "type": "string"
+        },
+        "HostKeyFile": {
+          "type": "string"
+        },
+        "HostKeyBits": {
+          "type": "integer",
+          "minimum": 2048
+        },
+        "MapreduceLogFormat": {
+          "type": "string"
+        },
+        "MaxConcurrentCats": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 20
+        },
+        "MaxConcurrentTails": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 100
+        },
+        "MaxConnections": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 100
+        },
+        "Permissions": {
+          "type": "object",
+          "properties": {}
+        },
         "Schedule": {
           "type": "array",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "Name": {
                 "type": "string"
@@ -20,6 +374,12 @@
               "Enable": {
                 "type": "boolean"
               },
+              "AllowFrom": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
               "TimeRange": {
                 "type": "array",
                 "items": [
@@ -47,6 +407,7 @@
           "type": "array",
           "items": {
             "type": "object",
+            "additionalProperties": false,
             "properties": {
               "Name": {
                 "type": "string"
@@ -68,54 +429,25 @@
               }
             }
           }
-        },
-        "HostKeyFile": {
-          "type": "string"
-        },
-        "HostKeyBits": {
-          "type": "integer",
-          "minimum": 2048
-        },
-        "MapreduceLogFormat": {
-          "type": "string"
-        },
-        "SSHBindAddress": {
-          "type": "string"
-        },
-        "MaxConcurrentCats": {
-          "type": "integer",
-          "minimum": 1,
-          "maximum": 20
-        },
-        "MaxConcurrentTails": {
-          "type": "integer",
-          "minimum": 1,
-          "maximum": 100
-        },
-        "MaxConnections": {
-          "type": "integer",
-          "minimum": 1,
-          "maximum": 100
-        },
-        "Permissions": {
-          "type": "object",
-          "properties": {}
         }
-      },
-      "additionalProperties": false
+      }
     },
     "Common": {
+      "additionalProperties": false,
       "properties": {
         "LogDir": {
           "type": "string"
         },
-        "CacheDir": {
-          "type": "string"
+        "Logger": {
+          "#ref": "#/definitions/logger"
         },
-        "TmpDir": {
-          "type": "string"
+        "LogLevel": {
+          "#ref": "#/definitions/loglevel"
+        },
+        "LogRotation": {
+          "#ref": "#/definitions/logrotation"
         },
-        "LogStrategy": {
+        "CacheDir": {
           "type": "string"
         },
         "SSHPort": {
@@ -123,20 +455,12 @@
           "minimum": 2,
           "maximum": 16000
         },
-        "DebugEnable": {
-          "type": "boolean"
-        },
         "ExperimentalFeaturesEnable": {
           "type": "boolean"
-        },
-        "TraceEnable": {
-          "type": "boolean"
         }
-      },
-      "additionalProperties": false
+      }
     }
   },
-  "additionalProperties": false,
   "required": [
     "Client",
     "Server",