Skip to content

Commit d6b87c7

Browse files
chore: Format the config files properly (#19)
* Avoid sorting keys in config Signed-off-by: Mahendra Paipuri <[email protected]>
1 parent 5bfaa20 commit d6b87c7

File tree

5 files changed

+31
-8
lines changed

5 files changed

+31
-8
lines changed

roles/ceems_api_server/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
ceems_api_server_version: "0.1.0"
2+
ceems_api_server_version: 0.1.0
33
ceems_api_server_binary_local_dir: ""
44
ceems_api_server_binary_url: "https://github.com/{{ _ceems_api_server_repo }}/releases/download/\
55
v{{ ceems_api_server_version }}/ceems-{{ ceems_api_server_version }}.linux-{{ go_arch }}.tar.gz"

roles/ceems_api_server/molecule/alternative/molecule.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,29 @@ provisioner:
2727
ceems_api_server_updaters_config:
2828
- id: tsdb-0
2929
updater: tsdb
30+
extra_config:
31+
cutoff_duration: 5m
32+
queries:
33+
# Avgerage CPU utilisation
34+
avg_cpu_usage:
35+
global: |
36+
{% raw %}
37+
avg_over_time(
38+
avg by (uuid) (
39+
(
40+
rate(ceems_compute_unit_cpu_user_seconds_total{uuid=~"{{.UUIDs}}"}[{{.RateInterval}}])
41+
+
42+
rate(ceems_compute_unit_cpu_system_seconds_total{uuid=~"{{.UUIDs}}"}[{{.RateInterval}}])
43+
)
44+
/
45+
(
46+
ceems_compute_unit_cpus{uuid=~"{{.UUIDs}}"}
47+
/ on (instance) group_left ()
48+
ceems_cpu_per_core_count
49+
)
50+
)[{{.Range}}:]
51+
) * 100
52+
{% endraw %}
3053
ceems_api_server_cli_args:
3154
- --log.level=debug
3255
ceems_api_server_env_vars:

roles/ceems_api_server/templates/config.yaml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
{{ ansible_managed | comment }}
33
{% if ceems_api_server_config | length > 0 %}
44
ceems_api_server:
5-
{{ ceems_api_server_config | to_nice_yaml | indent(2, true) }}
5+
{{ ceems_api_server_config | to_nice_yaml(sort_keys=False) | indent(2, true) }}
66
{% endif %}
77

88
{% if ceems_api_server_clusters_config | length > 0 %}
99
clusters:
10-
{{ ceems_api_server_clusters_config | to_nice_yaml | indent(2, true) }}
10+
{{ ceems_api_server_clusters_config | to_nice_yaml(sort_keys=False) | indent(2, true) }}
1111
{% endif %}
1212

1313
{% if ceems_api_server_updaters_config | length > 0 %}
1414
updaters:
15-
{{ ceems_api_server_updaters_config | to_nice_yaml | indent(2, true) }}
15+
{{ ceems_api_server_updaters_config | to_nice_yaml(sort_keys=False,default_style='|') | indent(2, true) }}
1616
{% endif %}

roles/ceems_exporter/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
ceems_exporter_version: "0.1.0"
2+
ceems_exporter_version: 0.1.0
33
ceems_exporter_binary_local_dir: ""
44
ceems_exporter_binary_url: "https://github.com/{{ _ceems_exporter_repo }}/releases/download/v{{ ceems_exporter_version }}/\
55
ceems-{{ ceems_exporter_version }}.linux-{{ go_arch }}.tar.gz"

roles/ceems_lb/templates/config.yaml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
{{ ansible_managed | comment }}
33
{% if ceems_lb_config | length > 0 %}
44
ceems_lb:
5-
{{ ceems_lb_config | to_nice_yaml | indent(2, true) }}
5+
{{ ceems_lb_config | to_nice_yaml(sort_keys=False) | indent(2, true) }}
66
{% endif %}
77

88
{% if ceems_api_server_config | length > 0 %}
99
ceems_api_server:
10-
{{ ceems_api_server_config | to_nice_yaml | indent(2, true) }}
10+
{{ ceems_api_server_config | to_nice_yaml(sort_keys=False) | indent(2, true) }}
1111
{% endif %}
1212

1313
{% if ceems_api_server_clusters_config | length > 0 %}
1414
clusters:
15-
{{ ceems_api_server_clusters_config }}
15+
{{ ceems_api_server_clusters_config | to_nice_yaml(sort_keys=False) | indent(2, true) }}
1616
{% endif %}

0 commit comments

Comments
 (0)