Skip to content

Commit c575bb3

Browse files
committed
add templates for central monitoring
1 parent 980dd98 commit c575bb3

File tree

3 files changed

+53
-2
lines changed

3 files changed

+53
-2
lines changed

kolla/defaults.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,19 @@ enable_swift: no
331331
enable_swift_rgw: no
332332

333333
# Monitoring
334-
# TODO: install ES curator
335-
enable_central_logging: yes
334+
enable_central_logging: no
336335
es_heap_size: 8G
337336
# Includes log4j safeguard: https://github.com/elastic/elasticsearch/issues/81618
338337
es_java_opts: "-Xms{{ es_heap_size }} -Xmx{{ es_heap_size }} -Dlog4j2.formatMsgNoLookups=true"
339338
es_enable_painless_regex: no
340339
enable_grafana: no
341340

341+
loki_url: "https://logs.chameleoncloud.org"
342+
prometheus_remote_write_url: "https://metrics.chameleoncloud.org/api/v1/push"
343+
prometheus_remote_write_username: "{{ keystone_idp_client_id }}"
344+
upload_logs_chameleon: false
345+
upload_metrics_chameleon: false
346+
342347
# External Ceph
343348
enable_ceph: no
344349

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{% if upload_logs_chameleon | bool %}
2+
<match **>
3+
@type loki
4+
url "{{ loki_url }}"
5+
username "{{ prometheus_remote_write_username }}"
6+
password "{{ prometheus_remote_write_password }}"
7+
extra_labels {
8+
"kolla_external_fqdn": "{{ kolla_external_fqdn }}",
9+
"keystone_idp_client_id": "{{ keystone_idp_client_id }}",
10+
"openstack_region_name": "{{ openstack_region_name }}",
11+
"chameleon_site_name": "{{ chameleon_site_name }}"
12+
}
13+
<buffer>
14+
flush_interval 10s
15+
flush_at_shutdown true
16+
</buffer>
17+
18+
<label>
19+
Hostname
20+
</label>
21+
<label>
22+
Logger
23+
</label>
24+
<label>
25+
programname
26+
</label>
27+
<label>
28+
level log_level
29+
</label>
30+
</match>
31+
{% endif %}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
{% if upload_metrics_chameleon | bool %}
3+
remote_write:
4+
- url: "{{ prometheus_remote_write_url }}"
5+
basic_auth:
6+
username: "{{ prometheus_remote_write_username }}"
7+
password: "{{ prometheus_remote_write_password }}"
8+
{% endif %}
9+
10+
global:
11+
external_labels:
12+
kolla_external_fqdn: "{{ kolla_external_fqdn }}"
13+
keystone_idp_client_id: "{{ keystone_idp_client_id }}"
14+
openstack_region_name: "{{ openstack_region_name }}"
15+
chameleon_site_name: "{{ chameleon_site_name }}"

0 commit comments

Comments
 (0)