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

Restructure optimize/wazuh folder #2116

Merged
merged 8 commits into from
Mar 5, 2020
Merged

Restructure optimize/wazuh folder #2116

merged 8 commits into from
Mar 5, 2020

Conversation

juankaromo
Copy link
Contributor

Hi team,

This PR moves the wazuh.yml file to the /usr/share/kibana/optimize directory.

In addition, it did a modification of the structure of this directory, in order to have all the resources of Wazuh in the same path.

This PR solves #2087

The directory has now the following distribution:

/usr/share/kibana/optimize
└── wazuh/
    ├── logs/
    |    ├── wazuhapp.log
    |    └── wazuhapp-plain.log
    ├── downloads/
    |    └── reports/
    └── config/
         └── wazuh.yml

Regards,

jsanchez91
jsanchez91 suggested changes Mar 3, 2020
View reviewed changes
Copy link
Contributor

@jsanchez91 jsanchez91 left a comment

Choose a reason for hiding this comment

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

Change the connection protocol and delete the original wazuh.yml file.

Good job!

server/lib/initial-wazuh-config.js Outdated Show resolved Hide resolved
@Joanes04 Joanes04 requested a review from jsanchez91 March 3, 2020 14:44
jsanchez91
jsanchez91 reviewed Mar 3, 2020
View reviewed changes
public/controllers/settings/components/logs.js Show resolved Hide resolved
server/logger.js Outdated Show resolved Hide resolved
Joanes04
Joanes04 suggested changes Mar 4, 2020
View reviewed changes
Copy link
Contributor

@Joanes04 Joanes04 left a comment

Choose a reason for hiding this comment

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

Necessary to remove the original wazuh.yml from the repository. Tested the different functions and everything is correct

Good job team!

Joanes04
Joanes04 approved these changes Mar 5, 2020
View reviewed changes
Copy link
Contributor

@Joanes04 Joanes04 left a comment

Choose a reason for hiding this comment

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

LGTM. Good job!

@juankaromo
Copy link
Contributor Author

LGTM, but we need to take into account that the removal plugin step in the upgrade guide (README.md) needs to be reviewed.

