Skip to content

Commit 83c4616

Browse files
author
Maurice Faber
committed
fix: schema [ci skip]
1 parent a047e9e commit 83c4616

File tree

5 files changed

+50
-50
lines changed

5 files changed

+50
-50
lines changed

src/fixtures/values.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ export default {
423423
isManaged: true,
424424
isMultitenant: true,
425425
mode: 'ce',
426-
teamPrefix: 'team-',
427426
addons: {
428427
conftest: {
429428
enabled: true,

src/openapi/definitions.yaml

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
11
alerts:
22
additionalProperties: false
33
properties:
4-
drone:
5-
default: slack
6-
description: Select default notification channel for Drone.
7-
enum:
8-
- slack
9-
- msteams
10-
title: Drone Notifications
4+
repeatInterval:
5+
default: 3h
6+
description: Indicates waiting time before sending a notification again after it was sent successfully for an alert. (Usually ~3h or more).
7+
title: Repeat Interval
8+
type: string
9+
groupInterval:
10+
default: 5m
11+
description: How long to wait before sending a notification about new alerts that are added to a group of alerts for which an initial notification has already been sent. (Usually ~5m or more.)
12+
title: Group Interval
1113
type: string
14+
slack:
15+
additionalProperties: false
16+
properties:
17+
channel:
18+
default: mon-otomi
19+
description: The Slack channel for non-critical notifications.
20+
title: Non-critical
21+
type: string
22+
channelCrit:
23+
default: mon-otomi
24+
description: The Slack channel for critical notifications.
25+
title: Critical
26+
type: string
27+
url:
28+
$ref: '#/url'
29+
description: A Slack webhook URL.
30+
type: object
1231
email:
1332
additionalProperties: false
1433
properties:
@@ -21,11 +40,6 @@ alerts:
2140
$ref: '#/email'
2241
description: One or more email addresses (comma separated) for non-critical events.
2342
type: object
24-
groupInterval:
25-
default: 5m
26-
description: How long to wait before sending a notification about new alerts that are added to a group of alerts for which an initial notification has already been sent. (Usually ~5m or more.)
27-
title: Group Interval
28-
type: string
2943
msteams:
3044
additionalProperties: false
3145
description: Select Microsoft Teams notification settings.
@@ -46,28 +60,17 @@ alerts:
4660
- msteams
4761
- email
4862
type: string
49-
title: Notification Receivers
63+
title: Notification receivers
5064
type: array
51-
repeatInterval:
52-
default: 3h
53-
description: Indicates waiting time before sending a notification again after it was sent successfully for an alert. (Usually ~3h or more).
54-
title: Repeat Interval
65+
uniqueItems: true
66+
drone:
67+
default: slack
68+
description: Select default notification channel for Drone.
69+
enum:
70+
- slack
71+
- msteams
72+
title: Drone Notifications
5573
type: string
56-
slack:
57-
additionalProperties: false
58-
properties:
59-
channel:
60-
default: mon-otomi
61-
description: The Slack channel for non-critical notifications.
62-
type: string
63-
channelCrit:
64-
default: mon-otomi
65-
description: The Slack channel for critical notifications.
66-
type: string
67-
url:
68-
$ref: '#/url'
69-
description: A Slack webhook URL.
70-
type: object
7174
annotation:
7275
type: string
7376
pattern: ^((.){1,253}\/)?(.){1,63}$
@@ -344,6 +347,8 @@ jobSpec:
344347
type: integer
345348
init:
346349
$ref: '#/containerSpec'
350+
title: Init container
351+
description: May specify an init container, allowing to do preparations like checking for conditions.
347352
nullable: true
348353
required:
349354
- name
@@ -352,7 +357,7 @@ jobSpec:
352357
type: object
353358
k8sVersion:
354359
default: '1.19'
355-
description: The cluster k8s version. Otomi supports 2 minor versions backwards compatibility from the suggested default.
360+
description: The cluster k8s version. Otomi supports 2 minor versions backwards from the suggested default.
356361
enum:
357362
- '1.17'
358363
- '1.18'

src/openapi/session.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Session:
1717
type: array
1818
items:
1919
type: string
20+
uniqueItems: true
2021
teams:
2122
readOnly: true
2223
type: array

src/openapi/settings.yaml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ Settings:
2222
type: object
2323
monitor:
2424
$ref: definitions.yaml#/azureMonitor
25-
resourceGroup:
26-
title: Azure resource group
27-
type: string
28-
subscriptionId:
29-
title: Subscription ID
30-
type: string
31-
tenantId:
32-
title: Tenant ID
33-
type: string
25+
storageType:
26+
title: Storage types
27+
description: Storage types for classes used in Otomi.
28+
properties:
29+
fast:
30+
type: string
31+
standard:
32+
type: string
3433
required:
3534
- resourceGroup
3635
- subscriptionId
3736
- tenantId
37+
x-provider: azure
3838
customer:
3939
title: Customer
4040
description: A customer's settings.
@@ -55,8 +55,10 @@ Settings:
5555
title: Zone
5656
title: Zones
5757
type: array
58+
uniqueItems: true
5859
provider:
5960
description: The DNS provider managing the domains.
61+
title: Provider
6062
oneOf:
6163
- title: AWS
6264
properties:
@@ -241,12 +243,6 @@ Settings:
241243
description: The pullsecret to deploy the Otomi API and Console. Requires an Otomi license.
242244
title: Pull secret
243245
type: string
244-
teamPrefix:
245-
default: team-
246-
description: The prefix to use in URLs for team domains.
247-
pattern: ^[a-z]+[-]{1}$
248-
title: Team prefix
249-
type: string
250246
smtp:
251247
title: SMTP
252248
description: Mail server settings.

test/env/settings.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ otomi:
3434
isManaged: true
3535
isMultitenant: true
3636
mode: ce
37-
teamPrefix: team-
3837
addons:
3938
conftest:
4039
enabled: true

0 commit comments

Comments
 (0)