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.

Sign up for GitHub

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

Remove legacy plugins #7187

Merged
merged 9 commits into from
Dec 27, 2024
Merged

Remove legacy plugins #7187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af5e76c
Rename opensearch_dashboards.json to opensearch_dashboard1.json
guidomodarelli Dec 2, 2024
1e92069
Remove unnecessary plugin configuration for 'Main'.
guidomodarelli Dec 2, 2024
1041b21
Update OpenSearch Dashboards configurationwith consistent single quot…
guidomodarelli Dec 2, 2024
e873879
Add handling for no changed .js, .jsx, .ts or .tsx files
guidomodarelli Dec 2, 2024
7714990
Fix syntax error in the if condition
guidomodarelli Dec 2, 2024
10b9113
Merge branch 'master' into change/401-remove-legacy-plugins
yenienserrano Dec 16, 2024
623304e
Merge branch 'master' into change/401-remove-legacy-plugins
yenienserrano Dec 23, 2024
dfc99da
Refactor GitHub Actions workflow
yenienserrano Dec 23, 2024
e0de2e6
Remove POC Wazuh plugins from GitHub Actions workflows
yenienserrano Dec 24, 2024
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
15 changes: 0 additions & 15 deletions .github/workflows/dev-environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ jobs:
matrix:
plugins:
[
{
name: 'Main',
path: 'wazuh/plugins/main',
container_path: 'wazuh',
},
{
name: 'Wazuh Check Updates',
path: 'wazuh/plugins/wazuh-check-updates',
Expand All @@ -64,16 +59,6 @@ jobs:
path: 'wazuh/plugins/wazuh-core',
container_path: 'wazuh-core',
},
{
name: 'Wazuh Engine',
path: 'wazuh/plugins/wazuh-engine',
container_path: 'wazuh-engine',
},
{
name: 'Wazuh Fleet',
path: 'wazuh/plugins/wazuh-fleet',
container_path: 'wazuh-fleet',
},
]

steps:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/eslint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ jobs:
echo "Listing branches"
git branch -a
echo "Getting diff files ignoring deleted and getting the changed or renamed files"
CHANGED_FILES=$(git diff --name-status --diff-filter d ${REMOTE_NAME}/${GITHUB_BASE_REF}..${REMOTE_NAME}/${GITHUB_HEAD_REF} | awk '{print $NF}' | grep -E '.*\.[jt]sx?$')
CHANGED_FILES=$(git diff --name-status --diff-filter d ${REMOTE_NAME}/${GITHUB_BASE_REF}..${REMOTE_NAME}/${GITHUB_HEAD_REF} | awk '{print $NF}' | grep -E '.*\.[jt]sx?$' || echo "false")
if [ $CHANGED_FILES = "false" ]; then
echo "No changed files found with the extension .js, .jsx, .ts or .tsx"
exit 0
fi
echo "Changed files:"
echo "${CHANGED_FILES}"
git checkout $GITHUB_HEAD_REF
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/manual-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ jobs:
echo "revision=$(jq -r '.revision' $(pwd)/wazuh/plugins/main/package.json)" >> $GITHUB_ENV
echo "versionPlatform=$(jq -r '.pluginPlatform.version' $(pwd)/wazuh/plugins/main/package.json)" >> $GITHUB_ENV

- name: Step 03 - Download the main plugin's artifact
uses: actions/download-artifact@v4
with:
name: wazuh-dashboard-plugins_wazuh_${{ env.version }}-${{ env.revision }}_${{ env.githubReference }}.zip
path: ${{ env.currentDir }}/wazuh/scripts/test-packages/plugins/wazuh-dashboard-plugins_wazuh_${{ env.version }}-${{ env.revision }}_${{ env.githubReference }}.zip
overwrite: true

- name: Step 04 - Download the core plugin's artifact
uses: actions/download-artifact@v4
with:
Expand All @@ -74,20 +67,6 @@ jobs:
path: ${{ env.currentDir }}/wazuh/scripts/test-packages/plugins/wazuh-dashboard-plugins_wazuh-check-updates_${{ env.version }}-${{ env.revision }}_${{ env.githubReference }}.zip
overwrite: true