@juankaromo juankaromo merged commit 824e427 into 3.12-7.6 Mar 5, 2020
@juankaromo juankaromo deleted the 3.12-7.6-optimize-wazuh-directory branch March 5, 2020 14:13
@juankaromo juankaromo mentioned this pull request Mar 9, 2020
Merged
juankaromo added a commit that referenced this pull request Mar 11, 2020
@juankaromo @pablotr9
Restructure optimize/wazuh folder (#2116)
fd36867 
* Restructure optimize/wazuh folder

* Update protocol of initial config example

* Replace path with a constant

* Remove wazuh.yml file

* Update README upgrade guide

* Fix plugin helper error

Co-authored-by: Pablo Torres <pablotr9@correo.ugr.es>
@juankaromo juankaromo mentioned this pull request Mar 11, 2020
Merged
juankaromo added a commit that referenced this pull request Mar 12, 2020
@juankaromo @adri9valle
@jsanchez91 @pablotr9 @Joanes04 @crd1985 @victorst79
Backports for Wazuh 3.12.0 [6.8.7] (#2132)
8e9dff0 
* Remove console.log

* Navigate from agents dashboard

* Change state by props

* Fix settings-wizard

* Fix when joinning hosts and registry

* Check for new API entries

* Close add api component

* Remove await

* Improve checks for new apis

* Test if API is down in wazuh-api

* Check down APIs

* Api is down component finish

* Transform hosts in the backend

* Fix key

* Adapt removeOrphanentries

* Adapt settings-wizard

* Improve api-is-down component

* Change  the way to display the helpers components

* Check APIs status when get them

* Remove console.log

* Check manager sets the status to the API entry

* Prevent create wazuh-registry.json without hosts

* FIx extensions

* Add panel

* Change style for wazuh hosts

* Show add api component from the table

* Refresh API entries

* Update wazuh-hosts

* Api is down table loading effect

* Show API is down when accessing to settings if any API is up

* Update cluster info in the settings wizard

* Update Kibana version

* Refactor design of guides

* Change color

* Remove wazuh-hosts.yml

* Remove hosts from configuration

* Change foreach by for

* Solves asynchronous problem

* Adapt ruleset handler

* Upload files

* Add more modules to the guide

* Show what files were upload and hwat not

* Detail the error

* Expand fail list

* Add button to refresh lists

* Fix \n in the migration

* Fix api-count

* Back from dahsboards

* Fix typo

* Fix when getting an empty file

* Prevent empty lines in cdb lists

* Hide index pattern is there are only one

* Add missing `await`

* Fix eui loader

* Change the properties of register-agent component

Set the background to transparent
Change the title: Add => Deploy

* Add register-agent component to add user to group

* Show button in general when no agents registered

* Show button in FIM when no agents registered

* Hide Logtest and Test config

* Update output of success/fail uploaded files

* More modules

* Some fixes

* Fix API wizard

* Add the RegisterAgent component to overview

* Make module selector scrollable and fit current screen

* Add Rootcheck. Fix extra attributes

* Add reconnect_time to log collection section

* Fix example in getting started guide

* Detect if is Agent

* Scroll to bottom when configuration is generated

* Fix groups interactive guide

* Revert "Merge branch 'extend-add-new-agent-1767' of https://github.com/wazuh/wazuh-kibana-app"

This reverts commit 7e56d49, reversing
changes made to 7706a2e.

* Fix style

* Avoid error when agent is not Active

* Revert "Revert "Merge branch 'extend-add-new-agent-1767' of https://github.com/wazuh/wazuh-kibana-app""

This reverts commit 6724d12.

* Delete from groups.html the actrl instance

* Fix typos

* Refresh hosts in api-is-down component

* Set default in props

* Fix API count

* Iterates the api entries to set one as default

* Fix component unmount

* Fix flick

* Validate method and path in Requests

* Adapt 7.4 to 3.10

* Bump version (547)

* Fix the documentation broken links (#1853)

* Update AWS map

* Remove babel-polyfill

* Remove babel-polyfill

* Restore babel-polyfill for cover simple-tail dependency

* Restore babel-polyfill for cover simple-tail dependency

* Filters fix (#1854)

* Filters fix

* Fix the documentation broken links (#1853)

* Update AWS map

* Removed Discover component from top menu

* Update readme

* Bump version

* Set the correct field in the geoMap viz

* Bump version (549 for 3.10.2-7.4.2)

* Revert "Set the correct field in the geoMap viz"

This reverts commit effc3b8.

* Update branch for 7.4.2

* Update README.md

* Update package.json

* Fix logo when reverse proxy is enabled (#1888)

* Fix hidden overflow in the fim configuration (#1887)

* Fix ambiguous message (#1875)

* Amazon s3 status fix (#1889)

* Fix amazon s3 status error

* Fix check aws s3 status

* Update wz-no-config.html

* Add pinned filters after refresh (#1909)

* Fix missing fields in the Visualizations (#1913)

* Fixed infinite load on Ciscat view (#1916)

* Fixed infinite load on Ciscat-agent view (#1920)

* Normalize the field whodata in the group reporting (#1921)

* Fix registration guide (#1926)

* Fix decoders file (#1929)

* Add new table for windows hotfixes (#1932)

* Remove visualizations legend (#1936)

* XML validator false error for \< (#1895)

* Add validator true to \<

* Add to gitignore wazuh-registry

* Minor Fix

* Revert changes for package.json and gitignore

* Refactor syscheck table (#1941) (#1956)

* Fix missing fields in the Visualizations (#1913)

* Fixed infinite load on Ciscat view (#1916)

* Fixed infinite load on Ciscat-agent view (#1920)

* Normalize the field whodata in the group reporting (#1921)

* Fix registration guide (#1926)

* Fix decoders file (#1929)

* Add new table for windows hotfixes (#1932)

* Remove visualizations legend (#1936)

* XML validator false error for \< (#1895)

* Add validator true to \<

* Add to gitignore wazuh-registry

* Minor Fix

* Revert changes for package.json and gitignore

* Refactor syscheck table

* Set fixed width to table columns

* Expand row to get extra details

* Add search bar & allow search

* Show extra details on row expand

* Remove table description

* Fix table margin

* Remove wazuh-registry

* Add go to edit file in rules and decoders, when it has been created correctly (#1943)

* Adapt for 7.5.0

* Bump version to 7.5.0

* Adapt server 7.5.0

* Fix typo

* Add fix to adapt 7.5.0

* Adapt server for Kibana 7.5.0

* Remove the table images from the reports

* Fix the tables in the reports

* Fix the hidden content in management>configuration (#1840)

* Fix discover input styling

* Fix most active agent

* Change the revision number

* Fix the undefined value of filters in the reports

* Restore package.json dependency

* Adapt 7.5.0 in 3.11 (#1960)

* Adapt Kibana for 7.5.0

* Several fixes

* Fix filters

* Bump wazuh version to 3.11.0

* Revert "Adapt 7.5.0 in 3.11 (#1960)"

This reverts commit 8f9c9aa.

* Adapt 7.5.0 for 3.11 (#1961)

* Adapt Kibana for 7.5.0

* Several fixes

* Fix filters

* Bump wazuh version to 3.11.0

* Prepare branch for release

* Last fixes in the branch 3.11-7.5 (#1966)

* Fixed broken link to the documentation

* Update README

* Change plugin-helpers reference in package.json

* Fix the empty search in syscheck-table

* Fix the dead visualizations on CIS-CAT

* Update CHANGELOG.md file

* Adapt for Kibana 7.5.1

* Adapt for Kibana 7.5.1

* Upadte package list

* Fix ciscat panel

* Adapt to 7.5.1

* Prevent reload when click in the sameTab

* Revert "Prevent reload when click in the sameTab"

This reverts commit 7e1deb1.

* Update version files (#1973)

* Update revision code

* Update readme

* Update Changelog

* Update version number of kibana

* Added xpack compatibility (#1971)

* Update files (#1975)

* Update readme file

* Update changelog file

* Bump Wazuh version to 3.11.1

* Add validator true to -- within a commentary (#1980)

* Increased list filesize limit and fixed typo (#1993)

As mentioned in #1947 the limit for uploading a list for the CDB-list capability is too low and the resulting error message contains a typo.

This commit addresses that by increasing the limit to 5MB and fixing the typo.

* Fix maps vis load

* Bump version 3.11.2

* Bump for 7.5.2

* Fix Wazuh version in upgrade guide (#2023)

The upgrade guide is using a previous version of Wazuh 3.11.1-7.5.2 when the latest version is 3.11.2-7.5.2.

* Add WindowsUpdate table to report (#2028)

* Bump for Wazuh 3.11.3

* Cancel listener on destroy kibana discover

* Fix custom spaces infinite loop

* Fix reporting in syscollector

* Adapt for 7.6.0

* Update routes kibana

* Modified upgrade guide

* Bump for 3.11.4

* Update kibana-discover.js

* Update package.json

* Update CHANGELOG.md

* Delete wazuh-registry.json

* update changelog master

* Adapt for 7.6.1

* Fix reporting syscheck negative values in atrributes

* Adapt discover

* Fix visualizations report on chrome

* Restructure optimize/wazuh folder (#2116)

* Restructure optimize/wazuh folder

* Update protocol of initial config example

* Replace path with a constant

* Remove wazuh.yml file

* Update README upgrade guide

* Fix plugin helper error

Co-authored-by: Pablo Torres <pablotr9@correo.ugr.es>

* hide manager alerts

* Add rule group win_auth_failure to metrics (#2099)

* Add PCI 11.2.1 y 11.2.3 rules. (#2062)

* Discover in monitoring

* Close 3.12-7.6

* Update changelog

* Update package.json

* Update package.json

* merge discover

* merge 7.6

* merge 7.6

* Update CHANGELOG.md

* Update package.json

* Fix merge

* Close 6.8.7

* Allow disabling known fields health check (#2037)

* Add https to initial wazuh configuration

* Add https to Wazuh config example

* update changelog

* Fix reports path error

* Add checks.fields to initial default config

* Update initial-wazuh-config.js

Co-authored-by: Adri Valle <adri9valle@gmail.com>
Co-authored-by: Jose Sanchez <josesanxez@gmail.com>
Co-authored-by: Pablo <pablotr9@correo.ugr.es>
Co-authored-by: Alberto Andújar <josealbertoandujar@gmail.com>
Co-authored-by: Daniel Ruiz Capilla <daniel.ruiz@wazuh.com>
Co-authored-by: Juan Carlos Tello <juancarlos.tello@wazuh.com>
Co-authored-by: Victor Santaella <victorst79@gmail.com>
juankaromo added a commit that referenced this pull request Mar 12, 2020
@Joanes04 @juankaromo
@pablotr9 @victorst79
Backports for Wazuh 3.12.0 [7.4.2] (#2133)
2ab5697 
* Adapt for 7.6.0

* Update routes kibana

* Modified upgrade guide

* Bump for 3.11.4

* Update kibana-discover.js

* Update package.json

* Update CHANGELOG.md

* Delete wazuh-registry.json

* update changelog master

* Adapt for 7.6.1

* Fix reporting syscheck negative values in atrributes

* Adapt discover

* Fix visualizations report on chrome

* Restructure optimize/wazuh folder (#2116)

* Restructure optimize/wazuh folder

* Update protocol of initial config example

* Replace path with a constant

* Remove wazuh.yml file

* Update README upgrade guide

* Fix plugin helper error

Co-authored-by: Pablo Torres <pablotr9@correo.ugr.es>

* hide manager alerts

* Add rule group win_auth_failure to metrics (#2099)

* Add PCI 11.2.1 y 11.2.3 rules. (#2062)

* Discover in monitoring

* Close 3.12-7.6

* Update changelog

* Update package.json

* Update package.json

* merge 7.6

* merge 7.6

* merge 7.6

* Allow disabling known fields health check (#2037)

* Add https to initial wazuh configuration

* Add https to Wazuh config example

* update changelog

* Fix reports path error

* Close 6.8.7

* Close 7.4.2

* Add checks.fields to initial default config

* Update update-configuration.js

* Fix kibana-discover

Co-authored-by: JuanCarlos <juanca.romo9@gmail.com>
Co-authored-by: Pablo Torres <pablotr9@correo.ugr.es>
Co-authored-by: Victor Santaella <victorst79@gmail.com>
juankaromo added a commit that referenced this pull request Mar 12, 2020
@juankaromo @pablotr9 @victorst79
Backports for Wazuh 3.12.0 [7.6.1] (#2130)
1bf1e2f 
* Fix reporting syscheck negative values in atrributes

* Adapt discover

* Fix visualizations report on chrome

* Restructure optimize/wazuh folder (#2116)

* Restructure optimize/wazuh folder

* Update protocol of initial config example

* Replace path with a constant

* Remove wazuh.yml file

* Update README upgrade guide

* Fix plugin helper error

Co-authored-by: Pablo Torres <pablotr9@correo.ugr.es>

* hide manager alerts

* Add rule group win_auth_failure to metrics (#2099)

* Add PCI 11.2.1 y 11.2.3 rules. (#2062)

* Discover in monitoring

* Close 3.12-7.6

* Update changelog

* Update package.json

* Update package.json

* Update CHANGELOG.md

* Allow disabling known fields health check (#2037)

* Add https to initial wazuh configuration

* Add https to Wazuh config example

* update changelog

* Fix reports path error

* Add checks.fields to initial default config

* Fix kibana-discover

Co-authored-by: Pablo Torres <pablotr9@correo.ugr.es>
Co-authored-by: Victor Santaella <victorst79@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Joanes04 Joanes04 Joanes04 approved these changes

@jsanchez91 jsanchez91 jsanchez91 approved these changes

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
@juankaromo @jsanchez91 @Joanes04 @pablotr9