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

Jump to bottom

[Backport 2.9] Backport #1325 to 2.11 #1364

Closed
wants to merge 1 commit into from
Closed

[Backport 2.9] Backport #1325 to 2.11 #1364

wants to merge 1 commit into from

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 6368979 from #1351.

@github-actions
Backport #1325 to 2.11 (#1351)
7a2716e 
* Set docData to empty string if actual is null (#1325)

Signed-off-by: Chase Engelbrecht <[email protected]>
(cherry picked from commit 008e076)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Remove not yet introduced parameter fields

Signed-off-by: Chase Engelbrecht <[email protected]>

---------

Signed-off-by: Chase Engelbrecht <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 6368979)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@engechas
Copy link
Collaborator

engechas commented Jan 8, 2024

Checked out 2.9 locally, I get the same exceptions as seen in the workflows without this commit present:

> Task :alerting:compileKotlin FAILED
e: /Users/engechas/security-analytics/alerting/alerting/src/main/kotlin/org/opensearch/alerting/settings/SupportedClusterMetricsSettings.kt: (90, 35): Unresolved reference: CAT_INDICES
e: /Users/engechas/security-analytics/alerting/alerting/src/main/kotlin/org/opensearch/alerting/settings/SupportedClusterMetricsSettings.kt: (97, 35): Unresolved reference: CAT_SHARDS
e: /Users/engechas/security-analytics/alerting/alerting/src/main/kotlin/org/opensearch/alerting/util/clusterMetricsMonitorHelpers/SupportedClusterMetricsSettingsExtensions.kt: (49, 47): Unresolved reference: CAT_INDICES
e: /Users/engechas/security-analytics/alerting/alerting/src/main/kotlin/org/opensearch/alerting/util/clusterMetricsMonitorHelpers/SupportedClusterMetricsSettingsExtensions.kt: (66, 47): Unresolved reference: CAT_SHARDS
e: /Users/engechas/security-analytics/alerting/alerting/src/main/kotlin/org/opensearch/alerting/util/clusterMetricsMonitorHelpers/SupportedClusterMetricsSettingsExtensions.kt: (115, 107): Unresolved reference: CAT_INDICES
e: /Users/engechas/security-analytics/alerting/alerting/src/main/kotlin/org/opensearch/alerting/util/clusterMetricsMonitorHelpers/SupportedClusterMetricsSettingsExtensions.kt: (119, 107): Unresolved reference: CAT_SHARDS

FAILURE: Build failed with an exception.

@engechas
Copy link
Collaborator

Can't fix the conflict since I am not the author. Closing in favor of #1466

@engechas engechas closed this Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@engechas engechas engechas approved these changes

Assignees
No one assigned
Labels
autocut
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@engechas