Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: update monitorv2 to allow inline actions #174

Merged
merged 7 commits into from
Dec 3, 2024
Merged

feature: update monitorv2 to allow inline actions #174

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e171be
feature: update monitorv2 to allow inline actions
obs-gh-catherman Nov 19, 2024
10768d0
pr asks (except the update test)
obs-gh-catherman Nov 27, 2024
5374ea6
pr: add update test
obs-gh-catherman Nov 27, 2024
fc99c83
fix generate
obs-gh-catherman Nov 27, 2024
6232d56
actually fix?
obs-gh-catherman Dec 2, 2024
f5220fc
pr: remove inline
obs-gh-catherman Dec 2, 2024
1350d09
revert generate changes?
obs-gh-catherman Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions client/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,23 @@ func (c *Client) GetMonitor(ctx context.Context, id string) (*meta.Monitor, erro
return c.Meta.GetMonitor(ctx, id)
}

func (c *Client) SaveMonitorV2WithActions(
ctx context.Context,
workspaceId string,
monitorId *string,
input *meta.MonitorV2Input,
actions []meta.MonitorV2ActionAndRelationInput,
) (*meta.MonitorV2, error) {
if !c.Flags[flagObs2110] {
c.obs2110.Lock()
defer c.obs2110.Unlock()
}
if c.Config.ManagingObjectID != nil {
input.ManagedById = c.Config.ManagingObjectID
}
return c.Meta.SaveMonitorV2WithActions(ctx, workspaceId, monitorId, input, actions)
}

