Skip to content

Commit b7acbb6

Browse files
committed
Remove references to Elasticsearch
Elasticsearch is no longer supported these chages remove references to Elasticsearch and replaces them with opensearch where necessary
1 parent 6b53127 commit b7acbb6

File tree

12 files changed

+9
-46
lines changed

12 files changed

+9
-46
lines changed

doc/source/configuration/monitoring.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Monitoring Configuration
66
========================
77

88
StackHPC kayobe config includes a reference monitoring and alerting stack based
9-
on Prometheus, Alertmanager, Grafana, Fluentd, Elasticsearch & Kibana. These
10-
services by default come enabled and configured.
9+
on Prometheus, Alertmanager, Grafana, Fluentd, OpenSearch & OpenSearch
10+
Dashboards. These services by default come enabled and configured.
1111

1212
Monitoring hosts, usually the controllers, should be added to the monitoring
1313
group. The group definition can be applied in various different places. For
@@ -18,7 +18,7 @@ example, this configuration could be added to etc/kayobe/inventory/groups:
1818
[monitoring:children]
1919
controllers
2020
21-
Central Elasticsearch cluster collects OpenStack logs, with an option to receive
21+
Central OpenSearch cluster collects OpenStack logs, with an option to receive
2222
operating system logs too. In order to enable this, execute custom playbook
2323
after deployment:
2424

doc/source/configuration/wazuh.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Optional: define LVM volumes ``etc/kayobe/inventory/group_vars/wazuh-manager/lvm
7373
size: "100%VG"
7474
filesystem: "ext4"
7575
mount: true
76-
mntp: “/var/lib/elasticsearch
76+
mntp: “/var/lib/opensearch
7777
create: true
7878
7979

etc/kayobe/ansible/rsyslog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# Custom playbook to configure rsyslog to forward operating system logs to
3-
# fluentd, eventually reaching Kolla's Elasticsearch cluster.
3+
# fluentd, eventually reaching Kolla's Opensearch cluster.
44
#
55
# Variables:
66
# * rsyslog_group: Host pattern against which to target the playbook. Default

etc/kayobe/environments/aufn-ceph/kolla/globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ glance_backend_ceph: "yes"
1212
cinder_backend_ceph: "yes"
1313
nova_backend_ceph: "yes"
1414

15-
# Elasticsearch memory tuning
15+
# Opensearch memory tuning
1616
es_heap_size: 1g

etc/kayobe/environments/aufn-ceph/kolla/inventory/overcloud-services.j2

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ common
2424
[kolla-toolbox:children]
2525
common
2626

27-
# Elasticsearch Curator
28-
[elasticsearch-curator:children]
29-
elasticsearch
30-
3127
# Glance
3228
[glance-api:children]
3329
glance
@@ -479,6 +475,7 @@ monitoring
479475
[prometheus-openstack-exporter:children]
480476
monitoring
481477

478+
# NOTE(Alex-Welsh): This might need removing, since we have moved to opensearch
482479
[prometheus-elasticsearch-exporter:children]
483480
elasticsearch
484481

etc/kayobe/environments/ci-aio/kolla/globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ openstack_service_rpc_workers: "1"
1212
docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
1313
docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg"
1414

15-
# Elasticsearch memory tuning
15+
# Opensearch memory tuning
1616
es_heap_size: 1g
1717

1818
# Increase Grafana timeout

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_cento
3333
stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
3434
stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
3535
stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
36-
stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
3736
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
3837
stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
3938
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ kolla_enable_central_logging: true
1313
kolla_enable_cinder: true
1414
kolla_enable_cloudkitty: true
1515
kolla_enable_designate: true
16-
kolla_enable_elasticsearch_curator: true
1716
kolla_enable_etcd: true
1817
kolla_enable_grafana: true
1918
kolla_enable_influxdb: true
@@ -57,7 +56,6 @@ stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_cento
5756
stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
5857
stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
5958
stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
60-
stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
6159
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
6260
stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
6361
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"

etc/kayobe/environments/ci-multinode/kolla/globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ nova_backend_ceph: "yes"
1515
neutron_bridge_name: "{{ vxlan_interfaces[0].device }}-ovs"
1616
neutron_external_interface: "{{ vxlan_interfaces[0].device }}"
1717

