diff --git a/pkg/services/ngalert/api/tooling/api.json b/pkg/services/ngalert/api/tooling/api.json index 965cee8114f..b28835c9327 100644 --- a/pkg/services/ngalert/api/tooling/api.json +++ b/pkg/services/ngalert/api/tooling/api.json @@ -165,6 +165,9 @@ }, "AlertRuleEditorSettings": { "properties": { + "simplified_notifications_section": { + "type": "boolean" + }, "simplified_query_and_expressions_section": { "type": "boolean" } @@ -755,7 +758,7 @@ "type": "string" }, "ErrorSource": { - "$ref": "#/definitions/ErrorSource" + "$ref": "#/definitions/Source" }, "Frames": { "$ref": "#/definitions/Frames" @@ -895,23 +898,23 @@ "type": { "enum": [ "alertmanager", - " dingding", - " discord", - " email", - " googlechat", - " kafka", - " line", - " opsgenie", - " pagerduty", - " pushover", - " sensugo", - " slack", - " teams", - " telegram", - " threema", - " victorops", - " webhook", - " wecom" + "dingding", + "discord", + "email", + "googlechat", + "kafka", + "line", + "opsgenie", + "pagerduty", + "pushover", + "sensugo", + "slack", + "teams", + "telegram", + "threema", + "victorops", + "webhook", + "wecom" ], "example": "webhook", "type": "string" @@ -965,10 +968,6 @@ }, "type": "object" }, - "ErrorSource": { - "description": "ErrorSource type defines the source of the error", - "type": "string" - }, "ErrorType": { "title": "ErrorType models the different API error types.", "type": "string" @@ -3606,6 +3605,9 @@ }, "RuleDiscovery": { "properties": { + "groupNextToken": { + "type": "string" + }, "groups": { "items": { "$ref": "#/definitions/RuleGroup" @@ -3975,6 +3977,10 @@ "SmtpNotEnabled": { "$ref": "#/definitions/ResponseDetails" }, + "Source": { + "title": "Source type defines the status source.", + "type": "string" + }, "Span": { "properties": { "Length": { @@ -4803,6 +4809,7 @@ "type": "object" }, "gettableAlerts": { + "description": "GettableAlerts gettable alerts", "items": { "$ref": "#/definitions/gettableAlert", "type": "object" @@ -6240,7 +6247,7 @@ } } }, - "summary": "Get all notification templates.", + "summary": "Get all notification template groups.", "tags": [ "provisioning" ] @@ -6251,7 +6258,7 @@ "operationId": "RouteDeleteTemplate", "parameters": [ { - "description": "Template name", + "description": "Template group name", "in": "path", "name": "name", "required": true, @@ -6275,7 +6282,7 @@ } } }, - "summary": "Delete a template.", + "summary": "Delete a notification template group.", "tags": [ "provisioning" ] @@ -6284,7 +6291,7 @@ "operationId": "RouteGetTemplate", "parameters": [ { - "description": "Template Name", + "description": "Template group name", "in": "path", "name": "name", "required": true, @@ -6305,7 +6312,7 @@ } } }, - "summary": "Get a notification template.", + "summary": "Get a notification template group.", "tags": [ "provisioning" ] @@ -6317,7 +6324,7 @@ "operationId": "RoutePutTemplate", "parameters": [ { - "description": "Template Name", + "description": "Template group name", "in": "path", "name": "name", "required": true, @@ -6356,7 +6363,7 @@ } } }, - "summary": "Updates an existing notification template.", + "summary": "Updates an existing notification template group.", "tags": [ "provisioning" ] diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json index eae46145ba8..f23b4673ecb 100644 --- a/pkg/services/ngalert/api/tooling/post.json +++ b/pkg/services/ngalert/api/tooling/post.json @@ -165,6 +165,9 @@ }, "AlertRuleEditorSettings": { "properties": { + "simplified_notifications_section": { + "type": "boolean" + }, "simplified_query_and_expressions_section": { "type": "boolean" } @@ -755,7 +758,7 @@ "type": "string" }, "ErrorSource": { - "$ref": "#/definitions/ErrorSource" + "$ref": "#/definitions/Source" }, "Frames": { "$ref": "#/definitions/Frames" @@ -895,23 +898,23 @@ "type": { "enum": [ "alertmanager", - " dingding", - " discord", - " email", - " googlechat", - " kafka", - " line", - " opsgenie", - " pagerduty", - " pushover", - " sensugo", - " slack", - " teams", - " telegram", - " threema", - " victorops", - " webhook", - " wecom" + "dingding", + "discord", + "email", + "googlechat", + "kafka", + "line", + "opsgenie", + "pagerduty", + "pushover", + "sensugo", + "slack", + "teams", + "telegram", + "threema", + "victorops", + "webhook", + "wecom" ], "example": "webhook", "type": "string" @@ -965,10 +968,6 @@ }, "type": "object" }, - "ErrorSource": { - "description": "ErrorSource type defines the source of the error", - "type": "string" - }, "ErrorType": { "title": "ErrorType models the different API error types.", "type": "string" @@ -3606,6 +3605,9 @@ }, "RuleDiscovery": { "properties": { + "groupNextToken": { + "type": "string" + }, "groups": { "items": { "$ref": "#/definitions/RuleGroup" @@ -3975,6 +3977,10 @@ "SmtpNotEnabled": { "$ref": "#/definitions/ResponseDetails" }, + "Source": { + "title": "Source type defines the status source.", + "type": "string" + }, "Span": { "properties": { "Length": { @@ -4802,7 +4808,6 @@ "type": "object" }, "gettableAlerts": { - "description": "GettableAlerts gettable alerts", "items": { "$ref": "#/definitions/gettableAlert", "type": "object" @@ -4927,7 +4932,6 @@ "type": "object" }, "gettableSilences": { - "description": "GettableSilences gettable silences", "items": { "$ref": "#/definitions/gettableSilence", "type": "object" @@ -8452,7 +8456,7 @@ } } }, - "summary": "Get all notification templates.", + "summary": "Get all notification template groups.", "tags": [ "provisioning" ] @@ -8463,7 +8467,7 @@ "operationId": "RouteDeleteTemplate", "parameters": [ { - "description": "Template name", + "description": "Template group name", "in": "path", "name": "name", "required": true, @@ -8487,7 +8491,7 @@ } } }, - "summary": "Delete a template.", + "summary": "Delete a notification template group.", "tags": [ "provisioning" ] @@ -8496,7 +8500,7 @@ "operationId": "RouteGetTemplate", "parameters": [ { - "description": "Template Name", + "description": "Template group name", "in": "path", "name": "name", "required": true, @@ -8517,7 +8521,7 @@ } } }, - "summary": "Get a notification template.", + "summary": "Get a notification template group.", "tags": [ "provisioning" ] @@ -8529,7 +8533,7 @@ "operationId": "RoutePutTemplate", "parameters": [ { - "description": "Template Name", + "description": "Template group name", "in": "path", "name": "name", "required": true, @@ -8568,7 +8572,7 @@ } } }, - "summary": "Updates an existing notification template.", + "summary": "Updates an existing notification template group.", "tags": [ "provisioning" ] diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json index 95716ea1899..a3ac020c228 100644 --- a/pkg/services/ngalert/api/tooling/spec.json +++ b/pkg/services/ngalert/api/tooling/spec.json @@ -3306,7 +3306,7 @@ "provisioning", "stable" ], - "summary": "Get all notification templates.", + "summary": "Get all notification template groups.", "operationId": "RouteGetTemplates", "responses": { "200": { @@ -3324,12 +3324,12 @@ "provisioning", "stable" ], - "summary": "Get a notification template.", + "summary": "Get a notification template group.", "operationId": "RouteGetTemplate", "parameters": [ { "type": "string", - "description": "Template Name", + "description": "Template group name", "name": "name", "in": "path", "required": true @@ -3358,12 +3358,12 @@ "provisioning", "stable" ], - "summary": "Updates an existing notification template.", + "summary": "Updates an existing notification template group.", "operationId": "RoutePutTemplate", "parameters": [ { "type": "string", - "description": "Template Name", + "description": "Template group name", "name": "name", "in": "path", "required": true @@ -3407,12 +3407,12 @@ "provisioning", "stable" ], - "summary": "Delete a template.", + "summary": "Delete a notification template group.", "operationId": "RouteDeleteTemplate", "parameters": [ { "type": "string", - "description": "Template name", + "description": "Template group name", "name": "name", "in": "path", "required": true @@ -3797,6 +3797,9 @@ "AlertRuleEditorSettings": { "type": "object", "properties": { + "simplified_notifications_section": { + "type": "boolean" + }, "simplified_query_and_expressions_section": { "type": "boolean" } @@ -4388,7 +4391,7 @@ "type": "string" }, "ErrorSource": { - "$ref": "#/definitions/ErrorSource" + "$ref": "#/definitions/Source" }, "Frames": { "$ref": "#/definitions/Frames" @@ -4533,23 +4536,23 @@ "type": "string", "enum": [ "alertmanager", - " dingding", - " discord", - " email", - " googlechat", - " kafka", - " line", - " opsgenie", - " pagerduty", - " pushover", - " sensugo", - " slack", - " teams", - " telegram", - " threema", - " victorops", - " webhook", - " wecom" + "dingding", + "discord", + "email", + "googlechat", + "kafka", + "line", + "opsgenie", + "pagerduty", + "pushover", + "sensugo", + "slack", + "teams", + "telegram", + "threema", + "victorops", + "webhook", + "wecom" ], "example": "webhook" }, @@ -4597,10 +4600,6 @@ } } }, - "ErrorSource": { - "description": "ErrorSource type defines the source of the error", - "type": "string" - }, "ErrorType": { "type": "string", "title": "ErrorType models the different API error types." @@ -7243,6 +7242,9 @@ "groups" ], "properties": { + "groupNextToken": { + "type": "string" + }, "groups": { "type": "array", "items": { @@ -7608,6 +7610,10 @@ "SmtpNotEnabled": { "$ref": "#/definitions/ResponseDetails" }, + "Source": { + "type": "string", + "title": "Source type defines the status source." + }, "Span": { "type": "object", "title": "A Span defines a continuous sequence of buckets.", @@ -8435,7 +8441,6 @@ } }, "gettableAlerts": { - "description": "GettableAlerts gettable alerts", "type": "array", "items": { "type": "object", @@ -8560,7 +8565,6 @@ } }, "gettableSilences": { - "description": "GettableSilences gettable silences", "type": "array", "items": { "type": "object", diff --git a/public/api-merged.json b/public/api-merged.json index 3076a55b586..79758d8f542 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -11783,7 +11783,7 @@ "tags": [ "provisioning" ], - "summary": "Get all notification templates.", + "summary": "Get all notification template groups.", "operationId": "RouteGetTemplates", "responses": { "200": { @@ -11800,12 +11800,12 @@ "tags": [ "provisioning" ], - "summary": "Get a notification template.", + "summary": "Get a notification template group.", "operationId": "RouteGetTemplate", "parameters": [ { "type": "string", - "description": "Template Name", + "description": "Template group name", "name": "name", "in": "path", "required": true @@ -11833,12 +11833,12 @@ "tags": [ "provisioning" ], - "summary": "Updates an existing notification template.", + "summary": "Updates an existing notification template group.", "operationId": "RoutePutTemplate", "parameters": [ { "type": "string", - "description": "Template Name", + "description": "Template group name", "name": "name", "in": "path", "required": true @@ -11881,12 +11881,12 @@ "tags": [ "provisioning" ], - "summary": "Delete a template.", + "summary": "Delete a notification template group.", "operationId": "RouteDeleteTemplate", "parameters": [ { "type": "string", - "description": "Template name", + "description": "Template group name", "name": "name", "in": "path", "required": true @@ -12588,6 +12588,9 @@ "AlertRuleEditorSettings": { "type": "object", "properties": { + "simplified_notifications_section": { + "type": "boolean" + }, "simplified_query_and_expressions_section": { "type": "boolean" } @@ -15067,23 +15070,23 @@ "type": "string", "enum": [ "alertmanager", - " dingding", - " discord", - " email", - " googlechat", - " kafka", - " line", - " opsgenie", - " pagerduty", - " pushover", - " sensugo", - " slack", - " teams", - " telegram", - " threema", - " victorops", - " webhook", - " wecom" + "dingding", + "discord", + "email", + "googlechat", + "kafka", + "line", + "opsgenie", + "pagerduty", + "pushover", + "sensugo", + "slack", + "teams", + "telegram", + "threema", + "victorops", + "webhook", + "wecom" ], "example": "webhook" }, @@ -15151,10 +15154,6 @@ } } }, - "ErrorSource": { - "description": "ErrorSource type defines the source of the error", - "type": "string" - }, "ErrorType": { "type": "string", "title": "ErrorType models the different API error types." @@ -19857,6 +19856,9 @@ "groups" ], "properties": { + "groupNextToken": { + "type": "string" + }, "groups": { "type": "array", "items": { @@ -22645,6 +22647,7 @@ } }, "gettableAlerts": { + "description": "GettableAlerts gettable alerts", "type": "array", "items": { "type": "object", diff --git a/public/openapi3.json b/public/openapi3.json index e4e814258b9..fe2da223144 100644 --- a/public/openapi3.json +++ b/public/openapi3.json @@ -2662,6 +2662,9 @@ }, "AlertRuleEditorSettings": { "properties": { + "simplified_notifications_section": { + "type": "boolean" + }, "simplified_query_and_expressions_section": { "type": "boolean" } @@ -5136,23 +5139,23 @@ "type": { "enum": [ "alertmanager", - " dingding", - " discord", - " email", - " googlechat", - " kafka", - " line", - " opsgenie", - " pagerduty", - " pushover", - " sensugo", - " slack", - " teams", - " telegram", - " threema", - " victorops", - " webhook", - " wecom" + "dingding", + "discord", + "email", + "googlechat", + "kafka", + "line", + "opsgenie", + "pagerduty", + "pushover", + "sensugo", + "slack", + "teams", + "telegram", + "threema", + "victorops", + "webhook", + "wecom" ], "example": "webhook", "type": "string" @@ -5226,10 +5229,6 @@ ], "type": "object" }, - "ErrorSource": { - "description": "ErrorSource type defines the source of the error", - "type": "string" - }, "ErrorType": { "title": "ErrorType models the different API error types.", "type": "string" @@ -9928,6 +9927,9 @@ }, "RuleDiscovery": { "properties": { + "groupNextToken": { + "type": "string" + }, "groups": { "items": { "$ref": "#/components/schemas/RuleGroup" @@ -12718,6 +12720,7 @@ "type": "object" }, "gettableAlerts": { + "description": "GettableAlerts gettable alerts", "items": { "$ref": "#/components/schemas/gettableAlert" }, @@ -26239,7 +26242,7 @@ "description": "NotificationTemplates" } }, - "summary": "Get all notification templates.", + "summary": "Get all notification template groups.", "tags": [ "provisioning" ] @@ -26250,7 +26253,7 @@ "operationId": "RouteDeleteTemplate", "parameters": [ { - "description": "Template name", + "description": "Template group name", "in": "path", "name": "name", "required": true, @@ -26282,7 +26285,7 @@ "description": "PublicError" } }, - "summary": "Delete a template.", + "summary": "Delete a notification template group.", "tags": [ "provisioning" ] @@ -26291,7 +26294,7 @@ "operationId": "RouteGetTemplate", "parameters": [ { - "description": "Template Name", + "description": "Template group name", "in": "path", "name": "name", "required": true, @@ -26322,7 +26325,7 @@ "description": "PublicError" } }, - "summary": "Get a notification template.", + "summary": "Get a notification template group.", "tags": [ "provisioning" ] @@ -26331,7 +26334,7 @@ "operationId": "RoutePutTemplate", "parameters": [ { - "description": "Template Name", + "description": "Template group name", "in": "path", "name": "name", "required": true, @@ -26389,7 +26392,7 @@ "description": "PublicError" } }, - "summary": "Updates an existing notification template.", + "summary": "Updates an existing notification template group.", "tags": [ "provisioning" ]