Skip to content

[RAM][8.8] Fix get active maintenance window query#157112

Merged
JiaweiWu merged 4 commits intoelastic:mainfrom
JiaweiWu:fix-mw-get-active-maintenance-window
May 9, 2023
Merged

[RAM][8.8] Fix get active maintenance window query#157112
JiaweiWu merged 4 commits intoelastic:mainfrom
JiaweiWu:fix-mw-get-active-maintenance-window

Conversation

@JiaweiWu
Copy link
Contributor

@JiaweiWu JiaweiWu commented May 8, 2023

Summary

Fix the active maintenance window query, originally the KQL query got converted to something like:

 query: {
  bool: {
    filter: [
      {
        range: {
          'maintenance-window.attributes.events': {
            gte: from,
          },
        },
      },
      {
        range: {
          'maintenance-window.attributes.events': {
            lte: to,
          },
        },
      },
    ],
  },
},

When in reality we wanted a query like:

query: {
  bool: {
    filter: 
      range: {
        'maintenance-window.attributes.events': {
          gte: from,
          lte: to,
        },
      },
    },
  },
},

Which return some upcoming maintenance windows that we did not want.

Checklist

@JiaweiWu JiaweiWu added bug Fixes for quality problems that affect the customer experience backport This PR is a backport of another PR release_note:skip Skip the PR/issue when compiling release notes Team:ResponseOps Platform ResponseOps team (formerly the Cases and Alerting teams) t// Feature:Alerting/RulesManagement Issues related to the Rules Management UX v8.7.0 v8.8.0 labels May 8, 2023
@JiaweiWu JiaweiWu requested a review from a team as a code owner May 8, 2023 23:08
@elasticmachine
Copy link
Contributor

Pinging @elastic/response-ops (Team:ResponseOps)

@JiaweiWu JiaweiWu added v8.9.0 and removed v8.7.0 labels May 8, 2023
@JiaweiWu JiaweiWu enabled auto-merge (squash) May 8, 2023 23:10
@kibana-ci
Copy link

💚 Build Succeeded

Metrics [docs]

Unknown metric groups

ESLint disabled line counts

id before after diff
enterpriseSearch 19 21 +2
securitySolution 399 403 +4
total +6

Total ESLint disabled count

id before after diff
enterpriseSearch 20 22 +2
securitySolution 479 483 +4
total +6

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@JiaweiWu JiaweiWu merged commit 6d4f695 into elastic:main May 9, 2023
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 9, 2023
## Summary
Fix the active maintenance window query, originally the KQL query got
converted to something like:

```
 query: {
  bool: {
    filter: [
      {
        range: {
          'maintenance-window.attributes.events': {
            gte: from,
          },
        },
      },
      {
        range: {
          'maintenance-window.attributes.events': {
            lte: to,
          },
        },
      },
    ],
  },
},
```
When in reality we wanted a query like:

```
query: {
  bool: {
    filter:
      range: {
        'maintenance-window.attributes.events': {
          gte: from,
          lte: to,
        },
      },
    },
  },
},
```
Which return some upcoming maintenance windows that we did not want.

### Checklist
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

(cherry picked from commit 6d4f695)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.8

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request May 9, 2023
…157119)

# Backport

This will backport the following commits from `main` to `8.8`:
- [[RAM][8.8] Fix get active maintenance window query
(#157112)](#157112)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jiawei
Wu","email":"74562234+JiaweiWu@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-05-09T02:27:59Z","message":"[RAM][8.8]
Fix get active maintenance window query (#157112)\n\n## Summary\r\nFix
the active maintenance window query, originally the KQL query
got\r\nconverted to something like:\r\n\r\n```\r\n query: {\r\n bool:
{\r\n filter: [\r\n {\r\n range: {\r\n
'maintenance-window.attributes.events': {\r\n gte: from,\r\n },\r\n
},\r\n },\r\n {\r\n range: {\r\n 'maintenance-window.attributes.events':
{\r\n lte: to,\r\n },\r\n },\r\n },\r\n ],\r\n },\r\n},\r\n```\r\nWhen
in reality we wanted a query like:\r\n\r\n```\r\nquery: {\r\n bool:
{\r\n filter: \r\n range: {\r\n 'maintenance-window.attributes.events':
{\r\n gte: from,\r\n lte: to,\r\n },\r\n },\r\n },\r\n
},\r\n},\r\n```\r\nWhich return some upcoming maintenance windows that
we did not want.\r\n\r\n### Checklist\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"6d4f695b759b8fe30ac7314951c39dce6f27e376","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","backport","release_note:skip","Team:ResponseOps","Feature:Alerting/RulesManagement","v8.8.0","v8.9.0"],"number":157112,"url":"https://github.com/elastic/kibana/pull/157112","mergeCommit":{"message":"[RAM][8.8]
Fix get active maintenance window query (#157112)\n\n## Summary\r\nFix
the active maintenance window query, originally the KQL query
got\r\nconverted to something like:\r\n\r\n```\r\n query: {\r\n bool:
{\r\n filter: [\r\n {\r\n range: {\r\n
'maintenance-window.attributes.events': {\r\n gte: from,\r\n },\r\n
},\r\n },\r\n {\r\n range: {\r\n 'maintenance-window.attributes.events':
{\r\n lte: to,\r\n },\r\n },\r\n },\r\n ],\r\n },\r\n},\r\n```\r\nWhen
in reality we wanted a query like:\r\n\r\n```\r\nquery: {\r\n bool:
{\r\n filter: \r\n range: {\r\n 'maintenance-window.attributes.events':
{\r\n gte: from,\r\n lte: to,\r\n },\r\n },\r\n },\r\n
},\r\n},\r\n```\r\nWhich return some upcoming maintenance windows that
we did not want.\r\n\r\n### Checklist\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"6d4f695b759b8fe30ac7314951c39dce6f27e376"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"8.8","label":"v8.8.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/157112","number":157112,"mergeCommit":{"message":"[RAM][8.8]
Fix get active maintenance window query (#157112)\n\n## Summary\r\nFix
the active maintenance window query, originally the KQL query
got\r\nconverted to something like:\r\n\r\n```\r\n query: {\r\n bool:
{\r\n filter: [\r\n {\r\n range: {\r\n
'maintenance-window.attributes.events': {\r\n gte: from,\r\n },\r\n
},\r\n },\r\n {\r\n range: {\r\n 'maintenance-window.attributes.events':
{\r\n lte: to,\r\n },\r\n },\r\n },\r\n ],\r\n },\r\n},\r\n```\r\nWhen
in reality we wanted a query like:\r\n\r\n```\r\nquery: {\r\n bool:
{\r\n filter: \r\n range: {\r\n 'maintenance-window.attributes.events':
{\r\n gte: from,\r\n lte: to,\r\n },\r\n },\r\n },\r\n
},\r\n},\r\n```\r\nWhich return some upcoming maintenance windows that
we did not want.\r\n\r\n### Checklist\r\n- [x] [Unit or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common
scenarios","sha":"6d4f695b759b8fe30ac7314951c39dce6f27e376"}}]}]
BACKPORT-->

Co-authored-by: Jiawei Wu <74562234+JiaweiWu@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR bug Fixes for quality problems that affect the customer experience Feature:Alerting/RulesManagement Issues related to the Rules Management UX release_note:skip Skip the PR/issue when compiling release notes Team:ResponseOps Platform ResponseOps team (formerly the Cases and Alerting teams) t// v8.8.0 v8.9.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants