go.d.plugin: jsonschema allow array/object to be null (netdata#17166)

ilyam8 · Mar 14, 2024 · c56a123 · c56a123
1 parent 410884d
commit c56a123
Show file tree

Hide file tree

Showing 55 changed files with 468 additions and 117 deletions.
diff --git a/src/go/collectors/go.d.plugin/modules/activemq/config_schema.json b/src/go/collectors/go.d.plugin/modules/activemq/config_schema.json
@@ -96,7 +96,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/apache/config_schema.json b/src/go/collectors/go.d.plugin/modules/apache/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/bind/config_schema.json b/src/go/collectors/go.d.plugin/modules/bind/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/cassandra/config_schema.json b/src/go/collectors/go.d.plugin/modules/cassandra/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/config_schema.json b/src/go/collectors/go.d.plugin/modules/cockroachdb/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/consul/config_schema.json b/src/go/collectors/go.d.plugin/modules/consul/config_schema.json
@@ -68,7 +68,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/coredns/config_schema.json b/src/go/collectors/go.d.plugin/modules/coredns/config_schema.json
@@ -33,12 +33,18 @@
  "per_server_stats": {
  "title": "Server selector",
  "description": "Configures collection of per-server statistics. If left empty, no stats will be collected. Matching is performed against the `server` label value.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "properties": {
  "includes": {
  "title": "Include",
  "description": "Include servers whose names match any of the specified inclusion [patterns](https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/pkg/matcher#readme).",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Server pattern",
  "type": "string"
@@ -48,7 +54,10 @@
  "excludes": {
  "title": "Exclude",
  "description": "Exclude servers whose names match any of the specified exclusion [patterns](https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/pkg/matcher#readme).",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Server pattern",
  "type": "string"
@@ -60,12 +69,18 @@
  "per_zone_stats": {
  "title": "Zone selector",
  "description": "Configures collection of per-zone statistics. If left empty, no stats will be collected. Matching is performed against the `zone` label value.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "properties": {
  "includes": {
  "title": "Include",
  "description": "Include zones whose names match any of the specified inclusion [patterns](https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/pkg/matcher#readme).",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Zone pattern",
  "type": "string"
@@ -75,7 +90,10 @@
  "excludes": {
  "title": "Exclude",
  "description": "Exclude zones whose names match any of the specified exclusion [patterns](https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/pkg/matcher#readme).",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Zone pattern",
  "type": "string"
@@ -116,7 +134,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/couchbase/config_schema.json b/src/go/collectors/go.d.plugin/modules/couchbase/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/couchdb/config_schema.json b/src/go/collectors/go.d.plugin/modules/couchdb/config_schema.json
@@ -73,7 +73,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/dnsdist/config_schema.json b/src/go/collectors/go.d.plugin/modules/dnsdist/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/dnsquery/config_schema.json b/src/go/collectors/go.d.plugin/modules/dnsquery/config_schema.json
@@ -37,7 +37,10 @@
  "record_types": {
  "title": "Record types",
  "description": "Types of DNS records to query for each server.",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "type": "string",
  "enum": [
@@ -63,7 +66,10 @@
  "servers": {
  "title": "Servers",
  "description": "List of DNS servers to query.",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "DNS server",
  "description": "IP address or hostname of the DNS server.",
@@ -78,7 +84,10 @@
  "domains": {
  "title": "Domains",
  "description": "List of domains or subdomains to query. A random domain will be selected from this list at each iteration.",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Domain",
  "type": "string"

diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/config_schema.json b/src/go/collectors/go.d.plugin/modules/docker_engine/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/config_schema.json b/src/go/collectors/go.d.plugin/modules/dockerhub/config_schema.json
@@ -28,7 +28,10 @@
  "repositories": {
  "title": "Repositories",
  "description": "List of repositories to monitor.",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Name",
  "description": "The name of the repository.",
@@ -74,7 +77,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/elasticsearch/config_schema.json b/src/go/collectors/go.d.plugin/modules/elasticsearch/config_schema.json
@@ -92,7 +92,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/envoy/config_schema.json b/src/go/collectors/go.d.plugin/modules/envoy/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/example/config_schema.json b/src/go/collectors/go.d.plugin/modules/example/config_schema.json
@@ -13,7 +13,10 @@
  },
  "charts": {
  "title": "Charts configuration",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "properties": {
  "type": {
  "title": "Chart type",
@@ -65,7 +68,10 @@
  },
  "hidden_charts": {
  "title": "Hidden charts configuration",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "properties": {
  "type": {
  "title": "Chart type",

diff --git a/src/go/collectors/go.d.plugin/modules/filecheck/config_schema.json b/src/go/collectors/go.d.plugin/modules/filecheck/config_schema.json
@@ -14,12 +14,18 @@
  "files": {
  "title": "File selector",
  "description": "Configuration for monitoring specific files. If left empy, no files will be monitored.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "properties": {
  "include": {
  "title": "Include",
  "description": "Include files that match any of the specified include [patterns](https://golang.org/pkg/path/filepath/#Match).",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Filepath",
  "type": "string",
@@ -30,7 +36,10 @@
  "exclude": {
  "title": "Exclude",
  "description": "Exclude files that match any of the specified exclude [patterns](https://golang.org/pkg/path/filepath/#Match).",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Filepath",
  "type": "string",
@@ -52,12 +61,18 @@
  "dirs": {
  "title": "Directory selector",
  "description": "Configuration for monitoring specific directories. If left empy, no directories will be monitored.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "properties": {
  "include": {
  "title": "Include",
  "description": "Include directories that match any of the specified include [patterns](https://golang.org/pkg/path/filepath/#Match).",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Directory",
  "type": "string",
@@ -68,7 +83,10 @@
  "exclude": {
  "title": "Exclude",
  "description": "Exclude directories that match any of the specified exclude [patterns](https://golang.org/pkg/path/filepath/#Match).",
- "type": "array",
+ "type": [
+ "array",
+ "null"
+ ],
  "items": {
  "title": "Directory",
  "type": "string",

diff --git a/src/go/collectors/go.d.plugin/modules/fluentd/config_schema.json b/src/go/collectors/go.d.plugin/modules/fluentd/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }

diff --git a/src/go/collectors/go.d.plugin/modules/geth/config_schema.json b/src/go/collectors/go.d.plugin/modules/geth/config_schema.json
@@ -62,7 +62,10 @@
  "headers": {
  "title": "Headers",
  "description": "Additional HTTP headers to include in the request.",
- "type": "object",
+ "type": [
+ "object",
+ "null"
+ ],
  "additionalProperties": {
  "type": "string"
  }