aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2020-06-03 10:29:25 +0000
committerPeter Mikus <pmikus@cisco.com>2020-06-03 13:44:26 +0000
commitad5bac567e8364cc29746f236d3d8e2573e4178e (patch)
tree0d099e79de1235161c4aefbf78a0e3ddbd0c3a96
parent638d32aed060bfe3db655f46c3d052a4bd3ec0cd (diff)
Infra: Ansible Nomad
+ Prometheus Telemetry stanza - ARM Softirons Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: Ib7bf577ed0460ab5b79700ff0f8d52d5704cec59
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts2
-rw-r--r--resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml10
-rw-r--r--resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml10
-rw-r--r--resources/tools/testbed-setup/ansible/roles/nomad/templates/telemetry.hcl.j220
4 files changed, 40 insertions, 2 deletions
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
index e95dc624e3..7a12a2b184 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
@@ -52,8 +52,6 @@ all:
10.30.51.30: #s40-nomad - haswell
10.30.51.32: #s42-nomad - ivy bridge
10.30.51.33: #s43-nomad - ivy bridge
- 10.30.51.13: #s44-nomad - arm
- 10.30.51.14: #s45-nomad - arm
10.32.8.14: #s46-nomad - skylake
10.32.8.15: #s47-nomad - skylake
10.32.8.16: #s48-nomad - skylake
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml
index 0efbc6af5a..640021db5f 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/nomad/defaults/main.yaml
@@ -89,5 +89,15 @@ nomad_bootstrap_expect: 2
nomad_encrypt: ""
nomad_retry_join: true
+# Conf - telemetry.hcl
+nomad_disable_hostname: false
+nomad_collection_interval: 60s
+nomad_use_node_name: false
+nomad_publish_allocation_metrics: true
+nomad_publish_node_metrics: true
+nomad_backwards_compatible_metrics: false
+nomad_telemetry_provider_parameters:
+ prometheus_metrics: true
+
# Conf - custom.hcl
# empty
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml
index fa95d645fd..a8bf90f000 100644
--- a/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/nomad/tasks/main.yaml
@@ -137,6 +137,16 @@
tags:
- nomad-conf
+- name: Conf - Telemetry Configuration
+ template:
+ src: telemetry.hcl.j2
+ dest: "{{ nomad_config_dir }}/telemetry.hcl"
+ owner: "{{ nomad_user }}"
+ group: "{{ nomad_group }}"
+ mode: 0644
+ tags:
+ - nomad-conf
+
- name: Conf - Custom Configuration
template:
src: custom.json.j2
diff --git a/resources/tools/testbed-setup/ansible/roles/nomad/templates/telemetry.hcl.j2 b/resources/tools/testbed-setup/ansible/roles/nomad/templates/telemetry.hcl.j2
new file mode 100644
index 0000000000..256c6999e9
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/nomad/templates/telemetry.hcl.j2
@@ -0,0 +1,20 @@
+telemetry {
+ # Telemetry provider parameters
+ {% for key, value in nomad_telemetry_provider_parameters.items() -%}
+ {% if value|bool -%}
+ {{ key }} = {{ value | bool | lower }}
+ {% elif value|string or value == "" -%}
+ {{ key }} = "{{ value }}"
+ {% else %}
+ {{ key }} = {{ value }}
+ {% endif -%}
+ {% endfor -%}
+
+ # Common parameters
+ disable_hostname = {{ nomad_disable_hostname | bool | lower }}
+ collection_interval = "{{ nomad_collection_interval }}"
+ use_node_name = {{ nomad_use_node_name | bool | lower }}
+ publish_allocation_metrics = {{ nomad_publish_allocation_metrics | bool | lower }}
+ publish_node_metrics = {{ nomad_publish_node_metrics | bool | lower }}
+ backwards_compatible_metrics = {{ nomad_backwards_compatible_metrics | bool | lower }}
+}