18-
# Elasticsearch memory tuning
18+
# Opensearch memory tuning
1919
es_heap_size: 1g
2020

2121
# Octavia load balancer configuration

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_cento
3333
stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
3434
stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
3535
stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
36-
stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
3736
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
3837
stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
3938
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"

etc/kayobe/pulp-repo-versions.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230301T034123
1717
stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20230308T155704
1818
stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230420T073634
1919
stackhpc_pulp_repo_docker_version: 20230203T025251
20-
stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20230203T025251
2120
stackhpc_pulp_repo_epel_9_version: 20230302T031902
2221
stackhpc_pulp_repo_epel_modular_version: 20220913T043117
2322
stackhpc_pulp_repo_epel_version: 20230206T150339

etc/kayobe/pulp.yml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -428,18 +428,6 @@ stackhpc_pulp_repository_rpm_repos:
428428
state: present
429429
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
430430

431-
- name: ELK repository for 7.x packages
432-
url: "{{ stackhpc_release_pulp_content_url }}/elasticsearch/oss-7.x/{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
433-
remote_username: "{{ stackhpc_release_pulp_username }}"
434-
remote_password: "{{ stackhpc_release_pulp_password }}"
435-
client_cert: ""
436-
client_key: ""
437-
policy: on_demand
438-
proxy_url: "{{ pulp_proxy_url }}"
439-
sync_policy: mirror_complete
440-
state: present
441-
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
442-
443431
- name: Grafana
444432
url: "{{ stackhpc_release_pulp_content_url }}/grafana/oss/rpm/{{ stackhpc_pulp_repo_grafana_version }}"
445433
remote_username: "{{ stackhpc_release_pulp_username }}"
@@ -725,11 +713,6 @@ stackhpc_pulp_distribution_rpm_development:
725713
repository: CentOS Stream 8 - Ceph Pacific
726714
state: present
727715
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
728-
- name: "elasticsearch-logstash-kibana-7.x-development"
729-
base_path: "elasticsearch/oss-7.x/development"
730-
repository: ELK repository for 7.x packages
731-
state: present
732-
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
733716
- name: "grafana-development"
734717
base_path: "grafana/oss/rpm/development"
735718
repository: Grafana
@@ -924,11 +907,6 @@ stackhpc_pulp_distribution_rpm_production:
924907
repository: CentOS Stream 8 - Ceph Pacific
925908
state: present
926909
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
927-
- name: "elasticsearch-logstash-kibana-7.x-production"
928-
base_path: "elasticsearch/oss-7.x/production"
929-
repository: ELK repository for 7.x packages
930-
state: present
931-
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_8 | bool }}"
932910
- name: "grafana-production"
933911
base_path: "grafana/oss/rpm/production"
934912
repository: Grafana
@@ -1055,8 +1033,6 @@ stackhpc_pulp_images_kolla:
10551033
- designate-sink
10561034
- designate-worker
10571035
- dnsmasq
1058-
- elasticsearch
1059-
- elasticsearch-curator
10601036
- etcd
10611037
- fluentd
10621038
- glance-api
@@ -1121,7 +1097,6 @@ stackhpc_pulp_images_kolla:
11211097
- prometheus-alertmanager
11221098
- prometheus-blackbox-exporter
11231099
- prometheus-cadvisor
1124-
- prometheus-elasticsearch-exporter
11251100
- prometheus-haproxy-exporter
11261101
- prometheus-jiralert
11271102
- prometheus-libvirt-exporter
@@ -1141,12 +1116,8 @@ stackhpc_pulp_images_kolla:
11411116
# List of images for each base distribution which should not/cannot be built.
11421117
stackhpc_kolla_unbuildable_images:
11431118
ubuntu: []
1144-
centos: []
11451119
rocky:
1146-
- elasticsearch
1147-
- elasticsearch-curator
11481120
- iscsid
1149-
- kibana
11501121

11511122
# Whitespace-separated list of regular expressions matching Kolla image names.
11521123
# Usage is similar to kolla-build CLI arguments.

0 commit comments

Comments
 (0)