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

Rename indexer configuration nodes #1981

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Rename indexer configuration nodes #1981

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
54155d2
Bump indexer RPM to 2.4.0
okynos Dec 5, 2022
2bad7ea
Bump Debian 4.4.0 indexer to 2.4.0
okynos Dec 5, 2022
4a698e6
Changed Opensearch version for dashboard
c-bordon Dec 5, 2022
7380970
Fixed dh_strip error
c-bordon Dec 5, 2022
9147f2a
Removed bash for alpine package
c-bordon Dec 12, 2022
fb6ad49
Removed new plugins
c-bordon Dec 12, 2022
77a76e1
Removed commented files
c-bordon Dec 13, 2022
01a69bb
Removed remove of notification plugin
c-bordon Dec 13, 2022
b40f22c
Rename configuration nodes
DFolchA Dec 9, 2022
fd3d209
Add --force-yes to apt indexer dockerfile
DFolchA Dec 13, 2022
4ff03f2
Add " to templates to avoid parsing errors related to #1959
DFolchA Dec 13, 2022
12147be
Added support for Opensearch 2.4.0
c-bordon Dec 19, 2022
f23a9c4
Added support to Openseach dashboards 2.4.1
c-bordon Dec 20, 2022
dcf94e4
Merge pull request #1980 from wazuh/4508-generate-wazuh-indexer-and-d…
okynos Dec 22, 2022
6f98b1a
Merge pull request #1979 from wazuh/wj4508-indexer-package
okynos Dec 22, 2022
157ab66
Change wazuh-clusterd to clusterd.py
DFolchA Dec 23, 2022
784c473
Add break to test
DFolchA Dec 23, 2022
5f6015e
Extend error ignore to 4.4 version
DFolchA Dec 23, 2022
ee55f21
Merge pull request #2007 from wazuh/fix-unattended-test
alberpilot Dec 23, 2022
6fb69d0
Remove variable of system arquitecture
fcaffieri Dec 28, 2022
ad76483
Removed header and testing replace of opensearch logo from home icon
c-bordon Dec 29, 2022
9412bf9
Replaced OpenSearch Logo from Home icon
c-bordon Dec 30, 2022
76e8485
Added a final space
c-bordon Dec 30, 2022
97c5751
Merge pull request #2018 from wazuh/2011-disable-expanded-header-by-d…
alberpilot Jan 4, 2023
b7d9115
Merge pull request #2010 from wazuh/4486-remove-parameter-depothelper…
alberpilot Jan 4, 2023
8adc9fe
Merge branch '4.4' of https://github.com/wazuh/wazuh-packages into 19…
DFolchA Jan 9, 2023
504383b
Change config.yml
DFolchA Jan 9, 2023
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
26 changes: 13 additions & 13 deletions documentation-templates/wazuh/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
nodes:
# Wazuh indexer nodes
indexer:
- name: node-1
ip: <indexer-node-ip>
#- name: node-2
# ip: <indexer-node-ip>
#- name: node-3
# ip: <indexer-node-ip>
- name: indexer-1
ip: "<indexer-node-ip>"
#- name: indexer-2
# ip: "<indexer-node-ip>"
#- name: indexer-3
# ip: "<indexer-node-ip>"

# Wazuh server nodes
# If there is more than one Wazuh server
# node, each one must have a node_type
server:
- name: wazuh-1
ip: <wazuh-manager-ip>
- name: server-1
ip: "<wazuh-manager-ip>"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
ip: "<wazuh-manager-ip>"
ip: "<wazuh-server-ip>"

Copy link
Contributor

Choose a reason for hiding this comment

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

This change should also be applied to server-2 and server-3.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done 504383b

# node_type: master
#- name: wazuh-2
# ip: <wazuh-manager-ip>
#- name: server-2
# ip: "<wazuh-manager-ip>"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason why the variables are not numbered? i.e <wazuh-server-2-ip>

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done 504383b

# node_type: worker
#- name: wazuh-3
# ip: <wazuh-manager-ip>
#- name: server-3
# ip: "<wazuh-manager-ip>"
# node_type: worker

