Merge "Add telegraf ping plugin" into release/2019.2.0
diff --git a/metadata/service/agent/init.yml b/metadata/service/agent/init.yml
index c1501fe..9cab1ed 100644
--- a/metadata/service/agent/init.yml
+++ b/metadata/service/agent/init.yml
@@ -11,3 +11,6 @@
metric_batch_size: 1000
metric_buffer_limit: 10000
collection_jitter: 2
+ dir:
+ config: /etc/telegraf
+ config_d: /etc/telegraf/telegraf.d
diff --git a/metadata/service/agent/remote/init.yml b/metadata/service/agent/remote/init.yml
index 19d5e6d..25b1467 100644
--- a/metadata/service/agent/remote/init.yml
+++ b/metadata/service/agent/remote/init.yml
@@ -11,3 +11,6 @@
metric_batch_size: 1000
metric_buffer_limit: 10000
collection_jitter: 2
+ dir:
+ config: /srv/volumes/local/telegraf
+ config_d: /srv/volumes/local/telegraf/telegraf.d
diff --git a/telegraf/files/output/_common.conf b/telegraf/files/output/_common.conf
new file mode 100644
index 0000000..2dbc34b
--- /dev/null
+++ b/telegraf/files/output/_common.conf
@@ -0,0 +1,9 @@
+{%- if values.flush_interval is defined %}
+flush_interval = "{{ values.flush_interval }}s"
+{%- endif %}
+{%- if values.metric_batch_size is defined %}
+metric_batch_size = {{ values.metric_batch_size }}
+{%- endif %}
+{%- if values.metric_buffer_limit is defined %}
+metric_buffer_limit = {{ values.metric_buffer_limit }}
+{%- endif %}
diff --git a/telegraf/files/output/prometheus_client.conf b/telegraf/files/output/prometheus_client.conf
index bbac5f2..049ad0f 100644
--- a/telegraf/files/output/prometheus_client.conf
+++ b/telegraf/files/output/prometheus_client.conf
@@ -7,5 +7,12 @@
{%- if values.string_as_label is defined %}
string_as_label = {{ values.string_as_label|lower }}
{%- endif %}
+ {%- if values.tls_cert is defined %}
+tls_cert = "{{ values.tls_cert }}"
+ {%- endif %}
+ {%- if values.tls_key is defined %}
+tls_key = "{{ values.tls_key }}"
+ {%- endif %}
{%- endif %}
+{%- include 'telegraf/files/output/_common.conf' %}
{%- include 'telegraf/files/input/_filters.conf' %}
diff --git a/telegraf/meta/prometheus.yml b/telegraf/meta/prometheus.yml
index bf0e188..c93b7f3 100644
--- a/telegraf/meta/prometheus.yml
+++ b/telegraf/meta/prometheus.yml
@@ -31,6 +31,24 @@
target:
static:
telegraf:
+ {%- if agent.output.prometheus_client.scheme is defined %}
+ scheme: {{ agent.output.prometheus_client.scheme }}
+ {%- endif %}
+ {%- if agent.output.prometheus_client.tls_config is defined %}
+ tls_config:
+ {%- if agent.output.prometheus_client.tls_config.skip_verify is defined %}
+ skip_verify: {{ agent.output.prometheus_client.tls_config.skip_verify }}
+ {%- endif %}
+ {%- if agent.output.prometheus_client.tls_config.ca_file is defined %}
+ ca_file: {{ agent.output.prometheus_client.tls_config.ca_file }}
+ {%- endif %}
+ {%- if agent.output.prometheus_client.tls_config.cert_name is defined %}
+ cert_name: {{ agent.output.prometheus_client.tls_config.cert_name }}
+ {%- endif %}
+ {%- if agent.output.prometheus_client.tls_config.key_name is defined %}
+ key_name: {{ agent.output.prometheus_client.tls_config.key_name }}
+ {%- endif %}
+ {%- endif %}
endpoint:
- address: {{ address }}
port: {{ agent.output.prometheus_client.bind.port }}