Merge pull request #831 from influxdata/beta-6-swagger

Updated swagger.yml for beta-6

api-docs/v2.0/swagger.yml

@@ -3214,7 +3214,9 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Query"
+                oneOf:
+                  - $ref: "#/components/schemas/Query"
+                  - $ref: "#/components/schemas/InfluxQLQuery"
             application/vnd.flux:
               schema:
                 type: string
@@ -6274,7 +6276,7 @@ components:
           description: Flux query script to be analyzed
           type: string
     Query:
-      description: Query influx with specific return formatting.
+      description: Query influx using the Flux language
       type: object
       required:
         - query
@@ -6285,23 +6287,29 @@ components:
           description: Query script to execute.
           type: string
         type:
-          description: The type of query.
+          description: The type of query. Must be "flux".
           type: string
-          default: flux
           enum:
             - flux
-            - influxql
-        db:
-          description: Required for `influxql` type queries.
-          type: string
-        rp:
-          description: Required for `influxql` type queries.
-          type: string
-        cluster:
-          description: Required for `influxql` type queries.
-          type: string
         dialect:
           $ref: "#/components/schemas/Dialect"
+    InfluxQLQuery:
+      description: Query influx using the InfluxQL language
+      type: object
+      required:
+        - query
+      properties:
+        query:
+          description: InfluxQL query execute.
+          type: string
+        type:
+          description: The type of query. Must be "influxql".
+          type: string
+          enum:
+            - influxql
+        bucket:
+          description: Bucket is to be used instead of the database and retention policy specified in the InfluxQL query.
+          type: string
     Package:
       description: Represents a complete package source tree.
       type: object
@@ -7163,19 +7171,7 @@ components:
               contentType:
                 type: string
             required: ["url"]
-    PkgCreate:
+    PkgCreateKind:
-      type: object
-      properties:
-        orgIDs:
-          type: array
-          items:
-            type: string
-        resources:
-          type: object
-          properties:
-            id:
-              type: string
-            kind:
       type: string
       enum:
         - bucket
@@ -7187,6 +7183,34 @@ components:
         - task
         - telegraf
         - variable
+    PkgCreate:
+      type: object
+      properties:
+        orgIDs:
+          type: array
+          items:
+            type: object
+            properties:
+              orgID:
+                type: string
+              resourceFilters:
+                type: object
+                properties:
+                  byLabel:
+                    type: array
+                    items:
+                      type: string
+                  byResourceKind:
+                    type: array
+                    items:
+                      $ref: "#/components/schemas/PkgCreateKind"
+        resources:
+          type: object
+          properties:
+            id:
+              type: string
+            kind:
+              $ref: "#/components/schemas/PkgCreateKind"
             name:
               type: string
           required: [id, kind]
@@ -7209,7 +7233,6 @@ components:
               - NotificationEndpointPagerDuty
               - NotificationEndpointSlack
               - NotificationRule
-              - NotificationEndpointHTTP
               - Task
               - Telegraf
               - Variable