# Wazuh dashboard nodes
dashboard:
- name: dashboard
ip: <dashboard-node-ip>
ip: "<dashboard-node-ip>"
20 changes: 10 additions & 10 deletions stack/indexer/base/files/etc/wazuh-indexer/opensearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
network.host: "0.0.0.0"
node.name: "node-1"
node.name: "indexer-1"
cluster.initial_master_nodes:
- "node-1"
#- "node-2"
#- "node-3"
- "indexer-1"
#- "indexer-2"
#- "indexer-3"
cluster.name: "wazuh-cluster"
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe wazuh-indexer-cluster would be a less confusing name

#discovery.seed_hosts:
# - "node-1-ip"
# - "node-2-ip"
# - "node-3-ip"
# - "indexer-1-ip"
# - "indexer-2-ip"
# - "indexer-3-ip"
node.max_local_storage_nodes: "3"
path.data: /var/lib/wazuh-indexer
path.logs: /var/log/wazuh-indexer
Expand All @@ -28,9 +28,9 @@ plugins.security.authcz.admin_dn:
plugins.security.check_snapshot_restore_write_privileges: true
plugins.security.enable_snapshot_restore_privilege: true
plugins.security.nodes_dn:
- "CN=node-1,OU=Wazuh,O=Wazuh,L=California,C=US"
#- "CN=node-2,OU=Wazuh,O=Wazuh,L=California,C=US"
#- "CN=node-3,OU=Wazuh,O=Wazuh,L=California,C=US"
- "CN=indexer-1,OU=Wazuh,O=Wazuh,L=California,C=US"
#- "CN=indexer-2,OU=Wazuh,O=Wazuh,L=California,C=US"
#- "CN=indexer-3,OU=Wazuh,O=Wazuh,L=California,C=US"
plugins.security.restapi.roles_enabled:
- "all_access"
- "security_rest_api_access"
Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/deb/docker/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND noninteractive

# Installing necessary packages
RUN apt-get update && apt-get install -y apt-utils && \
apt-get install -y \
apt-get install -y --force-yes \
curl sudo wget expect gnupg build-essential \
devscripts equivs selinux-basics procps gawk

Expand Down
18 changes: 9 additions & 9 deletions unattended_installer/config/certificate/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ nodes:
# Wazuh indexer nodes
indexer:
- name: indexer-1
ip: <indexer-node-ip>
ip: "<indexer-node-ip>"
- name: indexer-2
ip: <indexer-node-ip>
ip: "<indexer-node-ip>"
- name: indexer-3
ip: <indexer-node-ip>
ip: "<indexer-node-ip>"
server:
- name: server-1
ip: <server-node-ip>
ip: "<server-node-ip>"
node_type: master
- name: server-2
ip: <server-node-ip>
ip: "<server-node-ip>"
node_type: worker
- name: server-3
ip: <server-node-ip>
ip: "<server-node-ip>"
node_type: worker
dashboard:
- name: dashboard-1
ip: <dashboard-node-ip>
ip: "<dashboard-node-ip>"
- name: dashboard-2
ip: <dashboard-node-ip>
ip: "<dashboard-node-ip>"
- name: dashboard-3
ip: <dashboard-node-ip>
ip: "<dashboard-node-ip>"
6 changes: 3 additions & 3 deletions unattended_installer/config/indexer/indexer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
network.host: 0.0.0.0
node.name: node-1
cluster.initial_master_nodes: node-1
node.name: indexer-1
cluster.initial_master_nodes: indexer-1

plugins.security.ssl.transport.pemcert_filepath: /etc/wazuh-indexer/certs/indexer.pem
plugins.security.ssl.transport.pemkey_filepath: /etc/wazuh-indexer/certs/indexer-key.pem
Expand All @@ -19,7 +19,7 @@ plugins.security.ssl.http.enabled_ciphers:
plugins.security.ssl.http.enabled_protocols:
- "TLSv1.2"
plugins.security.nodes_dn:
- CN=node-1,OU=Wazuh,O=Wazuh,L=California,C=US
- CN=indexer-1,OU=Wazuh,O=Wazuh,L=California,C=US
plugins.security.authcz.admin_dn:
- CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US

Expand Down
4 changes: 2 additions & 2 deletions unattended_installer/config/indexer/indexer_all_in_one.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
network.host: "127.0.0.1"
node.name: "node-1"
node.name: "indexer-1"
cluster.initial_master_nodes:
Copy link
Contributor

Choose a reason for hiding this comment

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

Same

- "node-1"
- "indexer-1"
cluster.name: "wazuh-cluster"

node.max_local_storage_nodes: "3"
Expand Down