Skip to content

Commit c534918

Browse files
authored
Merge pull request wazuh#28087 from wazuh/change/28029-main-references
Refactored references to main branch
2 parents 8ce719e + f417a09 commit c534918

File tree

15 files changed

+24
-24
lines changed

15 files changed

+24
-24
lines changed

.github/ISSUE_TEMPLATE/api-integration-tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ assignees: ''
88

99
---
1010

11-
The following issue aims to run all [API integration tests](https://github.com/wazuh/wazuh/tree/master/api/test/integration) for the current release candidate, report the results, and open new issues for any encountered errors.
11+
The following issue aims to run all [API integration tests](https://github.com/wazuh/wazuh/tree/main/api/test/integration) for the current release candidate, report the results, and open new issues for any encountered errors.
1212

1313
## API integration tests information
1414
| | |

.github/workflows/engine_vdscanner_tools_delivery.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ on:
1313
- ".github/workflows/engine_vdscanner_tools_delivery.yml"
1414
- "src/engine/source/feedmanager/schemas/"
1515

16-
# Trigger when a pull request is merged into master
16+
# Trigger when a pull request is merged into main
1717
push:
1818
branches:
19-
- master
19+
- main
2020
paths:
2121
- "src/engine/source/vdscanner/tools/**"
2222
- "src/engine/source/vdscanner/src/**"

.github/workflows/packages-retag-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
push:
2525
branches:
2626
- '[0-9]+.[0-9]+.[0-9]+'
27-
- 'master'
27+
- 'main'
2828
paths:
2929
- 'src/VERSION'
3030

.github/workflows/packages-upload-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- '[0-9]+.[0-9]+.[0-9]+'
8-
- 'master'
8+
- 'main'
99
paths:
1010
- 'packages/**'
1111

.github/workflows/vulnerability-scanner-generate-database.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
fi
6666
echo "Git branch: $(git branch | grep "*")"
6767
68-
# We restore the actions from master
68+
# We restore the actions from main
6969
# to re-use them independently from the checkout branch
7070
cp -r /tmp/{actions,workflows} .github/
7171

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,31 +77,31 @@ The Wazuh WUI provides a powerful user interface for data visualization and anal
7777

7878
**Modules overview**
7979

80-
![Modules overview](https://github.com/wazuh/wazuh-dashboard-plugins/raw/master/screenshots/app.png)
80+
![Modules overview](https://github.com/wazuh/wazuh-dashboard-plugins/raw/main/screenshots/app.png)
8181

8282
**Security events**
8383

84-
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/master/screenshots/app2.png)
84+
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/main/screenshots/app2.png)
8585

8686
**Integrity monitoring**
8787

88-
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/master/screenshots/app3.png)
88+
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/main/screenshots/app3.png)
8989

9090
**Vulnerability detection**
9191

92-
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/master/screenshots/app4.png)
92+
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/main/screenshots/app4.png)
9393

9494
**Regulatory compliance**
9595

96-
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/master/screenshots/app5.png)
96+
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/main/screenshots/app5.png)
9797

9898
**Agents overview**
9999

100-
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/master/screenshots/app6.png)
100+
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/main/screenshots/app6.png)
101101

102102
**Agent summary**
103103

104-
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/master/screenshots/app7.png)
104+
![Overview](https://github.com/wazuh/wazuh-dashboard-plugins/blob/main/screenshots/app7.png)
105105

106106
## Orchestration
107107

@@ -125,7 +125,7 @@ Here you can find all the automation tools maintained by the Wazuh team.
125125

126126
## Branches
127127

128-
* `master` branch contains the latest code, be aware of possible bugs on this branch.
128+
* `main` branch contains the latest code, be aware of possible bugs on this branch.
129129
* `stable` branch on correspond to the last Wazuh stable version.
130130

131131
## Software and libraries used

apis/tools/env/wazuh-server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ COPY scripts/reinstall-cmake.sh /tmp/reinstall-cmake.sh
4242
RUN chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${CMAKE_VERSION}
4343

4444
# Build and install wazuh-server
45-
ENV WAZUH_BRANCH=master
45+
ENV WAZUH_BRANCH=main
4646
ENV WAZUH_ROOT=/root/wazuh
4747
ENV ENGINE_PRESET=release
4848
ENV ENGINE_ON_BACKGROUND=1

architecture/centralized_configuration/001-sequence.puml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ end
3030

3131
loop
3232
wclusterd -> mclusterd: sync
33-
rnote over wclusterd, mclusterd: [[https://github.com/wazuh/wazuh/blob/master/framework/wazuh/core/cluster/cluster.json sync file list]]
33+
rnote over wclusterd, mclusterd: [[https://github.com/wazuh/wazuh/blob/main/framework/wazuh/core/cluster/cluster.json sync file list]]
3434
mclusterd --> wclusterd: delta
3535
end
3636

packages/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ wazuh# cd packages
2727
**Options:**
2828
| Option | Description | Default |
2929
|------------|----------------------------------------------------------|-----------------------|
30-
| -b, --branch | Git branch to use (optional) | master |
30+
| -b, --branch | Git branch to use (optional) | main |
3131
| -t, --target | Target package to build (required): manager or agent | - |
3232
| -a, --architecture | Target architecture (optional): amd64, i386, etc. | - |
3333
| -j, --jobs | Number of parallel jobs (optional) | 2 |

src/engine/test/integration_tests/geo/features/geo.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Feature: Manage Geolocation Databases
4747
And the response should include "testdb-city.mmdb"
4848

4949
Scenario: Remotely upsert a geolocation database
50-
When I send a request to remotely upsert a database with path to "testdb-city.mmdb", type "city", db url "https://github.com/wazuh/wazuh/raw/master/src/engine/test/integration_tests/geo/data/base.mmdb" and hash url "https://github.com/wazuh/wazuh/raw/master/src/engine/test/integration_tests/geo/data/base.md5"
50+
When I send a request to remotely upsert a database with path to "testdb-city.mmdb", type "city", db url "https://github.com/wazuh/wazuh/raw/main/src/engine/test/integration_tests/geo/data/base.mmdb" and hash url "https://github.com/wazuh/wazuh/raw/main/src/engine/test/integration_tests/geo/data/base.md5"
5151
Then the response should be a "success"
5252
And the database list "should" include "testdb-city.mmdb"
5353

@@ -59,7 +59,7 @@ Feature: Manage Geolocation Databases
5959
Then the database list "should" include "testdb-city.mmdb"
6060

6161
Scenario: Remotely added db persists after restart
62-
When I send a request to remotely upsert a database with path to "testdb-city.mmdb", type "city", db url "https://github.com/wazuh/wazuh/raw/master/src/engine/test/integration_tests/geo/data/base.mmdb" and hash url "https://github.com/wazuh/wazuh/raw/master/src/engine/test/integration_tests/geo/data/base.md5"
62+
When I send a request to remotely upsert a database with path to "testdb-city.mmdb", type "city", db url "https://github.com/wazuh/wazuh/raw/main/src/engine/test/integration_tests/geo/data/base.mmdb" and hash url "https://github.com/wazuh/wazuh/raw/main/src/engine/test/integration_tests/geo/data/base.md5"
6363
Then the response should be a "success"
6464
When I restart the engine
6565
Then the database list "should" include "testdb-city.mmdb"

0 commit comments

Comments
 (0)