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.

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

Update the repository with the latest changes of wazuh dashboard #141

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions dev-tools/build-packages/base/generate_base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,41 @@ build() {
fi
done


# Move installed plugins from categories after generating the package
category_explore='{id:"explore",label:"Explore",order:100,euiIconType:"search"}'
category_dashboard_management='{id:"management",label:"Index management",order:5e3,euiIconType:"managementApp"}'

# Replace app category to Reporting app
sed -i -e "s|category:{id:\"opensearch\",label:_i18n.i18n.translate(\"opensearch.reports.categoryName\",{defaultMessage:\"OpenSearch Plugins\"}),order:2e3}|category:${category_explore}|" ./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js

# Replace app category to Alerting app
sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js

# Replace app category to Maps app
sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js

# Replace app category to Notifications app
sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js

# Replace app category to Index Management app
sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_dashboard_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js

# Generate compressed files
files_to_recreate=(
./plugins/reportsDashboards/target/public/reportsDashboards.plugin.js
./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js
./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js
./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js
./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js
)

for value in "${files_to_recreate[@]}"
do
gzip -c "$value" > "$value.gz"
brotli -c "$value" > "$value.br"
done

# Enable the default configuration (renaming)
cp $config_path/opensearch_dashboards.prod.yml config/opensearch_dashboards.yml
cp $config_path/node.options.prod config/node.options
Expand Down
72 changes: 36 additions & 36 deletions src/core/common/logos/__snapshots__/get_logos.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions src/core/common/logos/get_logos.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ import { ColorScheme, ImageType } from './constants';
import { Branding } from '../../types';

// The logos are stored at `src/core/server/core_app/assets/logos` to have a pretty URL
export const OPENSEARCH_DASHBOARDS_THEMED = 'ui/logos/opensearch_dashboards.svg';
export const OPENSEARCH_DASHBOARDS_ON_LIGHT = 'ui/logos/opensearch_dashboards_on_light.svg';
export const OPENSEARCH_DASHBOARDS_ON_DARK = 'ui/logos/opensearch_dashboards_on_dark.svg';
export const OPENSEARCH_THEMED = 'ui/logos/opensearch.svg';
export const OPENSEARCH_ON_LIGHT = 'ui/logos/opensearch_on_light.svg';
export const OPENSEARCH_ON_DARK = 'ui/logos/opensearch_on_dark.svg';
export const MARK_THEMED = 'ui/logos/opensearch_mark.svg';
export const MARK_ON_LIGHT = 'ui/logos/opensearch_mark_on_light.svg';
export const MARK_ON_DARK = 'ui/logos/opensearch_mark_on_dark.svg';
export const CENTER_MARK_THEMED = 'ui/logos/opensearch_center_mark.svg';
export const CENTER_MARK_ON_LIGHT = 'ui/logos/opensearch_center_mark_on_light.svg';
export const CENTER_MARK_ON_DARK = 'ui/logos/opensearch_center_mark_on_dark.svg';
export const OPENSEARCH_DASHBOARDS_THEMED = 'ui/logos/wazuh_dashboards.svg';
export const OPENSEARCH_DASHBOARDS_ON_LIGHT = 'ui/logos/wazuh_dashboards_on_light.svg';
export const OPENSEARCH_DASHBOARDS_ON_DARK = 'ui/logos/wazuh_dashboards_on_dark.svg';
export const OPENSEARCH_THEMED = 'ui/logos/wazuh.svg';
export const OPENSEARCH_ON_LIGHT = 'ui/logos/wazuh_on_light.svg';
export const OPENSEARCH_ON_DARK = 'ui/logos/wazuh_on_dark.svg';
export const MARK_THEMED = 'ui/logos/wazuh_mark.svg';
export const MARK_ON_LIGHT = 'ui/logos/wazuh_mark_on_light.svg';
export const MARK_ON_DARK = 'ui/logos/wazuh_mark_on_dark.svg';
export const CENTER_MARK_THEMED = 'ui/logos/wazuh_center_mark.svg';
export const CENTER_MARK_ON_LIGHT = 'ui/logos/wazuh_center_mark_on_light.svg';
export const CENTER_MARK_ON_DARK = 'ui/logos/wazuh_center_mark_on_dark.svg';
export const ANIMATED_MARK_THEMED = 'ui/logos/spinner.svg';
export const ANIMATED_MARK_ON_LIGHT = 'ui/logos/spinner_on_light.gif';
export const ANIMATED_MARK_ON_DARK = 'ui/logos/spinner_on_dark.gif';
Expand Down
2 changes: 1 addition & 1 deletion src/core/public/chrome/chrome_service.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export class ChromeService {
forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))}
homeHref={http.basePath.prepend('/app/home')}
homeHref={http.basePath.prepend('/app/wz-home')}
isVisible$={this.isVisible$}
opensearchDashboardsVersion={injectedMetadata.getWazuhVersion()}
navLinks$={navLinks.getNavLinks$()}
Expand Down
Loading
Loading