From 7e24e192308820aa2632c48091e417eadf64b96f Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com> Date: Tue, 11 Oct 2022 17:06:36 +0300 Subject: [PATCH] Swagger: Remove license (#56716) --- pkg/api/api.go | 1 - public/api-merged.json | 41 ++++++------------------------ public/api-spec.json | 41 ++++++------------------------ public/openapi3.json | 57 ++++++++++++++++++++++-------------------- 4 files changed, 46 insertions(+), 94 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 7eb430d3531..ed88dd8bad0 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -6,7 +6,6 @@ // Schemes: http, https // BasePath: /api // Version: 0.0.1 -// License: GNU Affero General Public License v3.0 https://www.gnu.org/licenses/agpl-3.0.en.html // Contact: Grafana Labs https://grafana.com // // Consumes: diff --git a/public/api-merged.json b/public/api-merged.json index 0b8b1d7e0a3..b60db235fde 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -18,10 +18,6 @@ "url": "https://grafana.com", "email": "hello@grafana.com" }, - "license": { - "name": "GNU Affero General Public License v3.0", - "url": "https://www.gnu.org/licenses/agpl-3.0.en.html" - }, "version": "0.0.1" }, "basePath": "/api", @@ -8524,7 +8520,7 @@ "tags": [ "service_accounts" ], - "summary": "# Create service account", + "summary": "Create service account", "operationId": "createServiceAccount", "parameters": [ { @@ -8560,7 +8556,7 @@ "tags": [ "service_accounts" ], - "summary": "# Search service accounts with paging", + "summary": "Search service accounts with paging", "operationId": "searchOrgServiceAccountsWithPaging", "parameters": [ { @@ -8616,7 +8612,7 @@ "tags": [ "service_accounts" ], - "summary": "# Get single serviceaccount by Id", + "summary": "Get single serviceaccount by Id", "operationId": "retrieveServiceAccount", "parameters": [ { @@ -8653,7 +8649,7 @@ "tags": [ "service_accounts" ], - "summary": "# Delete service account", + "summary": "Delete service account", "operationId": "deleteServiceAccount", "parameters": [ { @@ -8687,7 +8683,7 @@ "tags": [ "service_accounts" ], - "summary": "# Update service account", + "summary": "Update service account", "operationId": "updateServiceAccount", "parameters": [ { @@ -8733,7 +8729,7 @@ "tags": [ "service_accounts" ], - "summary": "# Get service account tokens", + "summary": "Get service account tokens", "operationId": "listTokens", "parameters": [ { @@ -8767,7 +8763,7 @@ "tags": [ "service_accounts" ], - "summary": "# CreateNewToken adds a token to a service account", + "summary": "CreateNewToken adds a token to a service account", "operationId": "createToken", "parameters": [ { @@ -8816,7 +8812,7 @@ "tags": [ "service_accounts" ], - "summary": "# DeleteToken deletes service account tokens", + "summary": "DeleteToken deletes service account tokens", "operationId": "deleteToken", "parameters": [ { @@ -10400,27 +10396,6 @@ } } }, - "AddBuiltInRoleCommand": { - "type": "object", - "properties": { - "builtInRole": { - "type": "string", - "enum": [ - "Viewer", - " Editor", - " Admin", - " Grafana Admin" - ] - }, - "global": { - "description": "A flag indicating if the assignment is global or not. If set to false, the default org ID of the authenticated user will be used from the request to create organization local assignment. Refer to the Built-in role assignments for more information.", - "type": "boolean" - }, - "roleUid": { - "type": "string" - } - } - }, "AddCommand": { "type": "object", "properties": { diff --git a/public/api-spec.json b/public/api-spec.json index 89fbf83a47d..f0be270575e 100644 --- a/public/api-spec.json +++ b/public/api-spec.json @@ -18,10 +18,6 @@ "url": "https://grafana.com", "email": "hello@grafana.com" }, - "license": { - "name": "GNU Affero General Public License v3.0", - "url": "https://www.gnu.org/licenses/agpl-3.0.en.html" - }, "version": "0.0.1" }, "basePath": "/api", @@ -7877,7 +7873,7 @@ "tags": [ "service_accounts" ], - "summary": "# Create service account", + "summary": "Create service account", "operationId": "createServiceAccount", "parameters": [ { @@ -7913,7 +7909,7 @@ "tags": [ "service_accounts" ], - "summary": "# Search service accounts with paging", + "summary": "Search service accounts with paging", "operationId": "searchOrgServiceAccountsWithPaging", "parameters": [ { @@ -7969,7 +7965,7 @@ "tags": [ "service_accounts" ], - "summary": "# Get single serviceaccount by Id", + "summary": "Get single serviceaccount by Id", "operationId": "retrieveServiceAccount", "parameters": [ { @@ -8006,7 +8002,7 @@ "tags": [ "service_accounts" ], - "summary": "# Delete service account", + "summary": "Delete service account", "operationId": "deleteServiceAccount", "parameters": [ { @@ -8040,7 +8036,7 @@ "tags": [ "service_accounts" ], - "summary": "# Update service account", + "summary": "Update service account", "operationId": "updateServiceAccount", "parameters": [ { @@ -8086,7 +8082,7 @@ "tags": [ "service_accounts" ], - "summary": "# Get service account tokens", + "summary": "Get service account tokens", "operationId": "listTokens", "parameters": [ { @@ -8120,7 +8116,7 @@ "tags": [ "service_accounts" ], - "summary": "# CreateNewToken adds a token to a service account", + "summary": "CreateNewToken adds a token to a service account", "operationId": "createToken", "parameters": [ { @@ -8169,7 +8165,7 @@ "tags": [ "service_accounts" ], - "summary": "# DeleteToken deletes service account tokens", + "summary": "DeleteToken deletes service account tokens", "operationId": "deleteToken", "parameters": [ { @@ -9750,27 +9746,6 @@ } } }, - "AddBuiltInRoleCommand": { - "type": "object", - "properties": { - "builtInRole": { - "type": "string", - "enum": [ - "Viewer", - " Editor", - " Admin", - " Grafana Admin" - ] - }, - "global": { - "description": "A flag indicating if the assignment is global or not. If set to false, the default org ID of the authenticated user will be used from the request to create organization local assignment. Refer to the Built-in role assignments for more information.", - "type": "boolean" - }, - "roleUid": { - "type": "string" - } - } - }, "AddCommand": { "type": "object", "properties": { diff --git a/public/openapi3.json b/public/openapi3.json index 81adbe49256..00b7a860fea 100644 --- a/public/openapi3.json +++ b/public/openapi3.json @@ -1773,27 +1773,6 @@ }, "type": "object" }, - "AddBuiltInRoleCommand": { - "properties": { - "builtInRole": { - "enum": [ - "Viewer", - " Editor", - " Admin", - " Grafana Admin" - ], - "type": "string" - }, - "global": { - "description": "A flag indicating if the assignment is global or not. If set to false, the default org ID of the authenticated user will be used from the request to create organization local assignment. Refer to the Built-in role assignments for more information.", - "type": "boolean" - }, - "roleUid": { - "type": "string" - } - }, - "type": "object" - }, "AddCommand": { "properties": { "name": { @@ -2860,11 +2839,15 @@ "properties": { "field": { "description": "Field used to attach the correlation link", + "example": "message", "type": "string" }, "target": { "additionalProperties": false, "description": "Target data query", + "example": { + "expr": "job=app" + }, "type": "object" }, "type": { @@ -2881,6 +2864,27 @@ "CorrelationConfigType": { "type": "string" }, + "CorrelationConfigUpdateDTO": { + "properties": { + "field": { + "description": "Field used to attach the correlation link", + "example": "message", + "type": "string" + }, + "target": { + "additionalProperties": false, + "description": "Target data query", + "example": { + "expr": "job=app" + }, + "type": "object" + }, + "type": { + "$ref": "#/components/schemas/CorrelationConfigType" + } + }, + "type": "object" + }, "CreateAlertNotificationCommand": { "properties": { "disableResolveMessage": { @@ -2933,7 +2937,7 @@ "type": "string" }, "targetUID": { - "description": "Target data source UID to which the correlation is created", + "description": "Target data source UID to which the correlation is created. required if config.type = query", "example": "PE1C5CBDA0504A6A3", "type": "string" } @@ -5709,7 +5713,7 @@ "type": "string" }, "items": { - "description": "The ordered list of items that the playlist will iterate over.", + "description": "The ordered list of items that the playlist will iterate over.\nFIXME! This should not be optional, but changing it makes the godegen awkward", "items": { "$ref": "#/components/schemas/PlaylistItem" }, @@ -8996,6 +9000,9 @@ "UpdateCorrelationCommand": { "description": "UpdateCorrelationCommand is the command for updating a correlation", "properties": { + "config": { + "$ref": "#/components/schemas/CorrelationConfigUpdateDTO" + }, "description": { "description": "Optional description of the correlation", "example": "Logs to Traces", @@ -10243,10 +10250,6 @@ "url": "https://grafana.com" }, "description": "The Grafana backend exposes an HTTP API, the same API is used by the frontend to do\neverything from saving dashboards, creating users and updating data sources.", - "license": { - "name": "GNU Affero General Public License v3.0", - "url": "https://www.gnu.org/licenses/agpl-3.0.en.html" - }, "title": "Grafana HTTP API.", "version": "0.0.1" },