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.

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

Serialize cronjob doc and remove type property #5150

Merged
merged 3 commits into from
Jan 25, 2023

Conversation

asteriscos
Copy link
Member

@asteriscos asteriscos commented Jan 20, 2023

Description

Hi team,
this PR fixes the statistics cronjob request body to fix the "mapper_parsing_exception". It seems the opensearch dependency that executes the bulk doc insert has changed.

https://github.com/opensearch-project/OpenSearch-Dashboards/blob/1.2.0/package.json#L121
https://github.com/opensearch-project/OpenSearch-Dashboards/blob/2.4.1/package.json#L133

Issues Resolved

Closes https://github.com/wazuh/wazuh-automation/issues/1020

Evidence

Discover

image

Statistics

image

Test

  • Verify the Statistics information is indexed in Cluster mode ON and OFF
Cluster Mode ON Cluster Mode OFF

Check List

  • All tests pass
    • yarn test:jest
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@asteriscos asteriscos requested a review from a team as a code owner January 20, 2023 15:44
@asteriscos asteriscos self-assigned this Jan 20, 2023
Desvelao
Desvelao previously approved these changes Jan 23, 2023
Copy link
Member

@Desvelao Desvelao left a comment

Choose a reason for hiding this comment

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

review:

code 🟢

Wazuh dashboard

Legend:
⚫: none
🟢: passed
🔴: failed
🟡: warning
⚪: not applicable

Environment:
Platform: Wazuh dashboard

Test Chrome Firefox Safari
Verify the Statistics information is indexed in Cluster mode 🟢 🟢
Verify the Statistics information is indexed in Manager mode 🟢 🟢

Details

🟢 Verify the Statistics information is indexed in Cluster mode

Chrome - 🟢
image
image

Firefox - 🟢
image
image

Safari - ⚫

🟢 Verify the Statistics information is indexed in Manager mode

Chrome - 🟢
image
image

Firefox - 🟢
image
image

Safari - ⚫

@AlexRuiz7 AlexRuiz7 changed the title serialize cronjob doc and remove type property Serialize cronjob doc and remove type property Jan 24, 2023
@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.76% ( 3236 / 36906 )
Branches 4.5% ( 1291 / 28670 )
Functions 7.63% ( 698 / 9142 )
Lines 8.83% ( 3121 / 35340 )

@chantal-kelm chantal-kelm self-requested a review January 24, 2023 18:38
Copy link
Member

@chantal-kelm chantal-kelm left a comment

Choose a reason for hiding this comment

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

review:

code 🟢

Wazuh dashboard

Legend:
⚫: none
🟢: passed
🔴: failed
🟡: warning
⚪: not applicable

Environment:
Platform: Wazuh dashboard

Test Chrome Firefox Safari
Verify the Statistics information is indexed in Cluster mode 🟢 🟢 🟢
Verify the Statistics information is indexed in Manager mode 🟢 🟢 🟢

Details

🟢 Cluster mode OFF image

Chrome - 🟢

image image image image image

Firefox - 🟢

image image image image

Safari - 🟢

image image image image
🟢 Cluster mode ON image

Chrome - 🟢

image image image image

Firefox - 🟢

image image image image

Safari - 🟢

image image image image

@Desvelao Desvelao merged commit 6a6ea1f into 4.4-2.4-wzd Jan 25, 2023
@Desvelao Desvelao deleted the fix/mapper_parsing_exception-1020 branch January 25, 2023 07:46
@github-actions
Copy link
Contributor

The backport to 4.4-7.16 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-7.16 4.4-7.16
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.16
# Create a new branch
git switch --create backport-5150-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6a6ea1f8af52fa63b30a39fb7589ccf4847e71b3
# Push it to GitHub
git push --set-upstream origin backport-5150-to-4.4-7.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.16

Then, create a pull request where the base branch is 4.4-7.16 and the compare/head branch is backport-5150-to-4.4-7.16.

@github-actions
Copy link
Contributor

The backport to 4.4-7.10 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-7.10 4.4-7.10
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.10
# Create a new branch
git switch --create backport-5150-to-4.4-7.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6a6ea1f8af52fa63b30a39fb7589ccf4847e71b3
# Push it to GitHub
git push --set-upstream origin backport-5150-to-4.4-7.10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.10

Then, create a pull request where the base branch is 4.4-7.10 and the compare/head branch is backport-5150-to-4.4-7.10.

Desvelao pushed a commit that referenced this pull request Jan 25, 2023
* serialize cronjob doc and remove type property

* Add Changelog

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit 6a6ea1f)
Desvelao pushed a commit that referenced this pull request Jan 25, 2023
* serialize cronjob doc and remove type property

* Add Changelog

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit 6a6ea1f)
Tostti added a commit that referenced this pull request Jan 26, 2023
…5160)

Serialize cronjob doc and remove type property (#5150)

* serialize cronjob doc and remove type property

* Add Changelog

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit 6a6ea1f)

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Nico Guevara <42900763+Tostti@users.noreply.github.com>
Desvelao added a commit that referenced this pull request Jan 27, 2023
…5159)

Serialize cronjob doc and remove type property (#5150)

* serialize cronjob doc and remove type property

* Add Changelog

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit 6a6ea1f)

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants