Introduce Wazuh changes

.github/actions/install-dashboards/action.yml

@@ -31,8 +31,8 @@ runs:
     - uses: actions/checkout@v2
       with:
         path: OpenSearch-Dashboards
-        repository: opensearch-project/OpenSearch-Dashboards
-        ref: 'main'
+        repository: wazuh/wazuh-dashboard
+        ref: ${{ vars.WZD_REF }}
         fetch-depth: 0
 
     - run: mkdir -p plugins
@@ -52,12 +52,12 @@ runs:
       working-directory: ${{ steps.determine-plugin-directory.outputs.plugin-directory }}
       shell: bash
 
-    - id: branch-switch-if-possible
-      continue-on-error: true # Defaults onto main if the branch switch doesn't work
-      if: ${{ steps.osd-version.outputs.osd-version }}
-      run: git checkout ${{ steps.osd-version.outputs.osd-version }} || git checkout ${{ steps.osd-version.outputs.osd-x-version }}x
-      working-directory: ./OpenSearch-Dashboards
-      shell: bash
+    #- id: branch-switch-if-possible
+    #  continue-on-error: true # Defaults onto main if the branch switch doesn't work
+    #  if: ${{ steps.osd-version.outputs.osd-version }}
+    #  run: git checkout ${{ steps.osd-version.outputs.osd-version }} || git checkout ${{ steps.osd-version.outputs.osd-x-version }}x
+    #  working-directory: ./OpenSearch-Dashboards
+    #  shell: bash
 
     - id: tool-versions
       run: |

.github/workflows/cypress-test.yml

@@ -20,10 +20,10 @@ jobs:
           wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.1/latest/linux/x64/tar/builds/opensearch/dist/opensearch-min-2.4.1-linux-x64.tar.gz
           tar -xzf opensearch-*.tar.gz
           rm -f opensearch-*.tar.gz
-          
+
       - name: Download OpenSearch Security Plugin
         run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.1/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.4.1.0.zip
-        
+
 
       - name: Run OpenSearch with plugin
         run: |
@@ -48,23 +48,23 @@ jobs:
           EOF
           docker run -d -p 9200:9200 -p 9600:9600 -i opensearch-test:latest
 
-      - name: Checkout OpenSearch Dashboard
+      - name: Checkout Wazuh Dashboard
         uses: actions/checkout@v2
         with:
           path: OpenSearch-Dashboards
-          repository: opensearch-project/OpenSearch-Dashboards
-          ref: '2.4'
+          repository: wazuh/wazuh-dashboard
+          ref: ${{ vars.WZD_REF }}
           fetch-depth: 0
-      
+
       - name: Create plugins dir
         run: |
           cd ./OpenSearch-Dashboards
           mkdir -p plugins
-      
+
       - name: Checkout OpenSearch Dashboard Security plugin
         uses: actions/checkout@v2
         with:
-          path: OpenSearch-Dashboards/plugins/security-dashboards-plugin
+          path: OpenSearch-Dashboards/plugins/wazuh-security-dashboards-plugin
           ref: ${{ github.ref }}
 
       - name: Check OpenSearch Running
@@ -76,19 +76,19 @@ jobs:
         run: |
           echo "::set-output name=node_version::$(cat ./OpenSearch-Dashboards/.node-version)"
           echo "::set-output name=yarn_version::$(jq -r '.engines.yarn' ./OpenSearch-Dashboards/package.json)"
-      
+
       - name: Setup node
         uses: actions/setup-node@v1
         with:
           node-version: ${{ steps.versions.outputs.node_version }}
           registry-url: 'https://registry.npmjs.org'
-      
+
       - name: Install correct yarn version for OpenSearch Dashboards
         run: |
           npm uninstall -g yarn
           echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}"
           npm i -g yarn@${{ steps.versions.outputs.yarn_version }}
-      
+
       - name: Check OpenSearch Running
         continue-on-error: true
         run: curl -XGET https://localhost:9200 -u 'admin:admin' -k
@@ -123,7 +123,7 @@ jobs:
         id: cypress_version
         run: |
           echo "::set-output name=cypress_version::$(cat ./${{ env.FTR_PATH }}/package.json | jq '.devDependencies.cypress' | tr -d '"')"
-      
+
       - name: Run tests
         uses: cypress-io/github-action@v2
         with:

.github/workflows/integration-test.yml

@@ -16,10 +16,10 @@ jobs:
           wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.1/latest/linux/x64/tar/builds/opensearch/dist/opensearch-min-2.4.1-linux-x64.tar.gz
           tar -xzf opensearch-*.tar.gz
           rm -f opensearch-*.tar.gz
-          
+
       - name: Download OpenSearch Security Plugin
         run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.1/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.4.1.0.zip
-        
+
 
       - name: Run OpenSearch with plugin
         run: |
@@ -49,7 +49,7 @@ jobs:
       - id: install-dashboards
         uses: ./.github/actions/install-dashboards
         with:
-           plugin_name: security-dashboards-plugin
+           plugin_name: wazuh-security-dashboards-plugin
 
       - name: Start Dashboards in background
         run: node scripts/build_opensearch_dashboards_platform_plugins.js

.github/workflows/unit-test.yml

@@ -21,7 +21,7 @@ jobs:
       - id: install-dashboards
         uses: ./.github/actions/install-dashboards
         with:
-           plugin_name: security-dashboards-plugin
+           plugin_name: wazuh-security-dashboards-plugin
 
       - name: Run lint
         run: yarn lint

public/apps/account/account-app.tsx

@@ -96,7 +96,7 @@ export async function setupTopNavButton(coreStart: CoreStart, config: ClientConf
       }
     }
 
-    setShouldShowTenantPopup(shouldShowTenantPopup);
+    setShouldShowTenantPopup(false);
 
     coreStart.chrome.navControls.registerRight({
       // Pin to rightmost, since newsfeed plugin is using 1000, here needs a number > 1000

public/apps/account/test/account-app.test.tsx

@@ -105,14 +105,14 @@ describe('Account app', () => {
     });
   });
 
-  it('Should show tenant selection popup when neither securitytenant in url nor saved tenant', (done) => {
+  it('Should not show tenant selection popup', (done) => {
     (getSavedTenant as jest.Mock).mockReturnValueOnce(null);
 
     setupTopNavButton(mockCoreStart, mockConfig as any);
 
     process.nextTick(() => {
       expect(getSavedTenant).toBeCalledTimes(1);
-      expect(setShouldShowTenantPopup).toBeCalledWith(true);
+      expect(setShouldShowTenantPopup).toBeCalledWith(false);
       done();
     });
   });

public/apps/login/login-page.tsx

@@ -28,7 +28,7 @@ import {
 } from '@elastic/eui';
 import { CoreStart } from '../../../../../src/core/public';
 import { ClientConfigType } from '../../types';
-import defaultBrandImage from '../../assets/opensearch_logo_h.svg';
+import defaultBrandImage from '../../assets/ui/wazuh_logo.svg';
 import { validateCurrentPassword } from '../../utils/login-utils';
 import {
   ANONYMOUS_AUTH_LOGIN,
@@ -250,12 +250,11 @@ export function LoginPage(props: LoginPageDeps) {
       )}
       <EuiSpacer size="s" />
       <EuiText size="m" textAlign="center">
-        {props.config.ui.basicauth.login.title || 'Log in to OpenSearch Dashboards'}
+        {props.config.ui.basicauth.login.title || ''}
       </EuiText>
       <EuiSpacer size="s" />
       <EuiText size="s" textAlign="center">
-        {props.config.ui.basicauth.login.subtitle ||
-          'If you have forgotten your username or password, contact your system administrator.'}
+        {props.config.ui.basicauth.login.subtitle || ''}
       </EuiText>
       <EuiSpacer size="s" />
       <EuiForm component="form">

public/apps/login/test/__snapshots__/login-page.test.tsx.snap

@@ -374,18 +374,14 @@ exports[`Login page renders renders with default value: string 1`] = `
   <EuiText
     size="m"
     textAlign="center"
-  >
-    Log in to OpenSearch Dashboards
-  </EuiText>
+  />
   <EuiSpacer
     size="s"
   />
   <EuiText
     size="s"
     textAlign="center"
-  >
-    If you have forgotten your username or password, contact your system administrator.
-  </EuiText>
+  />
   <EuiSpacer
     size="s"
   />
@@ -477,18 +473,14 @@ exports[`Login page renders renders with default value: string array 1`] = `
   <EuiText
     size="m"
     textAlign="center"
-  >
-    Log in to OpenSearch Dashboards
-  </EuiText>
+  />
   <EuiSpacer
     size="s"
   />
   <EuiText
     size="s"
     textAlign="center"
-  >
-    If you have forgotten your username or password, contact your system administrator.
-  </EuiText>
+  />
   <EuiSpacer
     size="s"
   />