Telegraf playbook fixes

The vm_quota.py is missing as telegraf plugin but still
referenced inside the playbook-influx-telegraf.yml
playbook.
Additionally the my.cnf is not necessary to be present
on the telegraf hosts/containers, in order to function.
The override influxdb_protocol exposes the protocol to
be used for communicating with influxdb, usually HTTP

Change-Id: I90226d02e82d2516be4a4d84baff22e46ce709fb
This commit is contained in:
Bjoern Teipel 2017-05-09 13:07:32 -05:00
parent f0a94da4d3
commit 2d2c1f1419
2 changed files with 2 additions and 20 deletions

View File

@ -46,18 +46,6 @@
- item.value.when_group | bool
- item.value.group == inventory_hostname or
inventory_hostname in item.value.group | default([])
- name: Store my_cnf
slurp:
src: "/root/.my.cnf"
register: _my_cnf
changed_when: false
- name: Copy my.cnf file into telegraf home
copy:
content: "{{ _my_cnf.content | b64decode }}"
dest: "/root/.my.cnf"
mode: "0440"
owner: "telegraf"
group: "telegraf"
- name: Drop telegraf config file
template:
src: templates/telegraf.conf.j2
@ -86,12 +74,6 @@
- "python /opt/telegraf/ironic_nodes.py"
group: "{{ groups['utility_all'][0] }}"
when_group: "{{ (groups['ironic_api'] | default([]) | length) > 0 }}"
vm_quota:
plugin_name: "vm_quota.py"
command:
- "python /opt/telegraf/vm_quota.py"
group: "{{ groups['utility_all'][0] }}"
when_group: "{{ (groups['nova_compute'] | default([]) | length) > 0 }}"
kvm:
plugin_name: "kvm_virsh.py"
command:
@ -105,4 +87,4 @@
group: "{{ groups['utility_all'][0] }}"
when_group: "{{ (groups['cinder_volumes'] | default([]) | length) > 0 }}"
influx_telegraf_targets:
- "{{ influxdb_host|default(internal_lb_vip_address) }}:{{ influxdb_port }}"
- "{{ influxdb_protocol|default('http') }}://{{ influxdb_host|default(internal_lb_vip_address) }}:{{ influxdb_port }}"

View File

@ -36,7 +36,7 @@
omit_hostname = false
[[outputs.influxdb]]
urls = [{{ influx_telegraf_targets | map('quote') | join(',') }}]
urls = ["{{ influx_telegraf_targets | map('quote') | join(',') }}"]
database = "{{ influxdb_db_name }}"
precision = "s"
write_consistency = "any"