Merge "Fix config.json templates for Prometheus exporters"

ansible/roles/prometheus/templates/prometheus-cadvisor.json.j2

@@ -1,17 +1,20 @@
 {
     "command": "/opt/cadvisor --port={{ prometheus_cadvisor_port }} --log_dir=/var/log/kolla/prometheus{% if prometheus_cadvisor_cmdline_extras %} {{ prometheus_cadvisor_cmdline_extras }}{% endif %}",
-    "config_files": [],
+    "config_files": [
-    "permissions": [
+{% if kolla_copy_ca_into_containers | bool %}
-        {
-            "path": "/var/log/kolla/prometheus",
-            "owner": "prometheus:prometheus",
-            "recurse": true
-        }{% if kolla_copy_ca_into_containers | bool %},
         {
             "source": "{{ container_config_directory }}/ca-certificates",
             "dest": "/var/lib/kolla/share/ca-certificates",
             "owner": "root",
             "perm": "0600"
-        }{% endif %}
+        }
+{% endif %}
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/prometheus",
+            "owner": "prometheus:prometheus",
+            "recurse": true
+        }
     ]
 }

ansible/roles/prometheus/templates/prometheus-elasticsearch-exporter.json.j2

@@ -1,17 +1,20 @@
 {
     "command": "/opt/elasticsearch_exporter/elasticsearch_exporter --es.uri http://{{ api_interface_address | put_address_in_context('url') }}:{{ opensearch_port }} --web.listen-address {{ api_interface_address | put_address_in_context('url') }}:{{ prometheus_elasticsearch_exporter_port }}{% if prometheus_elasticsearch_exporter_cmdline_extras %} {{ prometheus_elasticsearch_exporter_cmdline_extras }}{% endif %}",
-    "config_files": [],
+    "config_files": [
-    "permissions": [
+{% if kolla_copy_ca_into_containers | bool %}
-        {
-            "path": "/var/log/kolla/prometheus",
-            "owner": "prometheus:kolla",
-            "recurse": true
-        }{% if kolla_copy_ca_into_containers | bool %},
         {
             "source": "{{ container_config_directory }}/ca-certificates",
             "dest": "/var/lib/kolla/share/ca-certificates",
             "owner": "root",
             "perm": "0600"
-        }{% endif %}
+        }
+{% endif %}
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/prometheus",
+            "owner": "prometheus:kolla",
+            "recurse": true
+        }
     ]
 }

ansible/roles/prometheus/templates/prometheus-memcached-exporter.json.j2

@@ -1,17 +1,20 @@
 {
     "command": "/opt/memcached_exporter/memcached_exporter --web.listen-address {{ api_interface_address | put_address_in_context('url') }}:{{ prometheus_memcached_exporter_port }} --memcached.address {{ api_interface_address | put_address_in_context('url') }}:{{ memcached_port }}{% if prometheus_memcached_exporter_cmdline_extras %} {{ prometheus_memcached_exporter_cmdline_extras }}{% endif %}",
-    "config_files": [],
+    "config_files": [
-    "permissions": [
+{% if kolla_copy_ca_into_containers | bool %}
-        {
-            "path": "/var/log/kolla/prometheus",
-            "owner": "prometheus:kolla",
-            "recurse": true
-        }{% if kolla_copy_ca_into_containers | bool %},
         {
             "source": "{{ container_config_directory }}/ca-certificates",
             "dest": "/var/lib/kolla/share/ca-certificates",
             "owner": "root",
             "perm": "0600"
-        }{% endif %}
+        }
+{% endif %}
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/prometheus",
+            "owner": "prometheus:kolla",
+            "recurse": true
+        }
     ]
 }

ansible/roles/prometheus/templates/prometheus-node-exporter.json.j2

@@ -1,17 +1,20 @@
 {
     "command": "/opt/node_exporter/node_exporter --path.procfs /host/proc --path.sysfs /host/sys --path.rootfs /host --web.listen-address {{ api_interface_address | put_address_in_context('url') }}:{{ prometheus_node_exporter_port }}{% if prometheus_node_exporter_cmdline_extras %} {{ prometheus_node_exporter_cmdline_extras }}{% endif %}",
-    "config_files": [],
+    "config_files": [
-    "permissions": [
+{% if kolla_copy_ca_into_containers | bool %}
-        {
-            "path": "/var/log/kolla/prometheus",
-            "owner": "prometheus:kolla",
-            "recurse": true
-        }{% if kolla_copy_ca_into_containers | bool %},
         {
             "source": "{{ container_config_directory }}/ca-certificates",
             "dest": "/var/lib/kolla/share/ca-certificates",
             "owner": "root",
             "perm": "0600"
-        }{% endif %}
+        }
+{% endif %}
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/prometheus",
+            "owner": "prometheus:kolla",
+            "recurse": true
+        }
     ]
 }

releasenotes/notes/fix-prometheus-config-template-for-copying-ca-into-containers-8b0429bdbd979e3c.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes a bug where prometheus-cadvisor, prometheus-elasticsearch-exporter,
+    prometheus-memcached-exporter, prometheus-node-exporter cannot start
+    because of bad templating of config.json
+    `LP#2104253 <https://bugs.launchpad.net/kolla-ansible/+bug/2104253>`__