Sync 4.9.0 to 4.10.0 (#269)

Co-authored-by: Luciano Gorza <[email protected]> Co-authored-by: Chantal Belén kelm <[email protected]>
wazuh · Oct 28, 2024 · ede1313 · ede1313
1 parent 3371776
commit ede1313
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 1,392 deletions.
diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml
@@ -32,7 +32,7 @@ env:
   TEST_REPO: ${{ inputs.test_repo != '' && inputs.test_repo || 'opensearch-project/opensearch-dashboards-functional-test' }}
   TEST_BRANCH: "${{ inputs.test_branch != '' && inputs.test_branch || github.base_ref }}"
   FTR_PATH: 'ftr'
-  START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true  --csp.warnLegacyBrowsers=false --uiSettings.overrides["query:enhancements:enabled"]=false'
+  START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true  --csp.warnLegacyBrowsers=false --uiSettings.overrides["query:enhancements:enabled"]=false --opensearchDashboards.branding.useExpandedHeader=true'
   OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot -E cluster.routing.allocation.disk.threshold_enabled=false'
   CYPRESS_BROWSER: 'chromium'
   CYPRESS_VISBUILDER_ENABLED: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/config/opensearch_dashboards.prod.yml b/config/opensearch_dashboards.prod.yml
@@ -10,6 +10,3 @@ server.ssl.key: "/etc/wazuh-dashboard/certs/dashboard-key.pem"
 server.ssl.certificate: "/etc/wazuh-dashboard/certs/dashboard.pem"
 opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
 uiSettings.overrides.defaultRoute: /app/wz-home
-
-opensearchDashboards.branding:
-  useExpandedHeader: false
diff --git a/dev-tools/build-packages/deb/debian/postinst b/dev-tools/build-packages/deb/debian/postinst
@@ -25,6 +25,7 @@ configure)
     chmod 750 "${TARGET_DIR}""${INSTALLATION_DIR}"
     chown -R "${NAME}":"${NAME}" "${TARGET_DIR}""${INSTALLATION_DIR}"
     setcap 'cap_net_bind_service=+ep' "${INSTALLATION_DIR}"/node/bin/node
+    setcap 'cap_net_bind_service=+ep' "${INSTALLATION_DIR}"/node/fallback/bin/node
     if [ -f "${INSTALLATION_DIR}"/"${NAME}".restart ]; then
         rm -f "${INSTALLATION_DIR}"/"${NAME}".restart
         if command -v systemctl >/dev/null 2>&1 && systemctl >/dev/null 2>&1; then

diff --git a/dev-tools/build-packages/rpm/wazuh-dashboard.spec b/dev-tools/build-packages/rpm/wazuh-dashboard.spec
@@ -125,6 +125,7 @@ fi
 
 %post
 setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/bin/node
+setcap 'cap_net_bind_service=+ep' %{INSTALL_DIR}/node/fallback/bin/node
 
 if [ ! -f %{INSTALLATION_DIR}/config/opensearch_dashboards.keystore ]; then
   runuser %{USER} --shell="/bin/bash" --command="%{INSTALL_DIR}/bin/opensearch-dashboards-keystore create" > /dev/null 2>&1

diff --git a/docker/config/opensearch_dashboards.dev.security.yml b/docker/config/opensearch_dashboards.dev.security.yml
@@ -1,8 +1,5 @@
 server.host: "0.0.0.0"
 
-opensearchDashboards.branding:
-  useExpandedHeader: false
-
 opensearch.hosts: ["https://indexer:9200"]
 opensearch.ssl.verificationMode: none
 opensearch.username: "kibanaserver"

diff --git a/docker/config/opensearch_dashboards.dev.yml b/docker/config/opensearch_dashboards.dev.yml
@@ -1,4 +1 @@
 server.host: "0.0.0.0"
