Skip to content

Commit

Permalink
Merge 4.6.0 into 4.7.0 (#6038)
Browse files Browse the repository at this point in the history
Merge 4.6.0 into 4.7.0
> IMPORTANT: Merge PR strategy: Create a merge commit
  • Loading branch information
Desvelao authored Oct 23, 2023
2 parents a316a98 + 23f9089 commit cbec6aa
Show file tree
Hide file tree
Showing 16 changed files with 1,248 additions and 1,242 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/new_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Example:

### Supported versions

Same as on [previous releases](https://github.com/wazuh/wazuh-kibana-app/wiki/Compatibility)
Same as on [previous releases](https://github.com/wazuh/wazuh-dashboard-plugins/wiki/Compatibility)
2,432 changes: 1,219 additions & 1,213 deletions CHANGELOG.md

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ All types of contributions are encouraged and valued. See the [Table of Contents

> If you want to ask a question, we assume that you have read the available [Documentation](https://documentation.wazuh.com).
Before you ask a question, it is best to search for existing [Issues](https://github.com/wazuh/wazuh-kibana-app/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
Before you ask a question, it is best to search for existing [Issues](https://github.com/wazuh/wazuh-dashboard-plugins/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.

If you then still feel the need to ask a question and need clarification, we recommend the following:

- Open an [Issue](https://github.com/wazuh/wazuh-kibana-app/issues/new).
- Open an [Issue](https://github.com/wazuh/wazuh-dashboard-plugins/issues/new).
- Provide as much context as you can about what you're running into.
- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.

Expand Down Expand Up @@ -67,7 +67,7 @@ A good bug report shouldn't leave others needing to chase you up for more inform

- Make sure that you are using the latest version.
- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](https://documentation.wazuh.com). If you are looking for support, you might want to check [this section](#i-have-a-question)).
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/wazuh/wazuh-kibana-appissues?q=label%3Abug).
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/wazuh/wazuh-dashboard-plugins/issues?q=label%3Abug).
- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
- Collect information about the bug:
- Stack trace (Traceback)
Expand All @@ -84,7 +84,7 @@ A good bug report shouldn't leave others needing to chase you up for more inform
We use GitHub issues to track bugs and errors. If you run into an issue with the project:

- Open an [Issue](https://github.com/wazuh/wazuh-kibana-app/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
- Open an [Issue](https://github.com/wazuh/wazuh-dashboard-plugins/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
- Explain the behavior you would expect and the actual behavior.
- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
- Provide the information you collected in the previous section.
Expand All @@ -107,13 +107,13 @@ This section guides you through submitting an enhancement suggestion for Wazuh U

- Make sure that you are using the latest version.
- Read the [documentation](https://documentation.wazuh.com) carefully and find out if the functionality is already covered, maybe by an individual configuration.
- Perform a [search](https://github.com/wazuh/wazuh-kibana-app/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
- Perform a [search](https://github.com/wazuh/wazuh-dashboard-plugins/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.

<!-- omit in toc -->
#### How Do I Submit a Good Enhancement Suggestion?

Enhancement suggestions are tracked as [GitHub issues](https://github.com/wazuh/wazuh-kibana-app/issues).
Enhancement suggestions are tracked as [GitHub issues](https://github.com/wazuh/wazuh-dashboard-plugins/issues).

- Use a **clear and descriptive title** for the issue to identify the suggestion.
- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,5 @@ version 2 of the License, or (at your option) any later version.
[docs]: https://documentation.wazuh.com
[install]: https://documentation.wazuh.com/current/installation-guide/index.html
[slack]: https://join.slack.com/t/wazuh/shared_invite/zt-1lgu531ur-7M_k_ZQbpdo4QCn_pHee3w
[branches]: https://github.com/wazuh/wazuh-kibana-app/wiki/About-our-branches-and-tags
[wiki]: https://github.com/wazuh/wazuh-kibana-app/wiki
[branches]: https://github.com/wazuh/wazuh-dashboard-plugins/wiki/About-our-branches-and-tags
[wiki]: https://github.com/wazuh/wazuh-dashboard-plugins/wiki
4 changes: 2 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Before starting the environment, check that the plugin is in the desired branch
Example:

This brings up a Dev environment for OpenSearch `1.2.4` and opensearch-dashboards
`1.2.0`, with the `wazuh-kibana-app` development branch set up at
`1.2.0`, with the `wazuh-dashboard-plugins` development branch set up at
`$WZ_HOME`:

```bash
Expand Down Expand Up @@ -289,4 +289,4 @@ error getting credentials - err: exit status 1, out: `error getting credentials
[2]: <https://grafana.com/oss/loki/> "Loki"
[3]: <https://prometheus.io/docs/visualization/grafana/> "Prometheus"
[4]: <https://quay.io/organization/wazuh> "quay.io/wazuh"
[5]: <https://github.com/wazuh/wazuh-kibana-app/issues/3872#issuecomment-1305507626> "App permissions"
[5]: <https://github.com/wazuh/wazuh-dashboard-plugins/issues/3872#issuecomment-1305507626> "App permissions"
4 changes: 2 additions & 2 deletions docker/kbn-dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ environment. For example:

The script will ask for all the required parameters to bring up the
environment, including the version of the Elastic Stack you want to
develop for, and the source code folder where the _wazuh-kibana-app_ is
develop for, and the source code folder where the _wazuh-dashboard-plugins_ is
located.

**The script will not select the appropriate version of the
_wazuh-kibana-app_ to use, so be sure to check out the appropriate version
_wazuh-dashboard-plugins_ to use, so be sure to check out the appropriate version
before bringing up the environment!**

## Notes
Expand Down
4 changes: 2 additions & 2 deletions docker/osd-dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ environment. For example:

The script will ask you all the required parameters to bring up the
environment, including the version of the elastic stack you want to
develop for, and the source code folder where the wazuh-kibana-app is
develop for, and the source code folder where the wazuh-dashboard-plugins is
located.

Use the `saml` flag to bring up KeyCloak IDP. **Add idp to your hosts and start
Expand All @@ -24,7 +24,7 @@ the server using the `--no-base-path`**.
```

**The script will not select the appropriate version of the
wazuh-kibana-app to use, so be sure to check out the appropriate version
wazuh-dashboard-plugins to use, so be sure to check out the appropriate version
before bringing up the environment!**

### UI Credentials
Expand Down
4 changes: 2 additions & 2 deletions plugins/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"license": "GPL-2.0",
"repository": {
"type": "git",
"url": "https://github.com/wazuh/wazuh-kibana-app.git"
"url": "https://github.com/wazuh/wazuh-dashboard-plugins.git"
},
"bugs": {
"url": "https://github.com/wazuh/wazuh-kibana-app/issues"
"url": "https://github.com/wazuh/wazuh-dashboard-plugins/issues"
},
"homepage": "https://www.wazuh.com/",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const checkIndexPatternObjectService = async (appConfig, checkLogger: Ch
checkLogger.info(`Valid index patterns found: ${listValidIndexPatterns.length || 0}`);
if(!AppState.getCurrentPattern()){
// Check the index pattern saved objects can be found using `GET /api/saved_objects/_find` endpoint.
// Related issue: https://github.com/wazuh/wazuh-kibana-app/issues/4293
// Related issue: https://github.com/wazuh/wazuh-dashboard-plugins/issues/4293
await validateIntegritySavedObjects([defaultPatternId], checkLogger);

AppState.setCurrentPattern(defaultPatternId);
Expand All @@ -76,7 +76,7 @@ export const checkIndexPatternObjectService = async (appConfig, checkLogger: Ch
const indexPatternID = listValidIndexPatterns[0].id;

// Check the index pattern saved objects can be found using `GET /api/saved_objects/_find` endpoint.
// Related issue: https://github.com/wazuh/wazuh-kibana-app/issues/4293
// Related issue: https://github.com/wazuh/wazuh-dashboard-plugins/issues/4293
await validateIntegritySavedObjects([indexPatternID], checkLogger);

AppState.setCurrentPattern(indexPatternID);
Expand All @@ -102,7 +102,7 @@ export const checkIndexPatternObjectService = async (appConfig, checkLogger: Ch
checkLogger.info(`Index pattern id exists [${defaultPatternId}]: ${indexPatternDefaultFound ? 'yes': 'no'}`);
if(indexPatternDefaultFound){
// Check the index pattern saved objects can be found using `GET /api/saved_objects/_find` endpoint.
// Related issue: https://github.com/wazuh/wazuh-kibana-app/issues/4293
// Related issue: https://github.com/wazuh/wazuh-dashboard-plugins/issues/4293
await validateIntegritySavedObjects([indexPatternDefaultFound.id], checkLogger);

AppState.setCurrentPattern(indexPatternDefaultFound.id);
Expand All @@ -117,7 +117,7 @@ export const checkIndexPatternObjectService = async (appConfig, checkLogger: Ch
};

// Check the index pattern saved objects can be found using `GET /api/saved_objects/_find` endpoint.
// Related issue: https://github.com/wazuh/wazuh-kibana-app/issues/4293
// Related issue: https://github.com/wazuh/wazuh-dashboard-plugins/issues/4293
const validateIntegritySavedObjects = async (indexPatternSavedObjectIDs: string[], checkLogger: CheckLogger): Promise<void> => {
checkLogger.info(`Checking the integrity of saved objects. Validating ${indexPatternSavedObjectIDs.join(',')} can be found...`);
await SavedObject.validateIndexPatternSavedObjectCanBeFound(indexPatternSavedObjectIDs);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const checkPatternSupportService = (pattern: string, indexType : string)

const indexPatternSavedObjectIDs = [pattern];
// Check the index pattern saved objects can be found using `GET /api/saved_objects/_find` endpoint.
// Related issue: https://github.com/wazuh/wazuh-kibana-app/issues/4293
// Related issue: https://github.com/wazuh/wazuh-dashboard-plugins/issues/4293
checkLogger.info(`Checking the integrity of saved objects. Validating ${indexPatternSavedObjectIDs.join(',')} can be found...`);
await SavedObject.validateIndexPatternSavedObjectCanBeFound(indexPatternSavedObjectIDs);
checkLogger.info('Integrity of saved objects: [ok]');
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/public/components/visualize/wz-visualize.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const WzVisualize = compose(
* from a type to another, but aren't when the pinned agent changes.
*
* More info:
* https://github.com/wazuh/wazuh-kibana-app/issues/4230#issuecomment-1152161434
* https://github.com/wazuh/wazuh-dashboard-plugins/issues/4230#issuecomment-1152161434
*
* @param {Object} prevProps
*/
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/public/kibana-integrations/kibana-vis.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class KibanaVis extends Component {
// is changed, which affects the entire application.
//
// Related issue:
// https://github.com/wazuh/wazuh-kibana-app/issues/4158
// https://github.com/wazuh/wazuh-dashboard-plugins/issues/4158
if (this.deadField) {
return this.renderComplete();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# Scope

This solution try to simplify the error management in the wazuh-kibana-app plugin.
This solution try to simplify the error management in the main plugin.
The main goal is to create a standard way to manage the errors in the plugin.
By this way, the developer must be abstracted to the error management.

Expand Down Expand Up @@ -97,7 +97,7 @@ The error orchestrator have the responsability to receive and error and showing

The current error handler tells the error orchestrator how the error will be shown to the user/developer. It sends the error and the showing options to the error orchestrator.

For more details about the error orchestrator see the [Error Orchestrator documentation](https://github.com/wazuh/wazuh-kibana-app/blob/ef071e55fd310bdb4cecb7d490ea83372bb07b01/public/react-services/error-orchestrator/README.md)
For more details about the error orchestrator see the [Error Orchestrator documentation](https://github.com/wazuh/wazuh-dashboard-plugins/blob/ef071e55fd310bdb4cecb7d490ea83372bb07b01/public/react-services/error-orchestrator/README.md)

## React patterns

Expand Down
2 changes: 1 addition & 1 deletion plugins/main/public/react-services/saved-objects.js
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export class SavedObject {

/**
* Check if it exists the index pattern saved objects using the `GET /api/saved_objects/_find` endpoint.
* It is usefull to validate if the endpoint works as expected. Related issue: https://github.com/wazuh/wazuh-kibana-app/issues/4293
* It is usefull to validate if the endpoint works as expected. Related issue: https://github.com/wazuh/wazuh-dashboard-plugins/issues/4293
* @param {string[]} indexPatternIDs
*/
static async validateIndexPatternSavedObjectCanBeFound(indexPatternIDs){
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/public/templates/settings/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ <h2 class="euiTitle euiTitle--medium">Community</h2>
<react-component
class="wz-margin-left-40"
name="EuiButtonIcon"
props="{iconType:'logoGithub', iconSize:'xxl', href: 'https://github.com/wazuh/wazuh-kibana-app', target: '_blank', 'aria-label': 'Wazuh dashboard Github'}"
props="{iconType:'logoGithub', iconSize:'xxl', href: 'https://github.com/wazuh/wazuh-dashboard-plugins', target: '_blank', 'aria-label': 'Wazuh dashboard Github'}"
></react-component>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/server/lib/initial-wazuh-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ${printSection('Wazuh app configuration file', { prefix: '# ', fill: '=' })}
# ${webDocumentationLink('user-manual/wazuh-dashboard/config-file.html')}
#
# Also, you can check our repository:
# https://github.com/wazuh/wazuh-kibana-app`;
# https://github.com/wazuh/wazuh-dashboard-plugins`;

const pluginSettingsConfigurationFile = getSettingsDefaultList().filter(({ isConfigurableFromFile }) => isConfigurableFromFile);

Expand Down

0 comments on commit cbec6aa

Please sign in to comment.