- name: Step 06 - Download the engine plugin's artifact
uses: actions/download-artifact@v4
with:
name: wazuh-dashboard-plugins_wazuh-engine_${{ env.version }}-${{ env.revision }}_${{ env.githubReference }}.zip
path: ${{ env.currentDir }}/wazuh/scripts/test-packages/plugins/wazuh-dashboard-plugins_wazuh-engine_${{ env.version }}-${{ env.revision }}_${{ env.githubReference }}.zip
overwrite: true

- name: Step 07 - Download the fleet plugin's artifact
uses: actions/download-artifact@v4
with:
name: wazuh-dashboard-plugins_wazuh-fleet_${{ env.version }}-${{ env.revision }}_${{ env.githubReference }}.zip
path: ${{ env.currentDir }}/wazuh/scripts/test-packages/plugins/wazuh-dashboard-plugins_wazuh-fleet${{ env.version }}-${{ env.revision }}_${{ env.githubReference }}.zip
overwrite: true

- name: Step 06 - Build the Docker image
run: |
echo "current=${{ env.currentDir }}"
Expand Down
17 changes: 8 additions & 9 deletions docker/osd-dev/config/2.x/osd/opensearch_dashboards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,16 @@ opensearch.ssl.verificationMode: certificate
# opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
#
# osd 2.0
opensearch.requestHeadersAllowlist: ["securitytenant", "Authorization"]
opensearch.requestHeadersAllowlist: ['securitytenant', 'Authorization']
#
opensearch_security.multitenancy.enabled: false
opensearch_security.readonly_mode.roles: ["kibana_read_only"]
opensearch_security.readonly_mode.roles: ['kibana_read_only']
server.ssl.enabled: true
server.ssl.key: "/home/node/kbn/certs/osd.key"
server.ssl.certificate: "/home/node/kbn/certs/osd.pem"
opensearch.ssl.certificateAuthorities: ["/home/node/kbn/certs/ca.pem"]
uiSettings.overrides.defaultRoute: /app/wz-home
opensearch.username: "kibanaserver"
opensearch.password: "kibanaserver"
server.ssl.key: '/home/node/kbn/certs/osd.key'
server.ssl.certificate: '/home/node/kbn/certs/osd.pem'
opensearch.ssl.certificateAuthorities: ['/home/node/kbn/certs/ca.pem']
uiSettings.overrides.defaultRoute: /app/home
opensearch.username: 'kibanaserver'
opensearch.password: 'kibanaserver'
opensearchDashboards.branding:
useExpandedHeader: false

18 changes: 9 additions & 9 deletions docker/osd-dev/config/2.x/osd/opensearch_dashboards_saml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ opensearch.ssl.verificationMode: certificate
# opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
#
# osd 2.0
opensearch.requestHeadersAllowlist: ["securitytenant", "Authorization"]
opensearch.requestHeadersAllowlist: ['securitytenant', 'Authorization']
#
opensearch_security.multitenancy.enabled: false
opensearch_security.readonly_mode.roles: ["kibana_read_only"]
opensearch_security.readonly_mode.roles: ['kibana_read_only']
server.ssl.enabled: true
server.ssl.key: "/home/node/kbn/certs/osd.key"
server.ssl.certificate: "/home/node/kbn/certs/osd.pem"
opensearch.ssl.certificateAuthorities: ["/home/node/kbn/certs/ca.pem"]
uiSettings.overrides.defaultRoute: /app/wazuh
opensearch.username: "kibanaserver"
opensearch.password: "kibanaserver"
server.ssl.key: '/home/node/kbn/certs/osd.key'
server.ssl.certificate: '/home/node/kbn/certs/osd.pem'
opensearch.ssl.certificateAuthorities: ['/home/node/kbn/certs/ca.pem']
uiSettings.overrides.defaultRoute: /app/home
opensearch.username: 'kibanaserver'
opensearch.password: 'kibanaserver'

opensearch_security.auth.type: "saml"
opensearch_security.auth.type: 'saml'
server.xsrf.allowlist:
[
/_plugins/_security/saml/acs,
Expand Down
0 plugins/main/opensearch_dashboards.json → plugins/main/opensearch_dashboard1.json
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the name changed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name is changed so that opensearch does not detect it as a plugin and does not load it. In order not to delete the code in case we still need to use some of it.

File renamed without changes.
Loading