-
-opensearchDashboards.branding:
-  useExpandedHeader: false
diff --git a/packages/osd-plugin-helpers/src/integration_tests/build.test.ts b/packages/osd-plugin-helpers/src/integration_tests/build.test.ts
@@ -101,9 +101,15 @@ it('builds a generated plugin into a viable archive', async () => {
      info running @osd/optimizer
      │ info initialized, 0 bundles cached
      │ info starting worker [1 bundle]
+     │ warn worker stderr Browserslist: caniuse-lite is outdated. Please run:
+     │ warn worker stderr   npx update-browserslist-db@latest
+     │ warn worker stderr   Why you should do it regularly: https://github.com/browserslist/update-db#readme
      │ succ 1 bundles compiled successfully after <time>
      info copying assets from \`public/assets\` to build
      info copying server source into the build and converting with babel
+    Browserslist: caniuse-lite is outdated. Please run:
+      npx update-browserslist-db@latest
+      Why you should do it regularly: https://github.com/browserslist/update-db#readme
      info running yarn to install dependencies
      info compressing plugin into [fooTestPlugin-1.0.0.zip]
      info cleaning up compression temporary artifacts"
@@ -189,9 +195,15 @@ it('builds a non-semver generated plugin into a viable archive', async () => {
      info running @osd/optimizer
      │ info initialized, 0 bundles cached
      │ info starting worker [1 bundle]
+     │ warn worker stderr Browserslist: caniuse-lite is outdated. Please run:
+     │ warn worker stderr   npx update-browserslist-db@latest
+     │ warn worker stderr   Why you should do it regularly: https://github.com/browserslist/update-db#readme
      │ succ 1 bundles compiled successfully after <time>
      info copying assets from \`public/assets\` to build
      info copying server source into the build and converting with babel
+    Browserslist: caniuse-lite is outdated. Please run:
+      npx update-browserslist-db@latest
+      Why you should do it regularly: https://github.com/browserslist/update-db#readme
      info running yarn to install dependencies
      info compressing plugin into [fooTestPlugin-1.0.0.x.zip]
      info cleaning up compression temporary artifacts"

diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
diff --git a/src/core/public/chrome/ui/header/__snapshots__/home_icon.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/home_icon.test.tsx.snap
diff --git a/src/core/public/chrome/ui/header/home_icon.test.tsx b/src/core/public/chrome/ui/header/home_icon.test.tsx
@@ -18,7 +18,12 @@ describe('Home icon,', () => {
     });
 
     it('uses the home icon by default', () => {
-      const props = mockProps();
+      const props = {
+        ...mockProps(),
+        branding: {
+          useExpandedHeader: true,
+        },
+      };
       const component = shallow(<HomeIcon {...props} />);
       const icon = component.find('EuiIcon');
       expect(icon.prop('data-test-subj')).toEqual('homeIcon');
@@ -53,9 +58,9 @@ describe('Home icon,', () => {
       };
       const component = shallow(<HomeIcon {...props} />);
       const icon = component.find('EuiIcon');
-      expect(icon.prop('data-test-subj')).toEqual('homeIcon');
+      expect(icon.prop('data-test-subj')).toEqual('defaultMark');
       expect(icon.prop('type')).toEqual(props.logos.Mark.url);
-      expect(icon.prop('size')).toEqual('m');
+      expect(icon.prop('size')).toEqual('l');
       expect(icon.prop('title')).toEqual('Wazuh dashboards home');
 
       expect(component).toMatchSnapshot();

diff --git a/src/core/public/chrome/ui/header/home_icon.tsx b/src/core/public/chrome/ui/header/home_icon.tsx
@@ -18,7 +18,7 @@ interface Props {
  */
 export const HomeIcon = ({ branding, logos }: Props) => {
   // Removed prop unnecessary useExpandedHeader Wazuh dashboards
-  const { applicationTitle = 'Wazuh dashboards' } = branding;
+  const { applicationTitle = 'Wazuh dashboards', useExpandedHeader } = branding;
 
   const { url: markURL, type: markType } = logos.Mark;
 
@@ -27,7 +27,7 @@ export const HomeIcon = ({ branding, logos }: Props) => {
   let markIconSize: IconSize = 'l';
 
   // If no custom branded mark was set, use `home` icon Wazuh dashboards
-  if (markType !== 'custom') {
+  if (markType !== 'custom' && useExpandedHeader) {
     testSubj = 'homeIcon';
     // Home icon should be medium to fit in with other icons
     markIconSize = 'm';

diff --git a/src/core/server/opensearch_dashboards_config.ts b/src/core/server/opensearch_dashboards_config.ts
@@ -83,7 +83,7 @@ export const config = {
         defaultValue: 'Wazuh',
       }),
       useExpandedHeader: schema.boolean({
-        defaultValue: true,
+        defaultValue: false,
       }),
     }),
     survey: schema.object({

diff --git a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
diff --git a/src/core/utils/default_app_categories.ts b/src/core/utils/default_app_categories.ts
@@ -78,13 +78,13 @@ export const DEFAULT_APP_CATEGORIES: Record<string, AppCategory> = Object.freeze
     label: i18n.translate('core.ui.dashboardManagementNavList.label', {
       defaultMessage: 'Dashboard management',
     }),
-    order: 700,
+    order: 6000,
     euiIconType: 'dashboardApp',
   },
   management: {
     id: 'management',
     label: i18n.translate('core.ui.managementNavList.label', {
-      defaultMessage: 'Index management',
+      defaultMessage: 'Indexer management',
     }),
     order: 5000,
     euiIconType: 'managementApp',

diff --git a/src/legacy/server/config/schema.js b/src/legacy/server/config/schema.js
@@ -247,7 +247,7 @@ export default () =>
         }),
         faviconUrl: Joi.any().default('/'),
         applicationTitle: Joi.any().default(''),
-        useExpandedHeader: Joi.boolean().default(true),
+        useExpandedHeader: Joi.boolean().default(false),
       }),
       survey: Joi.object({
         url: Joi.any().default('/'),

diff --git a/src/plugins/console/public/application/components/import_flyout.test.tsx b/src/plugins/console/public/application/components/import_flyout.test.tsx
@@ -111,8 +111,8 @@ describe('ImportFlyout Component', () => {
     component.update();
 
     await act(async () => {
-      await nextTick();
       component.find(confirmBtnIdentifier).first().simulate('click');
+      await nextTick();
     });
 
     component.update();

diff --git a/src/plugins/home/public/application/components/home_app.test.tsx b/src/plugins/home/public/application/components/home_app.test.tsx
@@ -26,7 +26,9 @@ jest.mock('./tutorial_directory', () => ({
   ),
 }));
 
-describe('<HomeApp />', () => {
+// Wazuh: skip this because we remove the sampledata and the tutorial because sample data is needed
+
+describe.skip('<HomeApp />', () => {
   let currentService: ReturnType<typeof getMockedServices>;
   beforeEach(() => {
     currentService = getMockedServices();
@@ -45,7 +47,7 @@ describe('<HomeApp />', () => {
   });
 });
 
-describe('<ImportSampleDataApp />', () => {
+describe.skip('<ImportSampleDataApp />', () => {
   let currentService: ReturnType<typeof getMockedServices>;
   beforeEach(() => {
     currentService = getMockedServices();

diff --git a/test/common/config.js b/test/common/config.js
@@ -80,6 +80,7 @@ export default function () {
         `--opensearchDashboards.branding.mark.darkModeUrl=https://opensearch.org/assets/brand/SVG/Mark/opensearch_mark_darkmode.svg`,
         `--opensearchDashboards.branding.applicationTitle=OpenSearch`,
         `--uiSettings.overrides['query:enhancements:enabled']=false`,
+        `--opensearchDashboards.branding.useExpandedHeader=true`,
       ],
     },
     services,