diff --git a/contracts/cloud-diff.yml b/contracts/cloud-diff.yml index f1978107..624b5ff7 100644 --- a/contracts/cloud-diff.yml +++ b/contracts/cloud-diff.yml @@ -1423,7 +1423,6 @@ paths: description: The user-facing description of the dashboard. required: - orgID - - name responses: '201': description: Success. The dashboard is created. @@ -2298,6 +2297,7 @@ paths: - name - orgID - query + - status - type: object required: - type diff --git a/contracts/cloud.json b/contracts/cloud.json index 9640cc83..bf17ab35 100644 --- a/contracts/cloud.json +++ b/contracts/cloud.json @@ -245,7 +245,7 @@ }, "X-Influxdb-Version": { "schema": { - "type": "integer" + "type": "string" }, "description": "The version of InfluxDB.\n\n#### InfluxDB Cloud\n - Doesn't return version.\n" } @@ -284,7 +284,7 @@ }, "X-Influxdb-Version": { "schema": { - "type": "integer" + "type": "string" }, "description": "The version of InfluxDB.\n\n#### InfluxDB Cloud\n- Doesn't return version.\n" } @@ -7695,7 +7695,10 @@ "type": "string" } } - } + }, + "required": [ + "orgID" + ] } } } @@ -14874,7 +14877,10 @@ ] } } - } + }, + "required": [ + "orgID" + ] }, "TemplateKind": { "type": "string", @@ -14926,7 +14932,10 @@ } } } - } + }, + "required": [ + "orgID" + ] } }, "resources": { @@ -14984,7 +14993,10 @@ } } } - } + }, + "required": [ + "orgID" + ] } }, "resources": { @@ -19092,8 +19104,7 @@ } }, "required": [ - "orgID", - "name" + "orgID" ] }, "DashboardWithViewProperties": { @@ -19321,7 +19332,10 @@ "orgID": { "type": "string" } - } + }, + "required": [ + "orgID" + ] }, "Telegraf": { "type": "object", @@ -19808,7 +19822,8 @@ "required": [ "name", "orgID", - "query" + "query", + "status" ] }, "ThresholdCheck": { @@ -20172,7 +20187,9 @@ "status", "name", "statusRules", - "endpointID" + "endpointID", + "status", + "every" ], "properties": { "latestCompleted": { @@ -20585,8 +20602,10 @@ "NotificationEndpointBase": { "type": "object", "required": [ + "orgID", "type", - "name" + "name", + "status" ], "properties": { "id": { diff --git a/contracts/cloud.yml b/contracts/cloud.yml index ea80266e..a5c3ad70 100644 --- a/contracts/cloud.yml +++ b/contracts/cloud.yml @@ -428,7 +428,7 @@ paths: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -471,7 +471,7 @@ paths: description: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -6425,6 +6425,8 @@ paths: type: array items: type: string + required: + - orgID responses: '201': description: Success. Returns the newly created stack. @@ -12197,6 +12199,8 @@ components: required: - kind - resourceTemplateName + required: + - orgID TemplateKind: type: string enum: @@ -12237,6 +12241,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -12275,6 +12281,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -15142,7 +15150,6 @@ components: description: The user-facing description of the dashboard. required: - orgID - - name DashboardWithViewProperties: type: object allOf: @@ -15291,6 +15298,8 @@ components: type: string orgID: type: string + required: + - orgID Telegraf: type: object allOf: @@ -15633,6 +15642,7 @@ components: - name - orgID - query + - status ThresholdCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -15857,6 +15867,8 @@ components: - name - statusRules - endpointID + - status + - every properties: latestCompleted: description: 'A timestamp ([RFC3339 date/time format](https://docs.influxdata.com/influxdb/cloud/reference/glossary/#rfc3339-timestamp)) of the latest scheduled and completed run.' @@ -16124,8 +16136,10 @@ components: NotificationEndpointBase: type: object required: + - orgID - type - name + - status properties: id: type: string diff --git a/contracts/common.yml b/contracts/common.yml index dcf36660..deb0d6e4 100644 --- a/contracts/common.yml +++ b/contracts/common.yml @@ -139,7 +139,7 @@ paths: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -182,7 +182,7 @@ paths: description: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -6136,6 +6136,8 @@ paths: type: array items: type: string + required: + - orgID responses: '201': description: Success. Returns the newly created stack. @@ -10119,6 +10121,8 @@ components: required: - kind - resourceTemplateName + required: + - orgID TemplateKind: type: string enum: @@ -10159,6 +10163,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -10197,6 +10203,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -13064,7 +13072,6 @@ components: description: The user-facing description of the dashboard. required: - orgID - - name DashboardWithViewProperties: type: object allOf: @@ -13213,6 +13220,8 @@ components: type: string orgID: type: string + required: + - orgID Telegraf: type: object allOf: @@ -13555,6 +13564,7 @@ components: - name - orgID - query + - status ThresholdCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -13779,6 +13789,8 @@ components: - name - statusRules - endpointID + - status + - every properties: latestCompleted: description: 'A timestamp ([RFC3339 date/time format](https://docs.influxdata.com/influxdb/v2.3/reference/glossary/#rfc3339-timestamp)) of the latest scheduled and completed run.' @@ -14046,8 +14058,10 @@ components: NotificationEndpointBase: type: object required: + - orgID - type - name + - status properties: id: type: string diff --git a/contracts/oss-diff.yml b/contracts/oss-diff.yml index 1f634a0b..9c852ac3 100644 --- a/contracts/oss-diff.yml +++ b/contracts/oss-diff.yml @@ -3261,7 +3261,6 @@ paths: description: The user-facing description of the dashboard. required: - orgID - - name responses: '201': description: Success. The dashboard is created. @@ -4133,6 +4132,7 @@ paths: - name - orgID - query + - status - type: object required: - type @@ -6013,6 +6013,8 @@ components: enum: - flux - influxql + required: + - orgID Sources: type: object properties: @@ -6051,6 +6053,9 @@ components: type: boolean description: Skip TLS verification on endpoint. default: false + required: + - orgID + - bucketID ScraperTargetResponse: type: object allOf: diff --git a/contracts/oss.json b/contracts/oss.json index 7810f447..13b3d170 100644 --- a/contracts/oss.json +++ b/contracts/oss.json @@ -246,7 +246,7 @@ }, "X-Influxdb-Version": { "schema": { - "type": "integer" + "type": "string" }, "description": "The version of InfluxDB.\n\n#### InfluxDB Cloud\n - Doesn't return version.\n" } @@ -285,7 +285,7 @@ }, "X-Influxdb-Version": { "schema": { - "type": "integer" + "type": "string" }, "description": "The version of InfluxDB.\n\n#### InfluxDB Cloud\n- Doesn't return version.\n" } @@ -7696,7 +7696,10 @@ "type": "string" } } - } + }, + "required": [ + "orgID" + ] } } } @@ -17251,7 +17254,10 @@ ] } } - } + }, + "required": [ + "orgID" + ] }, "TemplateKind": { "type": "string", @@ -17303,7 +17309,10 @@ } } } - } + }, + "required": [ + "orgID" + ] } }, "resources": { @@ -17361,7 +17370,10 @@ } } } - } + }, + "required": [ + "orgID" + ] } }, "resources": { @@ -21469,8 +21481,7 @@ } }, "required": [ - "orgID", - "name" + "orgID" ] }, "DashboardWithViewProperties": { @@ -21698,7 +21709,10 @@ "orgID": { "type": "string" } - } + }, + "required": [ + "orgID" + ] }, "Telegraf": { "type": "object", @@ -22185,7 +22199,8 @@ "required": [ "name", "orgID", - "query" + "query", + "status" ] }, "ThresholdCheck": { @@ -22549,7 +22564,9 @@ "status", "name", "statusRules", - "endpointID" + "endpointID", + "status", + "every" ], "properties": { "latestCompleted": { @@ -22962,8 +22979,10 @@ "NotificationEndpointBase": { "type": "object", "required": [ + "orgID", "type", - "name" + "name", + "status" ], "properties": { "id": { @@ -23614,7 +23633,10 @@ ] } } - } + }, + "required": [ + "orgID" + ] }, "Sources": { "type": "object", @@ -23668,7 +23690,11 @@ "description": "Skip TLS verification on endpoint.", "default": false } - } + }, + "required": [ + "orgID", + "bucketID" + ] }, "ScraperTargetResponse": { "type": "object", diff --git a/contracts/oss.yml b/contracts/oss.yml index 0b4d47e4..44b7c9ba 100644 --- a/contracts/oss.yml +++ b/contracts/oss.yml @@ -418,7 +418,7 @@ paths: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -461,7 +461,7 @@ paths: description: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -6415,6 +6415,8 @@ paths: type: array items: type: string + required: + - orgID responses: '201': description: Success. Returns the newly created stack. @@ -13773,6 +13775,8 @@ components: required: - kind - resourceTemplateName + required: + - orgID TemplateKind: type: string enum: @@ -13813,6 +13817,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -13851,6 +13857,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -16718,7 +16726,6 @@ components: description: The user-facing description of the dashboard. required: - orgID - - name DashboardWithViewProperties: type: object allOf: @@ -16867,6 +16874,8 @@ components: type: string orgID: type: string + required: + - orgID Telegraf: type: object allOf: @@ -17209,6 +17218,7 @@ components: - name - orgID - query + - status ThresholdCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -17433,6 +17443,8 @@ components: - name - statusRules - endpointID + - status + - every properties: latestCompleted: description: 'A timestamp ([RFC3339 date/time format](https://docs.influxdata.com/influxdb/v2.3/reference/glossary/#rfc3339-timestamp)) of the latest scheduled and completed run.' @@ -17700,8 +17712,10 @@ components: NotificationEndpointBase: type: object required: + - orgID - type - name + - status properties: id: type: string @@ -18151,6 +18165,8 @@ components: enum: - flux - influxql + required: + - orgID Sources: type: object properties: @@ -18189,6 +18205,9 @@ components: type: boolean description: Skip TLS verification on endpoint. default: false + required: + - orgID + - bucketID ScraperTargetResponse: type: object allOf: diff --git a/contracts/ref/cloud.yml b/contracts/ref/cloud.yml index d4913bf6..1eeb8dc2 100644 --- a/contracts/ref/cloud.yml +++ b/contracts/ref/cloud.yml @@ -869,6 +869,7 @@ components: - name - orgID - query + - status CheckDiscriminator: discriminator: mapping: @@ -1032,7 +1033,6 @@ components: type: string required: - orgID - - name CustomCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -3117,8 +3117,10 @@ components: userID: type: string required: + - orgID - type - name + - status type: object NotificationEndpointDiscriminator: discriminator: @@ -3275,6 +3277,8 @@ components: - name - statusRules - endpointID + - status + - every type: object NotificationRuleDiscriminator: discriminator: @@ -5093,6 +5097,8 @@ components: type: string type: object type: array + required: + - orgID type: object TelegrafPlugins: properties: @@ -5435,6 +5441,8 @@ components: type: array type: object type: array + required: + - orgID type: object TemplateChart: properties: @@ -5499,6 +5507,8 @@ components: $ref: '#/components/schemas/TemplateKind' type: array type: object + required: + - orgID type: object type: array resources: @@ -5539,6 +5549,8 @@ components: $ref: '#/components/schemas/TemplateKind' type: array type: object + required: + - orgID type: object type: array resources: @@ -12103,7 +12115,7 @@ paths: #### InfluxDB Cloud - Doesn't return version. schema: - type: integer + type: string servers: - url: "" summary: Get the status of the instance @@ -12147,7 +12159,7 @@ paths: #### InfluxDB Cloud - Doesn't return version. schema: - type: integer + type: string servers: - url: "" summary: Get the status of the instance @@ -14757,6 +14769,8 @@ paths: items: type: string type: array + required: + - orgID title: PostStackRequest type: object description: The stack to create. diff --git a/contracts/ref/oss.yml b/contracts/ref/oss.yml index 350b9260..0d5788e5 100644 --- a/contracts/ref/oss.yml +++ b/contracts/ref/oss.yml @@ -898,6 +898,7 @@ components: - name - orgID - query + - status CheckDiscriminator: discriminator: mapping: @@ -1051,7 +1052,6 @@ components: type: string required: - orgID - - name CustomCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -2881,8 +2881,10 @@ components: userID: type: string required: + - orgID - type - name + - status type: object NotificationEndpointDiscriminator: discriminator: @@ -3039,6 +3041,8 @@ components: - name - statusRules - endpointID + - status + - every type: object NotificationRuleDiscriminator: discriminator: @@ -4362,6 +4366,9 @@ components: description: The URL of the metrics endpoint. example: http://localhost:9090/metrics type: string + required: + - orgID + - bucketID type: object ScraperTargetResponse: allOf: @@ -4651,6 +4658,8 @@ components: type: string username: type: string + required: + - orgID type: object Sources: properties: @@ -5143,6 +5152,8 @@ components: type: string type: object type: array + required: + - orgID type: object TelegrafPlugins: properties: @@ -5485,6 +5496,8 @@ components: type: array type: object type: array + required: + - orgID type: object TemplateChart: properties: @@ -5549,6 +5562,8 @@ components: $ref: '#/components/schemas/TemplateKind' type: array type: object + required: + - orgID type: object type: array resources: @@ -5589,6 +5604,8 @@ components: $ref: '#/components/schemas/TemplateKind' type: array type: object + required: + - orgID type: object type: array resources: @@ -12635,7 +12652,7 @@ paths: #### InfluxDB Cloud - Doesn't return version. schema: - type: integer + type: string servers: - url: "" summary: Get the status of the instance @@ -12679,7 +12696,7 @@ paths: #### InfluxDB Cloud - Doesn't return version. schema: - type: integer + type: string servers: - url: "" summary: Get the status of the instance @@ -15677,6 +15694,8 @@ paths: items: type: string type: array + required: + - orgID title: PostStackRequest type: object description: The stack to create. diff --git a/src/common/paths/ping.yml b/src/common/paths/ping.yml index 5e92cecd..15ffb6e8 100644 --- a/src/common/paths/ping.yml +++ b/src/common/paths/ping.yml @@ -32,7 +32,7 @@ get: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -75,7 +75,7 @@ head: description: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. diff --git a/src/common/paths/stacks.yml b/src/common/paths/stacks.yml index 4a24704d..29023609 100644 --- a/src/common/paths/stacks.yml +++ b/src/common/paths/stacks.yml @@ -153,6 +153,8 @@ post: type: array items: type: string + required: + - orgID responses: "201": description: Success. Returns the newly created stack. diff --git a/src/common/schemas/CheckBase.yml b/src/common/schemas/CheckBase.yml index 1874ff9f..bf3b6560 100644 --- a/src/common/schemas/CheckBase.yml +++ b/src/common/schemas/CheckBase.yml @@ -71,4 +71,4 @@ query: description: The URL to retrieve the Flux script for this check. $ref: "./Link.yml" - required: [name, orgID, query] + required: [name, orgID, query, status] diff --git a/src/common/schemas/CreateDashboardRequest.yml b/src/common/schemas/CreateDashboardRequest.yml index 0e307e17..227ef350 100644 --- a/src/common/schemas/CreateDashboardRequest.yml +++ b/src/common/schemas/CreateDashboardRequest.yml @@ -10,4 +10,3 @@ description: The user-facing description of the dashboard. required: - orgID - - name diff --git a/src/common/schemas/NotificationEndpointBase.yml b/src/common/schemas/NotificationEndpointBase.yml index f84642be..419a22de 100644 --- a/src/common/schemas/NotificationEndpointBase.yml +++ b/src/common/schemas/NotificationEndpointBase.yml @@ -1,5 +1,5 @@ type: object - required: [type, name] + required: [orgID, type, name, status] properties: id: type: string diff --git a/src/common/schemas/NotificationRuleBase.yml b/src/common/schemas/NotificationRuleBase.yml index ddea84d2..660746e5 100644 --- a/src/common/schemas/NotificationRuleBase.yml +++ b/src/common/schemas/NotificationRuleBase.yml @@ -5,6 +5,8 @@ - name - statusRules - endpointID + - status + - every properties: latestCompleted: description: A timestamp ([RFC3339 date/time format]({{% INFLUXDB_DOCS_URL %}}/reference/glossary/#rfc3339-timestamp)) of the latest scheduled and completed run. diff --git a/src/common/schemas/ScraperTargetRequest.yml b/src/common/schemas/ScraperTargetRequest.yml index 0f6c1806..c3638e52 100644 --- a/src/common/schemas/ScraperTargetRequest.yml +++ b/src/common/schemas/ScraperTargetRequest.yml @@ -21,3 +21,4 @@ type: boolean description: Skip TLS verification on endpoint. default: false + required: [orgID, bucketID] diff --git a/src/common/schemas/Source.yml b/src/common/schemas/Source.yml index c6c6b430..5f4c6c4a 100644 --- a/src/common/schemas/Source.yml +++ b/src/common/schemas/Source.yml @@ -50,3 +50,4 @@ enum: - flux - influxql + required: [orgID] diff --git a/src/common/schemas/TelegrafPluginRequest.yml b/src/common/schemas/TelegrafPluginRequest.yml index 296aab43..cc9d3a67 100644 --- a/src/common/schemas/TelegrafPluginRequest.yml +++ b/src/common/schemas/TelegrafPluginRequest.yml @@ -31,3 +31,4 @@ properties: type: string orgID: type: string +required: [orgID] diff --git a/src/common/schemas/TemplateApply.yml b/src/common/schemas/TemplateApply.yml index 0288bfeb..95b83e0a 100644 --- a/src/common/schemas/TemplateApply.yml +++ b/src/common/schemas/TemplateApply.yml @@ -195,3 +195,4 @@ resourceTemplateName: type: string required: ["kind", "resourceTemplateName"] + required: [orgID] diff --git a/src/common/schemas/TemplateExportByID.yml b/src/common/schemas/TemplateExportByID.yml index 00658401..293290f1 100644 --- a/src/common/schemas/TemplateExportByID.yml +++ b/src/common/schemas/TemplateExportByID.yml @@ -20,6 +20,7 @@ type: array items: $ref: "./TemplateKind.yml" + required: [orgID] resources: type: array items: diff --git a/src/common/schemas/TemplateExportByName.yml b/src/common/schemas/TemplateExportByName.yml index 5eda3caf..ce6117a0 100644 --- a/src/common/schemas/TemplateExportByName.yml +++ b/src/common/schemas/TemplateExportByName.yml @@ -20,6 +20,7 @@ type: array items: $ref: "./TemplateKind.yml" + required: [orgID] resources: type: array items: