diff --git a/public/api-merged.json b/public/api-merged.json index 5fdc053a4d9..83e83dec47c 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -506,14 +506,6 @@ "summary": "Add a user role assignment.", "operationId": "addUserRole", "parameters": [ - { - "type": "integer", - "format": "int64", - "x-go-name": "UserID", - "name": "user_id", - "in": "path", - "required": true - }, { "x-go-name": "Body", "name": "body", @@ -522,6 +514,14 @@ "schema": { "$ref": "#/definitions/AddUserRoleCommand" } + }, + { + "type": "integer", + "format": "int64", + "x-go-name": "UserID", + "name": "user_id", + "in": "path", + "required": true } ], "responses": { @@ -547,14 +547,6 @@ "summary": "Remove a user role assignment.", "operationId": "removeUserRole", "parameters": [ - { - "type": "integer", - "format": "int64", - "x-go-name": "UserID", - "name": "user_id", - "in": "path", - "required": true - }, { "type": "string", "x-go-name": "RoleUID", @@ -568,6 +560,14 @@ "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 remove assignment.", "name": "global", "in": "query" + }, + { + "type": "integer", + "format": "int64", + "x-go-name": "UserID", + "name": "user_id", + "in": "path", + "required": true } ], "responses": { @@ -3926,15 +3926,15 @@ "parameters": [ { "type": "string", - "x-go-name": "DatasourceID", - "name": "id", + "x-go-name": "PermissionID", + "name": "permissionId", "in": "path", "required": true }, { "type": "string", - "x-go-name": "PermissionID", - "name": "permissionId", + "x-go-name": "DatasourceID", + "name": "id", "in": "path", "required": true } @@ -9379,6 +9379,13 @@ "type": "boolean", "x-go-name": "EnableDashboardURL" }, + "formats": { + "type": "array", + "items": { + "$ref": "#/definitions/Type" + }, + "x-go-name": "Formats" + }, "id": { "type": "integer", "format": "int64", @@ -9597,6 +9604,13 @@ "type": "boolean", "x-go-name": "EnableDashboardURL" }, + "formats": { + "type": "array", + "items": { + "$ref": "#/definitions/Type" + }, + "x-go-name": "Formats" + }, "message": { "type": "string", "x-go-name": "Message" @@ -12349,27 +12363,10 @@ }, "x-go-package": "github.com/prometheus/alertmanager/config" }, - "MuteTiming": { - "type": "object", - "properties": { - "name": { - "type": "string", - "x-go-name": "Name" - }, - "time_intervals": { - "type": "array", - "items": { - "$ref": "#/definitions/TimeInterval" - }, - "x-go-name": "TimeIntervals" - } - }, - "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" - }, "MuteTimings": { "type": "array", "items": { - "$ref": "#/definitions/MuteTiming" + "$ref": "#/definitions/MuteTimeInterval" }, "x-go-package": "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" }, @@ -13504,7 +13501,7 @@ "x-go-name": "HomeTab" } }, - "x-go-package": "github.com/grafana/grafana/pkg/models" + "x-go-package": "github.com/grafana/grafana/pkg/services/preference" }, "Receiver": { "type": "object", @@ -14997,7 +14994,7 @@ }, "details_url": { "type": "string", - "x-go-name": "DetailsUrl" + "x-go-name": "DetailsURL" }, "exp": { "type": "integer", @@ -15009,28 +15006,18 @@ "format": "int64", "x-go-name": "Issued" }, - "included_admins": { - "type": "integer", - "format": "int64", - "x-go-name": "IncludedAdmins" - }, "included_users": { "type": "integer", "format": "int64", "x-go-name": "IncludedUsers" }, - "included_viewers": { - "type": "integer", - "format": "int64", - "x-go-name": "IncludedViewers" - }, "iss": { "type": "string", "x-go-name": "Issuer" }, "jti": { "type": "string", - "x-go-name": "Id" + "x-go-name": "ID" }, "lexp": { "type": "integer", @@ -15044,7 +15031,7 @@ }, "lid": { "type": "string", - "x-go-name": "LicenseId" + "x-go-name": "LicenseID" }, "limit_by": { "type": "string", @@ -15133,6 +15120,10 @@ }, "x-go-package": "github.com/grafana/grafana/pkg/api/dtos" }, + "Type": { + "type": "string", + "x-go-package": "github.com/grafana/grafana/pkg/extensions/report/models" + }, "URL": { "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use RawPath, an optional field which only gets\nset if the default encoding is different from Path.\n\nURL's String method uses the EscapedPath method to obtain the path. See the\nEscapedPath method for more details.", "type": "object", @@ -16252,7 +16243,6 @@ } }, "gettableSilence": { - "description": "GettableSilence gettable silence", "type": "object", "required": ["comment", "createdBy", "endsAt", "matchers", "startsAt", "id", "status", "updatedAt"], "properties": { @@ -16295,7 +16285,9 @@ "format": "date-time", "x-go-name": "UpdatedAt" } - } + }, + "x-go-name": "GettableSilence", + "x-go-package": "github.com/prometheus/alertmanager/api/v2/models" }, "gettableSilences": { "type": "array", @@ -16423,6 +16415,7 @@ "x-go-package": "github.com/prometheus/alertmanager/api/v2/models" }, "postableSilence": { + "description": "PostableSilence postable silence", "type": "object", "required": ["comment", "createdBy", "endsAt", "matchers", "startsAt"], "properties": { @@ -16456,11 +16449,10 @@ "format": "date-time", "x-go-name": "StartsAt" } - }, - "x-go-name": "PostableSilence", - "x-go-package": "github.com/prometheus/alertmanager/api/v2/models" + } }, "receiver": { + "description": "Receiver receiver", "type": "object", "required": ["name"], "properties": { @@ -16469,9 +16461,7 @@ "type": "string", "x-go-name": "Name" } - }, - "x-go-name": "Receiver", - "x-go-package": "github.com/prometheus/alertmanager/api/v2/models" + } }, "silence": { "description": "Silence silence", diff --git a/public/api-spec.json b/public/api-spec.json index 69e4636ab54..85504bfc721 100644 --- a/public/api-spec.json +++ b/public/api-spec.json @@ -506,14 +506,6 @@ "summary": "Add a user role assignment.", "operationId": "addUserRole", "parameters": [ - { - "type": "integer", - "format": "int64", - "x-go-name": "UserID", - "name": "user_id", - "in": "path", - "required": true - }, { "x-go-name": "Body", "name": "body", @@ -522,6 +514,14 @@ "schema": { "$ref": "#/definitions/AddUserRoleCommand" } + }, + { + "type": "integer", + "format": "int64", + "x-go-name": "UserID", + "name": "user_id", + "in": "path", + "required": true } ], "responses": { @@ -547,14 +547,6 @@ "summary": "Remove a user role assignment.", "operationId": "removeUserRole", "parameters": [ - { - "type": "integer", - "format": "int64", - "x-go-name": "UserID", - "name": "user_id", - "in": "path", - "required": true - }, { "type": "string", "x-go-name": "RoleUID", @@ -568,6 +560,14 @@ "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 remove assignment.", "name": "global", "in": "query" + }, + { + "type": "integer", + "format": "int64", + "x-go-name": "UserID", + "name": "user_id", + "in": "path", + "required": true } ], "responses": { @@ -3926,15 +3926,15 @@ "parameters": [ { "type": "string", - "x-go-name": "DatasourceID", - "name": "id", + "x-go-name": "PermissionID", + "name": "permissionId", "in": "path", "required": true }, { "type": "string", - "x-go-name": "PermissionID", - "name": "permissionId", + "x-go-name": "DatasourceID", + "name": "id", "in": "path", "required": true } @@ -9136,6 +9136,13 @@ "type": "boolean", "x-go-name": "EnableDashboardURL" }, + "formats": { + "type": "array", + "items": { + "$ref": "#/definitions/Type" + }, + "x-go-name": "Formats" + }, "id": { "type": "integer", "format": "int64", @@ -9354,6 +9361,13 @@ "type": "boolean", "x-go-name": "EnableDashboardURL" }, + "formats": { + "type": "array", + "items": { + "$ref": "#/definitions/Type" + }, + "x-go-name": "Formats" + }, "message": { "type": "string", "x-go-name": "Message" @@ -11657,7 +11671,7 @@ "x-go-name": "HomeTab" } }, - "x-go-package": "github.com/grafana/grafana/pkg/models" + "x-go-package": "github.com/grafana/grafana/pkg/services/preference" }, "RecordingRuleJSON": { "description": "RecordingRuleJSON is the external representation of a recording rule", @@ -12345,7 +12359,7 @@ }, "details_url": { "type": "string", - "x-go-name": "DetailsUrl" + "x-go-name": "DetailsURL" }, "exp": { "type": "integer", @@ -12357,28 +12371,18 @@ "format": "int64", "x-go-name": "Issued" }, - "included_admins": { - "type": "integer", - "format": "int64", - "x-go-name": "IncludedAdmins" - }, "included_users": { "type": "integer", "format": "int64", "x-go-name": "IncludedUsers" }, - "included_viewers": { - "type": "integer", - "format": "int64", - "x-go-name": "IncludedViewers" - }, "iss": { "type": "string", "x-go-name": "Issuer" }, "jti": { "type": "string", - "x-go-name": "Id" + "x-go-name": "ID" }, "lexp": { "type": "integer", @@ -12392,7 +12396,7 @@ }, "lid": { "type": "string", - "x-go-name": "LicenseId" + "x-go-name": "LicenseID" }, "limit_by": { "type": "string", @@ -12481,6 +12485,10 @@ }, "x-go-package": "github.com/grafana/grafana/pkg/api/dtos" }, + "Type": { + "type": "string", + "x-go-package": "github.com/grafana/grafana/pkg/extensions/report/models" + }, "UpdateAlertNotificationCommand": { "type": "object", "properties": {