Skip to content

Commit 39696e0

Browse files
Re
amq_streams to redhat_streams in Zookeeper and related roles git push origin fix-docs-amq-streams --force
1 parent f3dcbcd commit 39696e0

File tree

10 files changed

+236
-235
lines changed

10 files changed

+236
-235
lines changed

amq_results.txt

389 KB
Binary file not shown.

roles/amq_streams_connect/templates/connect-standalone.properties.j2

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,36 +46,36 @@ producer.sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModul
4646
# Consumer
4747
consumer.sasl.mechanism=PLAIN
4848
consumer.sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username="{{ amq_streams_connect_broker_auth_username }}" password="{{ amq_streams_connect_broker_auth_password }}";
49-
{% elif amq_streams_connect_broker_admin_mechanism == "SCRAM-SHA-512" %}
49+
{% elif redhat_streams_connect_broker_admin_mechanism == "SCRAM-SHA-512" %}
5050
# SCRAM Login Module
5151
sasl.mechanism=SCRAM-SHA-512
52-
sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="{{ amq_streams_connect_broker_auth_username }}" password="{{ amq_streams_connect_broker_auth_password }}";
52+
sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="{{ redhat_streams_connect_broker_auth_username }}" password="{{ redhat_streams_connect_broker_auth_password }}";
5353
# Producer
5454
producer.sasl.mechanism=SCRAM-SHA-512
55-
producer.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="{{ amq_streams_connect_broker_auth_username }}" password="{{ amq_streams_connect_broker_auth_password }}";
55+
producer.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="{{ redhat_streams_connect_broker_auth_username }}" password="{{ redhat_streams_connect_broker_auth_password }}";
5656
# Consumer
5757
consumer.sasl.mechanism=SCRAM-SHA-512
58-
consumer.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="{{ amq_streams_connect_broker_auth_username }}" password="{{ amq_streams_connect_broker_auth_password }}";
58+
consumer.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="{{ redhat_streams_connect_broker_auth_username }}" password="{{ redhat_streams_connect_broker_auth_password }}";
5959
{% endif %}
6060
{% endif %}
6161

62-
{% if amq_streams_connect_broker_tls_enabled %}
63-
ssl.truststore.location={{ amq_streams_connect_broker_tls_truststore_client_location }}/{{ amq_streams_connect_broker_tls_truststore_client }}
64-
ssl.truststore.password={{ amq_streams_connect_broker_tls_truststore_client_password }}
62+
{% if redhat_streams_connect_broker_tls_enabled %}
63+
ssl.truststore.location={{ redhat_streams_connect_broker_tls_truststore_client_location }}/{{ redhat_streams_connect_broker_tls_truststore_client }}
64+
ssl.truststore.password={{ redhat_streams_connect_broker_tls_truststore_client_password }}
6565
# Disable hostname verification
6666
ssl.endpoint.identification.algorithm=
6767
# Producer
68-
producer.ssl.truststore.location={{ amq_streams_connect_broker_tls_truststore_client_location }}/{{ amq_streams_connect_broker_tls_truststore_client }}
69-
producer.ssl.truststore.password={{ amq_streams_connect_broker_tls_truststore_client_password }}
68+
producer.ssl.truststore.location={{ redhat_streams_connect_broker_tls_truststore_client_location }}/{{ redhat_streams_connect_broker_tls_truststore_client }}
69+
producer.ssl.truststore.password={{ redhat_streams_connect_broker_tls_truststore_client_password }}
7070
# Disable hostname verification
7171
producer.ssl.endpoint.identification.algorithm=
7272
# Consumer
73-
consumer.ssl.truststore.location={{ amq_streams_connect_broker_tls_truststore_client_location }}/{{ amq_streams_connect_broker_tls_truststore_client }}
74-
consumer.ssl.truststore.password={{ amq_streams_connect_broker_tls_truststore_client_password }}
73+
consumer.ssl.truststore.location={{ redhat_streams_connect_broker_tls_truststore_client_location }}/{{ redhat_streams_connect_broker_tls_truststore_client }}
74+
consumer.ssl.truststore.password={{ redhat_streams_connect_broker_tls_truststore_client_password }}
7575
# Disable hostname verification
76-
consumer.ssl.endpoint.identification.algorithm=
7776
{% endif %}
7877

78+
7979
# The converters specify the format of data in Kafka and how to translate it into Connect data. Every Connect user will
8080
# need to configure these based on the format they want their data in when loaded from or stored into Kafka
8181
key.converter=org.apache.kafka.connect.json.JsonConverter

