-
Notifications
You must be signed in to change notification settings - Fork 186
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
Merge 4.7.0 into 4.7.1 #5917
Merged
Merged
Merge 4.7.0 into 4.7.1 #5917
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Bump revision to 02 (4.5.2) (#5844) bump: revision to 02 * Add environments for 4.5 (#5797) * Add environments for 4.5 * Add saml required: false * Fix readme * Fix readme 4.4 * Update README.md * Update README.md --------- Co-authored-by: Ian Yenien Serrano <[email protected]>
### Description Fix package URLs in aarch64 commands Closes #5870 ### Test Check all the LINUX commands 1. Select one-by-one Linux Distros 2. Check if the package URL works (copy and paste in a new browser tab) - **Important:** Use `package-dev` and `/pre-release/` instead /4.x/ 3. Check in the command if the package name and package downloaded have the same name 4. If you have the same distro, check the agent package installation ## Linux RPM amd64 <img width="259" alt="Captura de pantalla 2023-09-11 a la(s) 12 28 34" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/8dd34a1a-1106-4d6d-a055-084b9a25d632"> ```bash curl -o wazuh-agent-4.6.0-1.x86_64.rpm https://packages.wazuh.com/4.x/yum/wazuh-agent-4.6.0-1.x86_64.rpm && sudo WAZUH_MANAGER='0.0.0.0' rpm -ihv wazuh-agent-4.6.0-1.x86_64.rpm ``` > Annotation: > In this case, the `amd64.rpm` package doesn't exist because of that we use the `x86_64.rpm` <img width="785" alt="Captura de pantalla 2023-09-11 a la(s) 12 39 38" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/34ba9084-fadb-436c-8f3a-5308b5618672"> ## Linux DEB amd64 <img width="272" alt="Captura de pantalla 2023-09-11 a la(s) 12 32 14" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/98f055e3-29db-4199-ac31-37555d9afe7a"> ```bash wget https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_4.6.0-1_amd64.deb && sudo WAZUH_MANAGER='0.0.0.0' dpkg -i ./wazuh-agent_4.6.0-1_amd64.deb ``` ## Linux RPM aarch64 <img width="265" alt="Captura de pantalla 2023-09-11 a la(s) 12 34 44" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/83719a87-8d9e-443a-a857-ecd6a719fd75"> ```bash curl -o wazuh-agent-4.6.0-1.aarch64.rpm https://packages.wazuh.com/4.x/yum/wazuh-agent-4.6.0-1.aarch64.rpm && sudo WAZUH_MANAGER='0.0.0.0' rpm -ihv wazuh-agent-4.6.0-1.aarch64.rpm ``` ## Linux DEB aarch64 <img width="270" alt="Captura de pantalla 2023-09-11 a la(s) 12 36 53" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/e5896673-d2bf-4fdc-9615-55bd0421485a"> ```bash wget https://packages.wazuh.com/4.x/apt/pool/main/w/wazuh-agent/wazuh-agent_4.6.0-1_arm64.deb && sudo WAZUH_MANAGER='0.0.0.0' dpkg -i ./wazuh-agent_4.6.0-1_arm64.deb ``` > Annotation: > In this case, the `aarch64.deb` package doesn't exist because of that we use the `arm64.deb` <img width="882" alt="Captura de pantalla 2023-09-11 a la(s) 12 38 19" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/40df5bc3-ec18-4bf8-a093-82eed3114be3"> ### Check List - [ ] All tests pass - [ ] `yarn test:jest` - [ ] New functionality includes testing. - [ ] New functionality has been documented. - [ ] Update [CHANGELOG.md](./../CHANGELOG.md) - [ ] Commits are signed per the DCO using --signoff
…de (#5876) fix: link to the documentation for manager address in the Deploy new agent guide
fix: usage of js2xmlparser
fix: API Console syntax error when using the autocomplete of requets payload
### Description Fix the macOS installation command Closes #5886 ## Evidence ## Intel (intel64) ![Captura de pantalla 2023-09-12 a la(s) 13 57 12](https://github.com/wazuh/wazuh-kibana-app/assets/6089438/fbdef941-d0c8-4d61-a1ec-922877132329) ![Captura de pantalla 2023-09-12 a la(s) 13 57 21](https://github.com/wazuh/wazuh-kibana-app/assets/6089438/d4c695d0-8ea2-4fc6-b6b2-7e0759aba6fa) ```bash curl -so wazuh-agent.pkg https://packages.wazuh.com/4.x/macos/wazuh-agent-4.6.0-1.intel64.pkg && echo "WAZUH_MANAGER='0.0.0.0' && WAZUH_AGENT_NAME='agent-name'" > /tmp/wazuh_envs && sudo installer -pkg ./wazuh-agent.pkg -target / ``` ### Command output <img width="722" alt="Captura de pantalla 2023-09-12 a la(s) 13 50 56" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/9f8153be-dda7-4a6e-a016-949f61a0b53e"> ### ossec.conf with parameters specified <img width="521" alt="Captura de pantalla 2023-09-12 a la(s) 13 50 35" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/3c7ac29a-ad67-4407-962f-cf1d03967efd"> ## Apple silicon (arm64) ![Captura de pantalla 2023-09-12 a la(s) 13 57 52](https://github.com/wazuh/wazuh-kibana-app/assets/6089438/767aedd3-9611-4462-b5e7-a25390f3f057) ![Captura de pantalla 2023-09-12 a la(s) 13 58 11](https://github.com/wazuh/wazuh-kibana-app/assets/6089438/3fe3d61d-6511-41a5-be80-dcdb24713bd3) ```bash curl -so wazuh-agent.pkg https://packages.wazuh.com/4.x/macos/wazuh-agent-4.6.0-1.arm64.pkg && echo "WAZUH_MANAGER='0.0.0.0' && WAZUH_AGENT_NAME='agent-name'" > /tmp/wazuh_envs && sudo installer -pkg ./wazuh-agent.pkg -target / ``` ### Command output <img width="682" alt="image" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/e9572921-cf1b-4151-ba42-fa8e321b67d3"> ### ossec.conf with parameters specified <img width="533" alt="image" src="https://github.com/wazuh/wazuh-kibana-app/assets/6089438/eb0d4a5a-8495-4056-bc88-a101b6eab447"> ### Test 1. Go to Agents section 2. Click Deploy new agent button 3. Select macOS operting system and complete the form 4. Check the installation and start commands ### Check List - [x] All tests pass - [x] `yarn test:jest` - [x] New functionality includes testing. - [x] New functionality has been documented. - [x] Update [CHANGELOG.md](./../CHANGELOG.md) - [x] Commits are signed per the DCO using --signoff
### Description This pull request fixes the link to the WQL documentation. It redirects to the official documentation instead of repository documenation. ### Issues Resolved #5867 ### Evidence ![image](https://github.com/wazuh/wazuh-kibana-app/assets/34042064/110e678e-a443-434d-b917-e0bc8be68bac) ### Test Legend: :black_circle:: none :green_circle:: pass :yellow_circle:: warning :red_circle:: fail :white_circle:: not applicable ## UI | Test | Chrome | Firefox | Safari | | --- | --- | --- | --- | | Ensure the WQL documentation link is pointing to the official documentation and the link would be valid. | :black_circle: | :black_circle: | :black_circle: | **Details** <details> <summary>:black_circle: Ensure the WQL documentation link is pointing to the official documentation and the link would be valid.</summary> Chrome - :black_circle: Firefox - :black_circle: Safari - :black_circle: </details> ### Check List - [ ] All tests pass - [ ] `yarn test:jest` - [ ] New functionality includes testing. - [ ] New functionality has been documented. - [ ] Update [CHANGELOG.md](./../CHANGELOG.md) - [x] Commits are signed per the DCO using --signoff
…ecies (#5906) Add kbn-dev 7.17.13 and bump node version and dependecies (#5903) * Add kbn-dev 7.17.13 and bump node version and dependecies * Revert pluginPlatform to 7.16.0 Needed for Jest to run --------- Co-authored-by: Alex Ruiz Becerra <[email protected]> (cherry picked from commit f240c3b)
Merge 4.5.3 into 4.6.0 > IMPORTANT: Merge PR strategy: Create a merge commit
Merge 4.6.0 into 4.7.0
Closed
9 tasks
Machi3mfl
approved these changes
Sep 22, 2023
|
Closed
9 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge 4.7.0 into 4.7.1