Skip to content

Add Target object for external data source support on Monitor and Alert models. - #916

Merged
riysaxen-amzn merged 1 commit into
opensearch-project:mainfrom
manaswini1920:feature/workspace-datasource-fields
Mar 25, 2026
Merged

Add Target object for external data source support on Monitor and Alert models.#916
riysaxen-amzn merged 1 commit into
opensearch-project:mainfrom
manaswini1920:feature/workspace-datasource-fields

Conversation

@manaswini1920

@manaswini1920 manaswini1920 commented Mar 19, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Description

Add Target object for external data source support on Monitor and Alert models.

  • New Target data class in common-utils with type (enum: LOCAL, AOSS_COLLECTION, AOS_DOMAIN) and endpoint (URL of remote collection/domain)
  • Monitor: added target: Target field (defaults to {type: LOCAL})
  • Alert: added target: Target? field, copied from parent Monitor at alert creation time across all 5 Monitor-taking constructors
  • All new fields are optional with defaults for backward compatibility
  • Target only serialized when non-LOCAL (conditional toXContent)
  • StreamInput/writeTo version-gated to V_3_6_0 for rolling upgrade safety
  • Includes TargetTests with 7 unit tests covering serialization, parsing, validation, and enum handling

Related Issues

Resolves

Testing

  • 7 new unit tests in TargetTests — default construction, AOSS/AOS targets, endpoint validation, stream roundtrip, XContent roundtrip, enum parsing
  • All existing tests pass — backward compatibility verified

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

@manaswini1920 manaswini1920 mentioned this pull request Mar 19, 2026
Closed
5 tasks
eirsep
eirsep reviewed Mar 19, 2026
View reviewed changes
Comment thread src/main/kotlin/org/opensearch/commons/alerting/model/Alert.kt Outdated
eirsep
eirsep reviewed Mar 19, 2026
View reviewed changes
Comment thread src/main/kotlin/org/opensearch/commons/alerting/model/Alert.kt Outdated
@eirsep

eirsep commented Mar 19, 2026

Copy link
Copy Markdown
Member

let's plz add UT coverage

@manaswini1920
manaswini1920 force-pushed the feature/workspace-datasource-fields branch from f432ddc to aa20a53 Compare March 24, 2026 00:57
@manaswini1920 manaswini1920 changed the title Add workspace_id, target_type, target_arn fields to Monitor and Alert… Add Target object for external data source support on Monitor and Alert models. Mar 24, 2026
eirsep
eirsep requested changes Mar 24, 2026
View reviewed changes
Comment thread src/main/kotlin/org/opensearch/commons/alerting/model/Target.kt Outdated
Comment thread src/main/kotlin/org/opensearch/commons/alerting/model/Target.kt Outdated
@manaswini1920
manaswini1920 force-pushed the feature/workspace-datasource-fields branch 2 times, most recently from 298c17a to 3d1745e Compare March 24, 2026 03:02
engechas
engechas reviewed Mar 24, 2026
View reviewed changes

@engechas engechas left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some inconsistency between the changes in the ser/de of the Alert/Monitor models. Wanted to ensure that is intentional