roles/amq_streams_cruise_control/README.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@ Perform installation and configuration of Cruise Control.
44

55
| Variable | Description | Default |
66
|:---------|:------------|:--------|
7-
|`amq_streams_cruise_control_home`| Path to folder where Cruise Control has been installed | `/opt/cruise-control/` |
8-
|`amq_streams_cruise_control_service_name`| Name of the systemd service running Cruise Control | `amq_streams_cruise_control` |
9-
|`amq_streams_cruise_control_server_start`| Path to start script for systemd service managing Cruise Control | `{{ amq_streams_cruise_control_home }}/kafka-cruise-control-start.sh` |
10-
|`amq_streams_cruise_control_server_stop`| Path to stop script for systemd service managing Cruise Control | `{{ amq_streams_cruise_control_home }}/kafka-cruise-control-stop.sh` |
11-
|`amq_streams_cruise_control_server_config`| Path to config file for Cruise Control service | `/etc/amq_streams_cruise_control.properties` |
12-
|`amq_streams_cruise_control_config_template`| Path to template defining the systemd service for Cruise Control | `templates/service.conf.j2` |
13-
|`amq_streams_cruise_control_config_properties_template`| Path to template defining the config file for Cruise Control | `templates/cruisecontrol.properties.j2` |
14-
|`amq_streams_cruise_control_user`| User account running the Cruise Control service | `root` |
15-
|`amq_streams_cruise_control_group`| Groupname of the account running the Cruise Control service | `root` |
16-
|`amq_streams_cruise_control_zk_host`| Hostname of the Zookeeper instance used by Cruise Control to communicate with the ensemble | `{{ groups['zookeepers'][0] }}` |
17-
|`amq_streams_cruise_control_broker_host`| Hostname of the Zookeeper instance used by Cruise Control to communicate with the ensemble | `{{ groups['brokers'][0] }}` |
18-
|`amq_streams_cruise_control_host`| Name of the host system running Cruise Control | `localhost` |
19-
|`amq_streams_cruise_control_port`| Port used communicate with Cruise Control | `9090` |
20-
|`amq_streams_cruise_control_api_path`| Context of the HTTP API call to Cruise Control (don't modify unless you know what you are doing) | `kafkacruisecontrol` |
21-
|`amq_streams_cruise_control_operation_exec`| Set to False to display the URL built, but do not execute it (debug) | `True` |
7+
|`redhat_streams_cruise_control_home`| Path to folder where Cruise Control has been installed | `/opt/cruise-control/` |
8+
|`redhat_streams_cruise_control_service_name`| Name of the systemd service running Cruise Control | `redhat_streams_cruise_control` |
9+
|`redhat_streams_cruise_control_server_start`| Path to start script for systemd service managing Cruise Control | `{{ redhat_streams_cruise_control_home }}/kafka-cruise-control-start.sh` |
10+
|`redhat_streams_cruise_control_server_stop`| Path to stop script for systemd service managing Cruise Control | `{{ redhat_streams_cruise_control_home }}/kafka-cruise-control-stop.sh` |
11+
|`redhat_streams_cruise_control_server_config`| Path to config file for Cruise Control service | `/etc/redhat_streams_cruise_control.properties` |
12+
|`redhat_streams_cruise_control_config_template`| Path to template defining the systemd service for Cruise Control | `templates/service.conf.j2` |
13+
|`redhat_streams_cruise_control_config_properties_template`| Path to template defining the config file for Cruise Control | `templates/cruisecontrol.properties.j2` |
14+
|`redhat_streams_cruise_control_user`| User account running the Cruise Control service | `root` |
15+
|`redhat_streams_cruise_control_group`| Groupname of the account running the Cruise Control service | `root` |
16+
|`redhat_streams_cruise_control_zk_host`| Hostname of the Zookeeper instance used by Cruise Control to communicate with the ensemble | `{{ groups['zookeepers'][0] }}` |
17+
|`redhat_streams_cruise_control_broker_host`| Hostname of the broker instance used by Cruise Control to communicate with the ensemble | `{{ groups['brokers'][0] }}` |
18+
|`redhat_streams_cruise_control_host`| Name of the host system running Cruise Control | `localhost` |
19+
|`redhat_streams_cruise_control_port`| Port used to communicate with Cruise Control | `9090` |
20+
|`redhat_streams_cruise_control_api_path`| Context of the HTTP API call to Cruise Control (don't modify unless you know what you are doing) | `kafkacruisecontrol` |
21+
|`redhat_streams_cruise_control_operation_exec`| Set to False to display the URL built, but do not execute it (debug) | `True` |
22+
2223

2324
## License
2425

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
---
2-
amq_streams_cruise_control_enabled: false
3-
amq_streams_cruise_control_home: /opt/cruise-control/
4-
amq_streams_cruise_control_rhn_product_archive_file_pattern: '^.*/amq-streams-[0-9.]*-cruise-control-bin.zip'
5-
amq_streams_cruise_control_service_name: amq_streams_cruise_control
6-
amq_streams_cruise_control_server_start: "{{ amq_streams_cruise_control_home }}/kafka-cruise-control-start.sh"
7-
amq_streams_cruise_control_server_stop: "{{ amq_streams_cruise_control_home }}/kafka-cruise-control-stop.sh"
8-
amq_streams_cruise_control_version: 2.6.0
9-
amq_streams_cruise_control_archive_file: "amq-streams-{{ amq_streams_cruise_control_version }}-cruise-control-bin.zip"
10-
amq_streams_cruise_control_server_config: "/etc/amq_streams_cruise_control.properties"
11-
amq_streams_cruise_control_config_template: 'templates/service.conf.j2'
12-
amq_streams_cruise_control_config_properties_template: 'templates/cruisecontrol.properties.j2'
13-
amq_streams_cruise_control_path_to_log4j_properties: "{{ amq_streams_cruise_control_home }}/config/log4j.properties"
14-
amq_streams_cruise_control_log4j_template: 'templates/log4j.properties.j2'
15-
amq_streams_cruise_control_logfilename: '/var/log/cruise-control'
16-
amq_streams_cruise_control_logfiles_requires_priv_escalation: yes
17-
amq_streams_cruise_control_capacity_template: 'templates/capacity.json.j2'
18-
amq_streams_cruise_control_path_to_capacity_file: "{{ amq_streams_cruise_control_home }}/config/capacity.json"
19-
amq_streams_cruise_control_path_to_capacity_file_require_priv_escalation: yes
20-
amq_streams_cruise_control_user: root
21-
amq_streams_cruise_control_group: root
22-
amq_streams_cruise_control_zk_host: "{{ groups['zookeepers'][0] }}"
23-
amq_streams_cruise_control_broker_host: "{{ groups['brokers'][0] }}"
24-
amq_streams_cruise_control_replicator_factor: 1
2+
redhat_streams_cruise_control_enabled: false
3+
redhat_streams_cruise_control_home: /opt/cruise-control/
4+
redhat_streams_cruise_control_rhn_product_archive_file_pattern: '^.*/redhat-streams-[0-9.]*-cruise-control-bin.zip'
5+
redhat_streams_cruise_control_service_name: redhat_streams_cruise_control
6+
redhat_streams_cruise_control_server_start: "{{ redhat_streams_cruise_control_home }}/kafka-cruise-control-start.sh"
7+
redhat_streams_cruise_control_server_stop: "{{ redhat_streams_cruise_control_home }}/kafka-cruise-control-stop.sh"
8+
redhat_streams_cruise_control_version: 2.6.0
9+
redhat_streams_cruise_control_archive_file: "redhat-streams-{{ redhat_streams_cruise_control_version }}-cruise-control-bin.zip"
10+
redhat_streams_cruise_control_server_config: "/etc/redhat_streams_cruise_control.properties"
11+
redhat_streams_cruise_control_config_template: 'templates/service.conf.j2'
12+
redhat_streams_cruise_control_config_properties_template: 'templates/cruisecontrol.properties.j2'
13+
redhat_streams_cruise_control_path_to_log4j_properties: "{{ redhat_streams_cruise_control_home }}/config/log4j.properties"
14+
redhat_streams_cruise_control_log4j_template: 'templates/log4j.properties.j2'
15+
redhat_streams_cruise_control_logfilename: '/var/log/cruise-control'
16+
redhat_streams_cruise_control_logfiles_requires_priv_escalation: yes
17+
redhat_streams_cruise_control_capacity_template: 'templates/capacity.json.j2'
18+
redhat_streams_cruise_control_path_to_capacity_file: "{{ redhat_streams_cruise_control_home }}/config/capacity.json"
19+
redhat_streams_cruise_control_path_to_capacity_file_require_priv_escalation: yes
20+
redhat_streams_cruise_control_user: root
21+
redhat_streams_cruise_control_group: root
22+
redhat_streams_cruise_control_zk_host: "{{ groups['zookeepers'][0] }}"
23+
redhat_streams_cruise_control_broker_host: "{{ groups['brokers'][0] }}"
24+
redhat_streams_cruise_control_replicator_factor: 1
2525
# Cruise Control HTTP API
26-
amq_streams_cruise_control_host: 'localhost'
27-
amq_streams_cruise_control_port: 9090
28-
amq_streams_cruise_control_api_path: 'kafkacruisecontrol'
26+
redhat_streams_cruise_control_host: 'localhost'
27+
redhat_streams_cruise_control_port: 9090
28+
redhat_streams_cruise_control_api_path: 'kafkacruisecontrol'
2929
# Switch next var to False to display the HTTP request
30-
amq_streams_cruise_control_operation_exec: True
30+
redhat_streams_cruise_control_operation_exec: True

roles/amq_streams_exporter/README.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ Perform installation and configuration of Kafka Export.
66

77
| Variable | Description | Default |
88
|:---------|:------------|:--------|
9-
|`amq_streams_exporter_target_arch`| Specify physical architecture of target host | `{{ ansible_architecture }}` |
10-
|`amq_streams_exporter_version`| Exporter version to be used | `1.7.0` |
11-
|`amq_streams_exporter_download_base_url`| Base URL for downloading Exporter archive | `https://github.com/danielqsj/kafka_exporter/releases/download/` |
12-
|`amq_streams_exporter_download_url`| Download URL for Exporter archive | `{{ amq_streams_exporter_download_base_url }}v{{ amq_streams_exporter_version }}/kafka_exporter-{{ amq_streams_exporter_version }}.{{ amq_streams_exporter_target_system }}-{{ amq_streams_exporter_target_arch }}.tar.gz` |
13-
|`amq_streams_exporter_archive_folder`| Folder name for Exporter | `kafka_exporter-{{ amq_streams_exporter_version }}.{{ amq_streams_exporter_target_system }}-{{ amq_streams_exporter_target_arch }}` |
14-
|`amq_streams_exporter_archive_name`| Exporter archive name | `{{ amq_streams_exporter_archive_folder }}.tar.gz` |
15-
|`amq_streams_exporter_download_dir`| Download dirname | `{{ lookup('env','PWD') | default('/opt') }}` |
16-
|`amq_streams_exporter_download_path`| Path to download directory (on controller) | `{{ amq_streams_exporter_download_dir }}/{{ amq_streams_exporter_archive_name }}` |
17-
|`amq_streams_exporter_download_host`| Hostname of download host (if not controller) | `localhost` |
18-
|`amq_streams_exporter_home`| Exporter home directory | `{{ amq_streams_common_home }}` |
19-
|`amq_streams_exporter_server_start`| Exporter start script | `{{ amq_streams_common_home }}/{{ amq_streams_exporter_archive_folder }}/{{ amq_streams_exporter_server_start_script }}` |
20-
|`amq_streams_exporter_dependencies`| Dependencies required by Exporter (RPM packages names) | `['tar', 'unzip']` |
21-
|`amq_streams_exporter_service_name`| Service name for the Exporter instance | `amq_streams_exporter` |
22-
|`amq_streams_exporter_server_port`| Exporter server port | `9308` |
23-
|`amq_streams_exporter_server_start_script`| Exporter start script name | `kafka_exporter` |
24-
|`amq_streams_exporter_systemd_env_file`| Exporter service config file | `/etc/amq_streams_exporter.conf` |
25-
|`amq_streams_exporter_service_config_template`| Templates to use for the systemd service for Exporter | `templates/service.conf.j2` |
26-
|`amq_streams_exporter_user`| User account, on targets, running the Exporter | `amq_streams_exporter` |
27-
|`amq_streams_exporter_group`| Group account, on targets, Exporter user belongs to | `amq_streams` |
28-
|`amq_streams_exporter_java_opts`| Java options to pass to Exporter JVM | `` |
29-
|`amq_streams_exporter_server_port_delay`| Delay before checking Exporter server's port availability | `0` |
30-
|`amq_streams_exporter_server_port_skip_wait`| Skip waiting for Exporter server port to be available | `False` |
31-
|`amq_streams_exporter_broker_server_host`| Broker's hostname | `{{ groups['brokers'][0] | default('localhost') }}` |
32-
|`amq_streams_exporter_broker_server_port`| Broker's port | `9092` |
33-
|`amq_streams_exporter_server_extra_args`| Extra arguments to Exporter service start command | `--group.filter='.*' --topic.filter='.*' --offset.show-all --verbosity=0 --kafka.version='{{ amq_streams_common_product_version }}' --kafka.server={{ amq_streams_exporter_broker_server_host }}:{{ amq_streams_exporter_broker_server_port }}` |
9+
|`redhat_streams_exporter_target_arch`| Specify physical architecture of target host | `{{ ansible_architecture }}` |
10+
|`redhat_streams_exporter_version`| Exporter version to be used | `1.7.0` |
11+
|`redhat_streams_exporter_download_base_url`| Base URL for downloading Exporter archive | `https://github.com/danielqsj/kafka_exporter/releases/download/` |
12+
|`redhat_streams_exporter_download_url`| Download URL for Exporter archive | `{{ redhat_streams_exporter_download_base_url }}v{{ redhat_streams_exporter_version }}/kafka_exporter-{{ redhat_streams_exporter_version }}.{{ redhat_streams_exporter_target_system }}-{{ redhat_streams_exporter_target_arch }}.tar.gz` |
13+
|`redhat_streams_exporter_archive_folder`| Folder name for Exporter | `kafka_exporter-{{ redhat_streams_exporter_version }}.{{ redhat_streams_exporter_target_system }}-{{ redhat_streams_exporter_target_arch }}` |
14+
|`redhat_streams_exporter_archive_name`| Exporter archive name | `{{ redhat_streams_exporter_archive_folder }}.tar.gz` |
15+
|`redhat_streams_exporter_download_dir`| Download dirname | `{{ lookup('env','PWD') | default('/opt') }}` |
16+
|`redhat_streams_exporter_download_path`| Path to download directory (on controller) | `{{ redhat_streams_exporter_download_dir }}/{{ redhat_streams_exporter_archive_name }}` |
17+
|`redhat_streams_exporter_download_host`| Hostname of download host (if not controller) | `localhost` |
18+
|`redhat_streams_exporter_home`| Exporter home directory | `{{ redhat_streams_common_home }}` |
19+
|`redhat_streams_exporter_server_start`| Exporter start script | `{{ redhat_streams_common_home }}/{{ redhat_streams_exporter_archive_folder }}/{{ redhat_streams_exporter_server_start_script }}` |
20+
|`redhat_streams_exporter_dependencies`| Dependencies required by Exporter (RPM packages names) | `['tar', 'unzip']` |
21+
|`redhat_streams_exporter_service_name`| Service name for the Exporter instance | `redhat_streams_exporter` |
22+
|`redhat_streams_exporter_server_port`| Exporter server port | `9308` |
23+
|`redhat_streams_exporter_server_start_script`| Exporter start script name | `kafka_exporter` |
24+
|`redhat_streams_exporter_systemd_env_file`| Exporter service config file | `/etc/redhat_streams_exporter.conf` |
25+
|`redhat_streams_exporter_service_config_template`| Templates to use for the systemd service for Exporter | `templates/service.conf.j2` |
26+
|`redhat_streams_exporter_user`| User account, on targets, running the Exporter | `redhat_streams_exporter` |
27+
|`redhat_streams_exporter_group`| Group account, on targets, Exporter user belongs to | `redhat_streams` |
28+
|`redhat_streams_exporter_java_opts`| Java options to pass to Exporter JVM | `` |
29+
|`redhat_streams_exporter_server_port_delay`| Delay before checking Exporter server's port availability | `0` |
30+
|`redhat_streams_exporter_server_port_skip_wait`| Skip waiting for Exporter server port to be available | `False` |
31+
|`redhat_streams_exporter_broker_server_host`| Broker's hostname | `{{ groups['brokers'][0] | default('localhost') }}` |
32+
|`redhat_streams_exporter_broker_server_port`| Broker's port | `9092` |
33+
|`redhat_streams_exporter_server_extra_args`| Extra arguments to Exporter service start command | `--group.filter='.*' --topic.filter='.*' --offset.show-all --verbosity=0 --kafka.version='{{ redhat_streams_common_product_version }}' --kafka.server={{ redhat_streams_exporter_broker_server_host }}:{{ redhat_streams_exporter_broker_server_port }}` |

0 commit comments

Comments
 (0)