Skip to content

Commit

Permalink
Multiple changes in both schemas to match software updates (#3894)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexdgilbert
alexdgilbert authored Jun 29, 2024
1 parent 45cb738 commit 0b5f9a6
Show file tree
Hide file tree
Showing 3 changed files with 254 additions and 43 deletions.
63 changes: 61 additions & 2 deletions src/schemas/json/metricshub-connector.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,72 @@
},
"query": {
"type": "string",
"description": "WMI Description"
"description": "WMI Query"
},
"namespace": {
"type": "string",
"description": "WMI Namespace"
}
}
},
{
"properties": {
"type": {
"type": "string",
"const": "sql"
},
"forceSerialization": {
"type": "boolean"
},
"executeForEachEntryOf": {
"$ref": "#/definitions/executeForEachEntryOf"
},
"tables": {
"type": "array",
"description": "The list of tables to be used in the SQL query",
"items": {
"type": "object",
"properties": {
"source": {
"type": "string",
"description": "Source to be used as a table"
},
"alias": {
"type": "string",
"description": "Alias for the table"
},
"columns": {
"type": "array",
"description": "SQL table columns",
"items": {
"type": "object",
"properties": {
"name": {
"type": "string",
"description": "Column name"
},
"type": {
"type": "string",
"description": "SQL column type"
},
"number": {
"type": "integer",
"description": "Column number in the source"
}
}
}
}
}
}
},
"computes": {
"$ref": "#/definitions/computes"
},
"query": {
"type": "string",
"description": "SQL Query"
}
}
}
]
}
Expand Down Expand Up @@ -388,7 +447,7 @@
"properties": {
"type": {
"type": "string",
"enum": ["and", "leftConcat", "rightConcat"]
"enum": ["and", "prepend", "append"]
},
"column": {
"type": "integer",
Expand Down
208 changes: 180 additions & 28 deletions src/schemas/json/metricshub.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@
"port": {
"type": "number",
"description": "Sets the HTTPS port number used to perform HTTP requests (Default: 443)."
},
"hostname": {
"type": "string",
"description": "Target hostname."
}
}
},
Expand Down Expand Up @@ -153,6 +157,10 @@
"skipAuth": {
"type": "boolean",
"description": "Skip Authentication"
},
"hostname": {
"type": "string",
"description": "Target hostname."
}
}
},
Expand Down Expand Up @@ -181,38 +189,107 @@
"type": "string",
"description": "Sets the sudo command to be used for the host to be monitored (Default: sudo).",
"default": "sudo"
},
"hostname": {
"type": "string",
"description": "Target hostname."
}
}
},
"ping": {
"type": "object",
"description": "Configures the Ping protocol to access the host.",
"properties": {
"hostname": {
"type": "string",
"description": "Target hostname."
},
"timeout": {
"$ref": "#/definitions/duration",
"description": "Sets how long until the ping times out (Default: 5s).",
"default": "5s"
}
}
},
"snmp": {
"type": "object",
"description": "Configures the SNMP protocol to access the host.",
"oneOf": [
{
"properties": {
"version": {
"description": "Sets the version of the SNMP protocol (Default: v1).",
"type": "string",
"enum": ["v1", "v2c"],
"default": "v1"
},
"community": {
"type": "string",
"description": "Sets the SNMP Community string to use to perform queries (Default: public)."
},
"timeout": {
"$ref": "#/definitions/duration",
"description": "Sets how long until the SNMP request times out (Default: 120s).",
"default": "120s"
},
"port": {
"type": "number",
"description": "Sets the SNMP port number used to perform SNMP queries (Default: 161).",
"default": 161
}
}
"properties": {
"version": {
"description": "Sets the version of the SNMP protocol (Default: v1).",
"type": "string",
"enum": ["v1", "v2c"],
"default": "v1"
},
"community": {
"type": "string",
"description": "Sets the SNMP Community string to use to perform queries (Default: public)."
},
"timeout": {
"$ref": "#/definitions/duration",
"description": "Sets how long until the SNMP request times out (Default: 120s).",
"default": "120s"
},
"port": {
"type": "number",
"description": "Sets the SNMP port number used to perform SNMP queries (Default: 161).",
"default": 161
},
"hostname": {
"type": "string",
"description": "Target hostname."
}
]
}
},
"snmpv3": {
"type": "object",
"description": "Configures the SNMP protocol to access the host.",
"properties": {
"username": {
"type": "string",
"description": "Sets the username to use for performing the SNMPv3 query."
},
"password": {
"type": "string",
"description": "Sets the password to use for performing the SNMPv3 query."
},
"privacyPassword": {
"type": "string",
"description": "Sets the privacy password to use for performing the SNMPv3 query."
},
"timeout": {
"$ref": "#/definitions/duration",
"description": "Sets how long until the SNMP request times out (Default: 120s).",
"default": "120s"
},
"port": {
"type": "number",
"description": "Sets the SNMP port number used to perform SNMP queries (Default: 161).",
"default": 161
},
"contextName": {
"type": "string",
"description": "Sets the context name."
},
"authType": {
"type": "string",
"enum": ["NO_AUTH", "MD5", "SHA"],
"description": "Sets the SNMPv3 authentication type. (MD5, SHA or NO_AUTH)."
},
"privacy": {
"type": "string",
"enum": ["DES", "AES", "none"],
"description": "Sets the SNMPv3 encryption type. (AES, DES or none)."
},
"retryIntervals": {
"type": "string",
"description": "Comma-separated retry intervals in milliseconds for SNMPv3 operations"
},
"hostname": {
"type": "string",
"description": "Target hostname."
}
}
},
"ssh": {
"type": "object",
Expand All @@ -224,7 +301,7 @@
},
"password": {
"type": "string",
"description": "ets the password to use for performing the SSH query."
"description": "Sets the password to use for performing the SSH query."
},
"timeout": {
"$ref": "#/definitions/duration",
Expand All @@ -251,6 +328,10 @@
"privateKey": {
"type": "string",
"description": "Sets the private Key File to use to establish the connection to the host through the SSH protocol."
},
"hostname": {
"type": "string",
"description": "Target hostname."
}
}
},
Expand Down Expand Up @@ -283,6 +364,10 @@
"username": {
"description": "Sets the username used to establish the connection with the host through the WBEM protocol.",
"type": "string"
},
"hostname": {
"type": "string",
"description": "Target hostname."
}
}
},
Expand Down Expand Up @@ -323,6 +408,10 @@
"type": "string",
"enum": ["ntlm", "kerberos"]
}
},
"hostname": {
"type": "string",
"description": "Target hostname."
}
}
},
Expand All @@ -345,6 +434,10 @@
"username": {
"description": "Sets the username used to establish the connection with the host through the WMI protocol.",
"type": "string"
},
"hostname": {
"type": "string",
"description": "Target hostname."
}
}
}
Expand Down Expand Up @@ -858,13 +951,72 @@
},
"query": {
"type": "string",
"description": "WMI Description"
"description": "WMI Query"
},
"namespace": {
"type": "string",
"description": "WMI Namespace"
}
}
},
{
"properties": {
"type": {
"type": "string",
"const": "sql"
},
"forceSerialization": {
"type": "boolean"
},
"executeForEachEntryOf": {
"$ref": "#/definitions/executeForEachEntryOf"
},
"tables": {
"type": "array",
"description": "The list of tables to be used in the SQL query",
"items": {
"type": "object",
"properties": {
"source": {
"type": "string",
"description": "Source to be used as a table"
},
"alias": {
"type": "string",
"description": "Alias for the table"
},
"columns": {
"type": "array",
"description": "SQL table columns",
"items": {
"type": "object",
"properties": {
"name": {
"type": "string",
"description": "Column name"
},
"type": {
"type": "string",
"description": "SQL column type"
},
"number": {
"type": "integer",
"description": "Column number in the source"
}
}
}
}
}
}
},
"computes": {
"$ref": "#/definitions/computes"
},
"query": {
"type": "string",
"description": "SQL Query"
}
}
}
]
}
Expand Down Expand Up @@ -894,7 +1046,7 @@
"properties": {
"type": {
"type": "string",
"enum": ["and", "leftConcat", "rightConcat"]
"enum": ["and", "prepend", "append"]
},
"column": {
"type": "integer",
Expand Down
Loading

0 comments on commit 0b5f9a6

Please sign in to comment.