Comment thread src/main/kotlin/org/opensearch/commons/alerting/model/Alert.kt Outdated
Comment thread src/main/kotlin/org/opensearch/commons/alerting/model/Monitor.kt Outdated
Comment thread src/test/kotlin/org/opensearch/commons/alerting/model/TargetTests.kt
@manaswini1920
manaswini1920 force-pushed the feature/workspace-datasource-fields branch 2 times, most recently from 9276e02 to 8d09774 Compare March 24, 2026 17:25
engechas
engechas previously approved these changes Mar 24, 2026
View reviewed changes
Manaswini Ragamouni
Add Target object for external data source support on Monitor and Alert
b195b1f 
Add Target data class (type + endpoint) to support external data source
targeting. Monitors can target LOCAL (default), AOSS_COLLECTION, or
AOS_DOMAIN endpoints. Target is copied from Monitor to Alert at alert
creation time to preserve data source context for dashboards.

Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>
@manaswini1920
manaswini1920 force-pushed the feature/workspace-datasource-fields branch from 8d09774 to b195b1f Compare March 24, 2026 22:25
@riysaxen-amzn
riysaxen-amzn merged commit eba8e70 into opensearch-project:main Mar 25, 2026
9 checks passed
@manaswini1920 manaswini1920 mentioned this pull request Mar 25, 2026
Closed
5 tasks
manaswini1920 pushed a commit to manaswini1920/common-utils that referenced this pull request Mar 25, 2026
Manaswini Ragamouni
Revert "Add Target object for external data source support on Monitor…
6457a8f 
… and Alert (opensearch-project#916)"

This reverts commit eba8e70.
@manaswini1920 manaswini1920 mentioned this pull request Mar 25, 2026
Merged
2 tasks
manaswini1920 pushed a commit to manaswini1920/common-utils that referenced this pull request Mar 25, 2026
Manaswini Ragamouni
Revert "Add Target object for external data source support on Monitor…
c10e1ef 
… and Alert (opensearch-project#916)"

This reverts commit eba8e70.

Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>
riysaxen-amzn pushed a commit that referenced this pull request Mar 25, 2026
@manaswini1920 Manaswini Ragamouni
Revert "Add Target object for external data source support on Monitor…
a4d2442 
… and Alert (#916)" (#917)

This reverts commit eba8e70.

Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>
Co-authored-by: Manaswini Ragamouni <ragamanu@amazon.com>
@peterzhuamazon peterzhuamazon mentioned this pull request Mar 25, 2026
Closed
manaswini1920 pushed a commit to manaswini1920/common-utils that referenced this pull request Mar 25, 2026
Manaswini Ragamouni
Reapply "Add Target object for external data source support on Monito…
fdbbfee 
…r and Alert (opensearch-project#916)" (opensearch-project#917)

This reverts commit a4d2442.

Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>
@manaswini1920 manaswini1920 mentioned this pull request Mar 25, 2026
Merged
2 tasks
AWSHurneyt pushed a commit that referenced this pull request Mar 25, 2026
@manaswini1920 Manaswini Ragamouni
Reapply "Add Target object for external data source support on Monito…
8514900 
…r and Alert (#916)" (#917) (#918)

This reverts commit a4d2442.

Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>
Co-authored-by: Manaswini Ragamouni <ragamanu@amazon.com>
@opensearch-ci-bot opensearch-ci-bot mentioned this pull request Apr 4, 2026
Merged
eirsep pushed a commit to eirsep/common-utils that referenced this pull request Apr 17, 2026
@manaswini1920 Manaswini Ragamouni @eirsep
Reapply "Add Target object for external data source support on Monito…
bcfc99c 
…r and Alert (opensearch-project#916)" (opensearch-project#917) (opensearch-project#918)

This reverts commit a4d2442.

Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>
Co-authored-by: Manaswini Ragamouni <ragamanu@amazon.com>
eirsep added a commit that referenced this pull request Apr 17, 2026
@eirsep @manaswini1920 Manaswini Ragamouni
Reapply "Add Target object for external data source support on Monito…
14b6118 
…r and Alert (#916)" (#917) (#918) (#941)

This reverts commit a4d2442.

Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>
Co-authored-by: Manaswini Ragamouni <40575189+manaswini1920@users.noreply.github.com>
Co-authored-by: Manaswini Ragamouni <ragamanu@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eirsep eirsep eirsep approved these changes
@engechas engechas engechas approved these changes
@lezzago lezzago Awaiting requested review from lezzago lezzago is a code owner
@bowenlan-amzn bowenlan-amzn Awaiting requested review from bowenlan-amzn bowenlan-amzn is a code owner
@rishabhmaurya rishabhmaurya Awaiting requested review from rishabhmaurya rishabhmaurya is a code owner
@getsaurabh02 getsaurabh02 Awaiting requested review from getsaurabh02 getsaurabh02 is a code owner
@sbcd90 sbcd90 Awaiting requested review from sbcd90
@AWSHurneyt AWSHurneyt Awaiting requested review from AWSHurneyt AWSHurneyt is a code owner
@riysaxen-amzn riysaxen-amzn Awaiting requested review from riysaxen-amzn riysaxen-amzn is a code owner
@jowg-amazon jowg-amazon Awaiting requested review from jowg-amazon
@cwperks cwperks Awaiting requested review from cwperks cwperks is a code owner
@toepkerd toepkerd Awaiting requested review from toepkerd toepkerd is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@manaswini1920 @eirsep @engechas @riysaxen-amzn