func (c *Client) CreateMonitorV2(ctx context.Context, workspaceId string, input *meta.MonitorV2Input) (*meta.MonitorV2, error) {
if !c.Flags[flagObs2110] {
c.obs2110.Lock()
Expand Down
90 changes: 90 additions & 0 deletions client/internal/meta/operation/monitorv2.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ fragment MonitorV2Definition on MonitorV2Definition{
}
lookbackTime
dataStabilizationDelay
maxAlertsPerHour
# @genqlient(flatten: true)
groupings {
...MonitorV2Column
Expand Down Expand Up @@ -155,13 +156,31 @@ fragment MonitorV2ActionRule on MonitorV2ActionRule {
levels
sendEndNotifications
sendRemindersInterval
# @genqlient(flatten: true)
definition {
...MonitorV2ActionDefinition
}
}

fragment MonitorV2ActionDefinition on MonitorV2ActionDefinition {
inline
type
# @genqlient(flatten: true)
email {
...MonitorV2EmailAction
}
# @genqlient(flatten: true)
webhook {
...MonitorV2WebhookAction
}
}

# @genqlient(for: "MonitorV2Input.iconUrl", omitempty: true)
# @genqlient(for: "MonitorV2Input.description", omitempty: true)
# @genqlient(for: "MonitorV2Input.managedById", omitempty: true)
# @genqlient(for: "MonitorV2Input.folderId", omitempty: true)
# @genqlient(for: "MonitorV2DefinitionInput.dataStabilizationDelay", omitempty: true)
# @genqlient(for: "MonitorV2DefinitionInput.maxAlertsPerHour", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.count", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.threshold", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.promote", omitempty: true)
Expand All @@ -180,6 +199,7 @@ fragment MonitorV2ActionRule on MonitorV2ActionRule {
# @genqlient(for: "PrimitiveValueInput.string", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.timestamp", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.duration", omitempty: true)
# @genclient(for: "MonitorV2ComparisonExpressionInput.conditions", omitempty: true)
fragment MonitorV2 on MonitorV2 {
id
workspaceId
Expand Down Expand Up @@ -209,6 +229,7 @@ fragment MonitorV2 on MonitorV2 {
# @genqlient(for: "MonitorV2Input.managedById", omitempty: true)
# @genqlient(for: "MonitorV2Input.folderId", omitempty: true)
# @genqlient(for: "MonitorV2DefinitionInput.dataStabilizationDelay", omitempty: true)
# @genqlient(for: "MonitorV2DefinitionInput.maxAlertsPerHour", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.count", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.threshold", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.promote", omitempty: true)
Expand All @@ -227,6 +248,7 @@ fragment MonitorV2 on MonitorV2 {
# @genqlient(for: "PrimitiveValueInput.string", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.timestamp", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.duration", omitempty: true)
# @genclient(for: "MonitorV2ComparisonExpressionInput.conditions", omitempty: true)
mutation createMonitorV2(
$workspaceId: ObjectId!,
$input: MonitorV2Input!
Expand All @@ -242,6 +264,7 @@ mutation createMonitorV2(
# @genqlient(for: "MonitorV2Input.managedById", omitempty: true)
# @genqlient(for: "MonitorV2Input.folderId", omitempty: true)
# @genqlient(for: "MonitorV2DefinitionInput.dataStabilizationDelay", omitempty: true)
# @genqlient(for: "MonitorV2DefinitionInput.maxAlertsPerHour", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.count", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.threshold", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.promote", omitempty: true)
Expand All @@ -260,6 +283,7 @@ mutation createMonitorV2(
# @genqlient(for: "PrimitiveValueInput.string", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.timestamp", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.duration", omitempty: true)
# @genclient(for: "MonitorV2ComparisonExpressionInput.conditions", omitempty: true)
mutation updateMonitorV2(
$id: ObjectId!,
$input: MonitorV2Input!
Expand Down Expand Up @@ -291,6 +315,8 @@ query lookupMonitorV2($workspaceId: ObjectId, $folderId: ObjectId, $nameExact: S
}
}

# @genqlient(for: "MonitorV2ActionRuleInput.levels", omitempty: true)
# @genqlient(for: "MonitorV2ActionRuleInput.conditions", omitempty: true)
# @genqlient(for: "MonitorV2ActionRuleInput.sendEndNotifications", omitempty: true)
# @genqlient(for: "MonitorV2ActionRuleInput.sendRemindersInterval", omitempty: true)
mutation saveMonitorV2Relations(
Expand All @@ -302,3 +328,67 @@ mutation saveMonitorV2Relations(
...MonitorV2
}
}

# @genqlient(for: "MonitorV2Input.iconUrl", omitempty: true)
# @genqlient(for: "MonitorV2Input.description", omitempty: true)
# @genqlient(for: "MonitorV2Input.managedById", omitempty: true)
# @genqlient(for: "MonitorV2Input.folderId", omitempty: true)
# @genqlient(for: "MonitorV2DefinitionInput.groupings", omitempty: true)
# @genqlient(for: "MonitorV2DefinitionInput.dataStabilizationDelay", omitempty: true)
# @genqlient(for: "MonitorV2DefinitionInput.maxAlertsPerHour", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.count", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.threshold", omitempty: true)
# @genqlient(for: "MonitorV2RuleInput.promote", omitempty: true)
# @genqlient(for: "MonitorV2ColumnInput.linkColumn", omitempty: true)
# @genqlient(for: "MonitorV2ColumnInput.columnPath", omitempty: true)
# @genqlient(for: "MonitorV2LinkColumnInput.meta", omitempty: true)
# @genqlient(for: "MonitorV2ColumnPathInput.path", omitempty: true)
# @genqlient(for: "InputDefinitionInput.stageID", omitempty: true)
# @genqlient(for: "InputDefinitionInput.stageId", omitempty: true)
# @genqlient(for: "StageQueryInput.stageID", omitempty: true)
# @genqlient(for: "StageQueryInput.stageId", omitempty: true)
# @genqlient(for: "StageQueryInput.id", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.bool", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.float64", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.int64", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.string", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.timestamp", omitempty: true)
# @genqlient(for: "PrimitiveValueInput.duration", omitempty: true)
# @genqlient(for: "MonitorV2ActionInput.inline", omitempty: true)
# @genqlient(for: "MonitorV2ActionInput.email", omitempty: true)
# @genqlient(for: "MonitorV2ActionInput.webhook", omitempty: true)
# @genqlient(for: "MonitorV2ActionInput.iconUrl", omitempty: true)
# @genqlient(for: "MonitorV2ActionInput.description", omitempty: true)
# @genqlient(for: "MonitorV2ActionInput.managedById", omitempty: true)
# @genqlient(for: "MonitorV2ActionInput.folderId", omitempty: true)
# @genqlient(for: "MonitorV2EmailActionInput.fragments", omitempty: true)
# @genqlient(for: "MonitorV2WebhookActionInput.headers", omitempty: true)
# @genqlient(for: "MonitorV2WebhookActionInput.fragments", omitempty: true)
# @genqlient(for: "MonitorV2ActionAndRelationInput.action", omitempty: true)
# @genqlient(for: "MonitorV2ActionAndRelationInput.actionID", omitempty: true)
# @genqlient(for: "MonitorV2ActionAndRelationInput.levels", omitempty: true)
# @genqlient(for: "MonitorV2ActionAndRelationInput.conditions", omitempty: true)
# @genqlient(for: "MonitorV2ActionAndRelationInput.sendEndNotifications", omitempty: true)
# @genqlient(for: "MonitorV2ActionAndRelationInput.sendRemindersInterval", omitempty: true)
# @genqlient(for: "MonitorV2ComparisonExpressionInput.compareTerms", omitempty: true)
# @genqlient(for: "MonitorV2ComparisonExpressionInput.subExpressions", omitempty: true)
# @genqlient(for: "MonitorV2CountRuleInput.compareGroups", omitempty: true)
# @genqlient(for: "MonitorV2ThresholdRuleInput.compareGroups", omitempty: true)
# @genqlient(for: "MonitorV2PromoteRuleInput.compareColumns", omitempty: true)
mutation saveMonitorV2WithActions(
$workspaceId: ObjectId!,
$monitorId: ObjectId,
$input: MonitorV2Input!,
$actions: [MonitorV2ActionAndRelationInput!],
) {
# @genqlient(flatten: true)
monitorV2: saveMonitorV2WithActions(
workspaceId: $workspaceId,
monitorId: $monitorId,
input: $input,
actions: $actions,
) {
...MonitorV2
}
}

Loading
Loading