Merge pull request #17 from elemoine/stacklight-time-precision
Make InfluxDB time precision configurable
diff --git a/heka/files/toml/output/influxdb.toml b/heka/files/toml/output/influxdb.toml
index 005bf8e..e725024 100644
--- a/heka/files/toml/output/influxdb.toml
+++ b/heka/files/toml/output/influxdb.toml
@@ -2,7 +2,7 @@
type = "HttpOutput"
message_matcher = "Fields[payload_type] == 'txt' && Fields[payload_name] == 'influxdb'"
encoder = "influxdb_encoder"
-address = "http://{{ output.host }}:{{ output.port }}/write?db={{ output.database }}&precision=ms"
+address = "http://{{ output.host }}:{{ output.port }}/write?db={{ output.database }}&precision={{ output.time_precision }}"
{%- if output.username and output.password %}
username = "{{ output.username }}"
password = "{{ output.password }}"
diff --git a/heka/map.jinja b/heka/map.jinja
index 6f9f0b9..841b34a 100644
--- a/heka/map.jinja
+++ b/heka/map.jinja
@@ -16,6 +16,7 @@
decoder: {}
extra_fields:
environment_label: {{ grains.domain }}
+ influxdb_time_precision: ms
RedHat:
groups:
- adm
diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index ba8176d..eb3bcce 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -1,3 +1,5 @@
+{%- from "heka/map.jinja" import server with context %}
+
log_collector:
filter:
aggregated_http_metrics:
@@ -94,7 +96,7 @@
ticker_interval: 1
config:
tag_fields: "deployment_id environment_label tenant_id user_id"
- time_precision: "ms"
+ time_precision: "{{ server.influxdb_time_precision }}"
encoder:
influxdb:
engine: payload
diff --git a/metadata/service/metric_collector/single.yml b/metadata/service/metric_collector/single.yml
index 41d5256..1d1a62a 100644
--- a/metadata/service/metric_collector/single.yml
+++ b/metadata/service/metric_collector/single.yml
@@ -6,3 +6,4 @@
heka:
metric_collector:
enabled: true
+ influxdb_time_precision: ms