Skip to content

Commit

Permalink
[Backport 4.3-7.16] Moved the file config-equivalences to common (#4400)
Browse files Browse the repository at this point in the history
Moved the file config-equivalences to common (#4399)

* common/config-equivalences

* add changelog

(cherry picked from commit a40a2ae)

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and yenienserrano committed Aug 16, 2022
1 parent 6f7e37b commit 8413fba
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ All notable changes to the Wazuh app project will be documented in this file.

### Fixed

- Wazuh.yml review: fixed link to web documentation, improved in-file documentation and fixed some grammatical errors. [#4378](https://github.com/wazuh/wazuh-kibana-app/pull/4378)
- Wazuh.yml review: fixed link to web documentation, improved in-file documentation and fixed some grammatical errors. [#4378](https://github.com/wazuh/wazuh-kibana-app/pull/4378) [#4399](https://github.com/wazuh/wazuh-kibana-app/pull/4399)
- Fixed an error during the generation of a group's report, if the request to the Wazuh API fails [#4350](https://github.com/wazuh/wazuh-kibana-app/pull/4350)
- Fixed a problem with the group's report, when the group has no agents [#4350](https://github.com/wazuh/wazuh-kibana-app/pull/4350)
- Fixed path in logo customization section [#4352](https://github.com/wazuh/wazuh-kibana-app/pull/4352)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ASSETS_PUBLIC_URL, PLUGIN_PLATFORM_NAME } from "../../common/constants";
import { ASSETS_PUBLIC_URL, PLUGIN_PLATFORM_NAME } from "./constants";

export const configEquivalences = {
pattern: "Default index pattern to use on the app. If there's no valid index pattern, the app will automatically create one with the name indicated in this option.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/

import React, { useState, useEffect, Fragment } from 'react';
import {categoriesNames} from '../../../../utils/config-equivalences';
import {categoriesNames} from '../../../../../common/config-equivalences';
import { AppNavigate } from '../../../../react-services/app-navigate';
import {
EuiFlexGroup,
Expand Down
2 changes: 1 addition & 1 deletion public/components/settings/configuration/configuration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
nameEquivalence,
categoriesEquivalence,
formEquivalence
} from '../../../utils/config-equivalences';
} from '../../../../common/config-equivalences';
import store from '../../../redux/store'
import { updateSelectedSettingsSection } from '../../../redux/actions/appStateActions';
import { withUserAuthorizationPrompt, withErrorBoundary, withReduxProvider } from '../../common/hocs'
Expand Down
2 changes: 1 addition & 1 deletion server/lib/initial-wazuh-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
WAZUH_STATISTICS_DEFAULT_STATUS,
} from '../../common/constants';
import { webDocumentationLink } from '../../common/services/web_documentation';
import { configEquivalences } from '../../public/utils/config-equivalences';
import { configEquivalences } from '../../common/config-equivalences';

/**
* Given a string, this function builds a multine string, each line about 70
Expand Down

0 comments on commit 8413fba

Please sign in to comment.