Skip to content

Commit a540fac

Browse files
authored
Merge pull request #1481 from wazuh/merge-4.14.1-into-main
Merge 4.14.1 into main
2 parents a6f95a3 + 1bfd3f7 commit a540fac

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Kitchen tests for Wazuh Puppet
22

33
on: [pull_request, workflow_dispatch, release]
4+
permissions:
5+
contents: read
46

57
jobs:
68

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,13 @@ All notable changes to this project will be documented in this file.
4646

4747
### Changed
4848

49+
- Remove dashboard chat setting ([#1462](https://github.com/wazuh/wazuh-puppet/pull/1462))
4950
- Rollback data source setting ([#1440](https://github.com/wazuh/wazuh-puppet/pull/1440))
5051
- Dashboard settings added ([#1439](https://github.com/wazuh/wazuh-puppet/pull/1439))
5152

5253
### Fixed
5354

54-
- None
55+
- Rollback Wazuh indexer and dashboard options ([#1468](https://github.com/wazuh/wazuh-puppet/pull/1468))
5556

5657
### Deleted
5758

manifests/indexer.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
$indexer_ip = 'localhost',
2828
$indexer_port = '9200',
2929
$indexer_discovery_hosts = [], # Empty array for single-node configuration
30-
$indexer_cluster_initial_master_nodes = ['node-1'],
30+
$indexer_initial_cluster_manager_nodes = ['node-1'],
3131
$indexer_cluster_cn = ['node-1'],
3232

3333
# JVM options

templates/opensearch_dashboards_yml.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ uiSettings.overrides.defaultRoute: /app/wz-home
1616
opensearch_security.cookie.ttl: 900000
1717
opensearch_security.session.ttl: 900000
1818
opensearch_security.session.keepalive: true
19-
assistant.chat.enabled: true

templates/wazuh_dashboard_yml.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ uiSettings.overrides.defaultRoute: /app/wz-home
1818
opensearch_security.cookie.ttl: 900000
1919
opensearch_security.session.ttl: 900000
2020
opensearch_security.session.keepalive: true
21-
assistant.chat.enabled: true

templates/wazuh_indexer_yml.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
network.host: "<%= @indexer_network_host %>"
22
node.name: "<%= @indexer_node_name %>"
3-
cluster.initial_cluster_master_nodes:
4-
<% @indexer_cluster_initial_master_nodes.each do |node| -%>
3+
cluster.initial_cluster_manager_nodes:
4+
<% @indexer_initial_cluster_manager_nodes.each do |node| -%>
55
- "<%= node %>"
66
<% end -%>
77
cluster.name: "<%= @indexer_cluster_name %>"

0 commit comments

Comments
 (0)