Misc

molecule/all_auth/molecule.yml

@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

molecule/all_cluster/molecule.yml

@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

molecule/connect/molecule.yml

@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

molecule/default/molecule.yml

@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

molecule/ssl_no_auth/prepare.yml → molecule/prepare_ssl.yml

@@ -19,7 +19,7 @@
         dest: /tmp/
         owner: root
         group: root
-        mode: 0077
+        mode: "0077"
 
     - name: "Generate required SSL artefacts."
       ansible.builtin.command: "/tmp/generate_keys_and_certs.sh"

molecule/ssl_auth_sasl/molecule.yml

@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare_ssl.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

molecule/ssl_no_auth/molecule.yml

@@ -18,7 +18,7 @@ provisioner:
     ssh_connection:
       pipelining: false
   playbooks:
-    prepare: prepare.yml
+    prepare: ../prepare.yml
     converge: converge.yml
     verify: verify.yml
   inventory:

roles/amq_streams_common/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-amq_streams_common_product_version: 3.4.0
+amq_streams_common_product_version: 3.5.0
 amq_streams_common_scala_version: 2.13
 amq_streams_common_version: "{{ amq_streams_common_scala_version }}-{{ amq_streams_common_product_version }}"
 amq_streams_common_archive_file: "kafka_{{ amq_streams_common_version }}.tgz"

roles/amq_streams_common/tasks/prometheus.yml

@@ -0,0 +1,26 @@
+---
+- name: "Ensure required parameters for Prometheus are provided."
+  ansible.builtin.assert:
+    that:
+      - amq_streams_common_prometheus_config_file is defined and amq_streams_common_prometheus_config_file | length > 0
+      - amq_streams_common_prometheus_config_file_template is defined and amq_streams_common_prometheus_config_file_template | length > 0
+    quiet: True
+
+- name: "Ensure directory {{ amq_streams_common_prometheus_metrics_config_home }} exits."
+  ansible.builtin.file:
+    path: "{{ amq_streams_common_prometheus_metrics_config_home }}"
+    state: directory
+
+- name: "Deploy Prometheus metrics file (src: {{ amq_streams_common_prometheus_config_file_template }} to dest: {{ amq_streams_common_prometheus_metrics_config_home }}{{ amq_streams_common_prometheus_config_file }}"
+  ansible.builtin.template:
+    src: "{{ amq_streams_common_prometheus_config_file_template }}"
+    dest: "{{ amq_streams_common_prometheus_metrics_config_home }}{{ amq_streams_common_prometheus_config_file }}"
+    owner: "{{ amq_streams_common_prometheus_user | default(omit) }}"
+    group: "{{ amq_streams_common_prometheus_group | default(omit) }}"
+    mode: 0644
+
+- name: "Add prometheus dependency (if enabled: {{ amq_streams_common_prometheus_enabled }})."
+  ansible.builtin.set_fact:
+    amq_streams_common_dependencies: "{{ [amq_streams_common_dependencies + ['{{ amq_streams_common_prometheus_package_name }}']] | flatten }}"
+  when:
+    - amq_streams_common_prometheus_install_rpm is defined and amq_streams_common_prometheus_install_rpm