wip

Author: Alex-Welsh

etc/kayobe/ansible/prometheus.yml.j2

@@ -247,18 +247,6 @@ scrape_configs:
 {% endfor %}
 {% endif %}
 
-{% if enable_ironic_prometheus_exporter | bool %}
-  - job_name: ironic_prometheus_exporter
-    static_configs:
-{% for host in groups['ironic-conductor'] %}
-      - targets: ["{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ hostvars[host]['ironic_prometheus_exporter_port'] }}"]
-{% if hostvars[host].prometheus_instance_label | default(false, true) %}
-        labels:
-          instance: "{{ hostvars[host].prometheus_instance_label }}"
-{% endif %}
-{% endfor %}
-{% endif %}
-
 {% if enable_prometheus_alertmanager | bool %}
   - job_name: alertmanager
     static_configs:
@@ -273,14 +261,10 @@ scrape_configs:
 
 alerting:
   alertmanagers:
-  - static_configs:
-    - targets:
+    - static_configs:
 {% for host in groups["prometheus-alertmanager"] %}
+      - targets:
         - '{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ hostvars[host]['prometheus_alertmanager_port'] }}'
-{% if hostvars[host].prometheus_instance_label | default(false, true) %}
-        labels:
-          instance: "{{ hostvars[host].prometheus_instance_label }}"
-{% endif %}
 {% endfor %}
 {% endif %}
 {% endraw %}

etc/kayobe/stackhpc.yml

@@ -145,7 +145,8 @@ stackhpc_kolla_source_version: "stackhpc/{{ openstack_release }}"
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
+# stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
+stackhpc_kolla_ansible_source_version: "fix-prometheus"
 
 ###############################################################################
 # Container image registry