Skip to content

Commit

Permalink
[Backport 4.3-7.16] Fixed path in logo customization section (#4360)
Browse files Browse the repository at this point in the history
Fixed path in logo customization section (#4352)

* change of path

* CHANGELOG

* new constant

* update test

* updated constant name

* updated constant name

* Update CHANGELOG.md

* changelog: add PR entry

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
(cherry picked from commit 05598cf)

Co-authored-by: Chantal Belén kelm <99441266+chantal-kelm@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and chantal-kelm committed Jul 26, 2022
1 parent c4c4f18 commit 7564f72
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to the Wazuh app project will be documented in this file.

## Wazuh v4.3.7 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 4308

### Fixed

- Fixed path in logo customization section [#4352](https://github.com/wazuh/wazuh-kibana-app/pull/4352)

## Wazuh v4.3.6 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 4307

### Fixed
Expand Down
1 change: 1 addition & 0 deletions common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ export const UI_TOAST_COLOR = {

// Assets
export const ASSETS_BASE_URL_PREFIX = '/plugins/wazuh/assets/';
export const ASSETS_PUBLIC_URL = '/plugins/wazuh/public/assets/';

// Reports
export const REPORTS_LOGO_IMAGE_ASSETS_RELATIVE_PATH = 'images/logo_reports.png';
Expand Down
10 changes: 5 additions & 5 deletions public/utils/config-equivalences.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { ASSETS_BASE_URL_PREFIX, PLUGIN_PLATFORM_NAME } from "../../common/constants";
import { ASSETS_PUBLIC_URL, PLUGIN_PLATFORM_NAME } from "../../common/constants";

export const configEquivalences = {
pattern: 'Default index pattern to use on the app.',
'customization.logo.app':`Define the name of the app logo saved in the path ${ASSETS_BASE_URL_PREFIX}`,
'customization.logo.sidebar':`Define the name of the sidebar logo saved in the path ${ASSETS_BASE_URL_PREFIX}`,
'customization.logo.healthcheck':`Define the name of the health-check logo saved in the path ${ASSETS_BASE_URL_PREFIX}`,
'customization.logo.reports':`Define the name of the reports logo (.png) saved in the path ${ASSETS_BASE_URL_PREFIX}`,
'customization.logo.app':`Define the name of the app logo saved in the path ${ASSETS_PUBLIC_URL}`,
'customization.logo.sidebar':`Define the name of the sidebar logo saved in the path ${ASSETS_PUBLIC_URL}`,
'customization.logo.healthcheck':`Define the name of the health-check logo saved in the path ${ASSETS_PUBLIC_URL}`,
'customization.logo.reports':`Define the name of the reports logo (.png) saved in the path ${ASSETS_PUBLIC_URL}`,
'checks.pattern':
'Enable or disable the index pattern health check when opening the app.',
'checks.template':
Expand Down
10 changes: 5 additions & 5 deletions server/lib/initial-wazuh-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Find more information about this on the LICENSE file.
*/

import { ASSETS_BASE_URL_PREFIX, WAZUH_MONITORING_DEFAULT_INDICES_REPLICAS, WAZUH_MONITORING_DEFAULT_INDICES_SHARDS, WAZUH_STATISTICS_DEFAULT_INDICES_REPLICAS, WAZUH_STATISTICS_DEFAULT_INDICES_SHARDS } from "../../common/constants";
import { ASSETS_PUBLIC_URL, WAZUH_MONITORING_DEFAULT_INDICES_REPLICAS, WAZUH_MONITORING_DEFAULT_INDICES_SHARDS, WAZUH_STATISTICS_DEFAULT_INDICES_REPLICAS, WAZUH_STATISTICS_DEFAULT_INDICES_SHARDS } from "../../common/constants";
import { webDocumentationLink } from "../../common/services/web_documentation";

export const initialWazuhConfig: string = `---
Expand Down Expand Up @@ -170,16 +170,16 @@ export const initialWazuhConfig: string = `---
#
# ------------------------------ wazuh-logo-customization -------------------------------
#
#Define the name of the app logo saved in the path ${ASSETS_BASE_URL_PREFIX}
#Define the name of the app logo saved in the path ${ASSETS_PUBLIC_URL}
#customization.logo.app: ''
#
#Define the name of the sidebar logo saved in the path ${ASSETS_BASE_URL_PREFIX}
#Define the name of the sidebar logo saved in the path ${ASSETS_PUBLIC_URL}
#customization.logo.sidebar: ''
#
#Define the name of the health-check logo saved in the path ${ASSETS_BASE_URL_PREFIX}
#Define the name of the health-check logo saved in the path ${ASSETS_PUBLIC_URL}
#customization.logo.healthcheck: ''
#
#Define the name of the reports logo (.png) saved in the path ${ASSETS_BASE_URL_PREFIX}
#Define the name of the reports logo (.png) saved in the path ${ASSETS_PUBLIC_URL}
#customization.logo.reports: ''
#
# ---------------------------- Hide manager alerts ------------------------------
Expand Down

0 comments on commit 7564f72

Please sign in to comment.