From 3cc8887885f24a3f0d607af24197bc364ab16b8d Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 12 Aug 2021 10:56:36 +0300 Subject: add missing brush and also add color client configs plus jsonschema --- samples/dtail.schema.json | 111 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) (limited to 'samples/dtail.schema.json') diff --git a/samples/dtail.schema.json b/samples/dtail.schema.json index 0497fbf..7978baf 100755 --- a/samples/dtail.schema.json +++ b/samples/dtail.schema.json @@ -4,7 +4,116 @@ "type": "object", "properties": { "Client": { - "properties": {}, + "properties": { + "TermColorsEnable": { + "type": "boolean" + }, + "TermColors": { + "type": "object", + "properties": { + "ClientErrorAttr": { + "type": "string" + }, + "ClientErrorBg": { + "type": "string" + }, + "ClientErrorFg": { + "type": "string" + }, + "ClientStatsAttr": { + "type": "string" + }, + "ClientStatsBg": { + "type": "string" + }, + "ClientStatsFg": { + "type": "string" + }, + "ClientWarnAttr": { + "type": "string" + }, + "ClientWarnBg": { + "type": "string" + }, + "ClientWarnFg": { + "type": "string" + }, + "RemoteDebugAttr": { + "type": "string" + }, + "RemoteDebugBg": { + "type": "string" + }, + "RemoteDebugFg": { + "type": "string" + }, + "RemoteErrorAttr": { + "type": "string" + }, + "RemoteErrorBg": { + "type": "string" + }, + "RemoteErrorFg": { + "type": "string" + }, + "RemoteFatalAttr": { + "type": "string" + }, + "RemoteFatalBg": { + "type": "string" + }, + "RemoteFatalFg": { + "type": "string" + }, + "RemoteStatsOkAttr": { + "type": "string" + }, + "RemoteStatsOkBg": { + "type": "string" + }, + "RemoteStatsOkFg": { + "type": "string" + }, + "RemoteStatsWarnAttr": { + "type": "string" + }, + "RemoteStatsWarnBg": { + "type": "string" + }, + "RemoteStatsWarnFg": { + "type": "string" + }, + "RemoteTextAttr": { + "type": "string" + }, + "RemoteTextBg": { + "type": "string" + }, + "RemoteTextFg": { + "type": "string" + }, + "RemoteTraceAttr": { + "type": "string" + }, + "RemoteTraceBg": { + "type": "string" + }, + "RemoteTraceFg": { + "type": "string" + }, + "RemoteWarnAttr": { + "type": "string" + }, + "RemoteWarnBg": { + "type": "string" + }, + "RemoteWarnFg": { + "type": "string" + } + }, + "additionalProperties": false + } + }, "additionalProperties": false }, "Server": { -- cgit v1.2.3 From bfcb0f159a4835cc6a0326ff46de7934e0363aed Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 5 Sep 2021 15:51:26 +0300 Subject: finalize new default color schema --- samples/dtail.schema.json | 9 --------- 1 file changed, 9 deletions(-) (limited to 'samples/dtail.schema.json') diff --git a/samples/dtail.schema.json b/samples/dtail.schema.json index 7978baf..0fd06f1 100755 --- a/samples/dtail.schema.json +++ b/samples/dtail.schema.json @@ -20,15 +20,6 @@ "ClientErrorFg": { "type": "string" }, - "ClientStatsAttr": { - "type": "string" - }, - "ClientStatsBg": { - "type": "string" - }, - "ClientStatsFg": { - "type": "string" - }, "ClientWarnAttr": { "type": "string" }, -- cgit v1.2.3 From 86ec83754e0ee7153ad55091f7b6da448bc529c5 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 2 Oct 2021 13:44:27 +0300 Subject: add dcat test --- samples/dtail.schema.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'samples/dtail.schema.json') diff --git a/samples/dtail.schema.json b/samples/dtail.schema.json index 0fd06f1..37761f8 100755 --- a/samples/dtail.schema.json +++ b/samples/dtail.schema.json @@ -209,6 +209,9 @@ "LogDir": { "type": "string" }, + "LogLevel": { + "type": "string" + }, "CacheDir": { "type": "string" }, -- cgit v1.2.3 From a6098084f7150df34edecf1519386bd28a527361 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 11 Oct 2021 17:42:37 +0300 Subject: Update JSON-schema to reflect all recent config file changes. --- samples/dtail.schema.json | 493 +++++++++++++++++++++++++++++++++------------- 1 file changed, 354 insertions(+), 139 deletions(-) (limited to 'samples/dtail.schema.json') diff --git a/samples/dtail.schema.json b/samples/dtail.schema.json index 37761f8..9bba4c9 100755 --- a/samples/dtail.schema.json +++ b/samples/dtail.schema.json @@ -1,118 +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": { + "additionalProperties": false, "properties": { "TermColorsEnable": { "type": "boolean" }, "TermColors": { "type": "object", + "additionalProperties": false, "properties": { - "ClientErrorAttr": { - "type": "string" - }, - "ClientErrorBg": { - "type": "string" - }, - "ClientErrorFg": { - "type": "string" - }, - "ClientWarnAttr": { - "type": "string" - }, - "ClientWarnBg": { - "type": "string" - }, - "ClientWarnFg": { - "type": "string" - }, - "RemoteDebugAttr": { - "type": "string" - }, - "RemoteDebugBg": { - "type": "string" - }, - "RemoteDebugFg": { - "type": "string" - }, - "RemoteErrorAttr": { - "type": "string" - }, - "RemoteErrorBg": { - "type": "string" - }, - "RemoteErrorFg": { - "type": "string" - }, - "RemoteFatalAttr": { - "type": "string" - }, - "RemoteFatalBg": { - "type": "string" - }, - "RemoteFatalFg": { - "type": "string" - }, - "RemoteStatsOkAttr": { - "type": "string" - }, - "RemoteStatsOkBg": { - "type": "string" - }, - "RemoteStatsOkFg": { - "type": "string" - }, - "RemoteStatsWarnAttr": { - "type": "string" - }, - "RemoteStatsWarnBg": { - "type": "string" - }, - "RemoteStatsWarnFg": { - "type": "string" - }, - "RemoteTextAttr": { - "type": "string" - }, - "RemoteTextBg": { - "type": "string" - }, - "RemoteTextFg": { - "type": "string" - }, - "RemoteTraceAttr": { - "type": "string" - }, - "RemoteTraceBg": { - "type": "string" + "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" + } + } }, - "RemoteTraceFg": { - "type": "string" + "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" + } + } }, - "RemoteWarnAttr": { - "type": "string" + "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" + } + } }, - "RemoteWarnBg": { - "type": "string" + "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" + } + } }, - "RemoteWarnFg": { - "type": "string" + "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" + } + } } - }, - "additionalProperties": false + } } - }, - "additionalProperties": false + } }, "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" @@ -147,6 +401,7 @@ "type": "array", "items": { "type": "object", + "additionalProperties": false, "properties": { "Name": { "type": "string" @@ -168,57 +423,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" }, - "LogLevel": { - "type": "string" + "Logger": { + "#ref": "#/definitions/logger" }, - "CacheDir": { - "type": "string" + "LogLevel": { + "#ref": "#/definitions/loglevel" }, - "TmpDir": { - "type": "string" + "LogRotation": { + "#ref": "#/definitions/logrotation" }, - "LogStrategy": { + "CacheDir": { "type": "string" }, "SSHPort": { @@ -226,20 +449,12 @@ "minimum": 2, "maximum": 16000 }, - "DebugEnable": { - "type": "boolean" - }, "ExperimentalFeaturesEnable": { "type": "boolean" - }, - "TraceEnable": { - "type": "boolean" } - }, - "additionalProperties": false + } } }, - "additionalProperties": false, "required": [ "Client", "Server", -- cgit v1.2.3 From 5b56cb675fb3b7ad58c5de28760bc19f63a575bb Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 20 Oct 2021 06:21:54 +0300 Subject: Add AllowFrom to server side schedulers JSON schema --- samples/dtail.schema.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'samples/dtail.schema.json') diff --git a/samples/dtail.schema.json b/samples/dtail.schema.json index 9bba4c9..bf07525 100755 --- a/samples/dtail.schema.json +++ b/samples/dtail.schema.json @@ -374,6 +374,12 @@ "Enable": { "type": "boolean" }, + "AllowFrom": { + "type": "array", + "items": { + "type": "string" + } + }, "TimeRange": { "type": "array", "items": [ -- cgit v1.2.3