cleanup setup
diff --git a/README.md b/README.md
index ab3e79a..b2eabd9 100755
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
# Statsd
-## Sample pillar
+## Sample pillars
-### Standalone statsd server
+Standalone Statsd server with Graphite/carbon backend
statsd:
server:
@@ -11,12 +11,39 @@
bind:
port: 8125
address: 0.0.0.0
- backends:
- - type: graphite
+ backend:
+ engine: carbon
+ host: metrics1.domain.com
+ port: 2003
+
+Standalone Statsd server with Graphite/AMQP backend
+
+ statsd:
+ server:
+ enabled: true
+ bind:
+ port: 8125
+ address: 0.0.0.0
+ backend:
+ engine: amqp
+ host: metrics1.domain.com
+ port: 2003
+
+Standalone Statsd server with OpenTSDB backend
+
+ statsd:
+ server:
+ enabled: true
+ bind:
+ port: 8125
+ address: 0.0.0.0
+ backend:
+ engine: amqp
host: metrics1.domain.com
port: 2003
## Read more
* https://github.com/etsy/statsd/
-* https://github.com/mrtazz/statsd-amqp-backend
\ No newline at end of file
+* https://github.com/mrtazz/statsd-amqp-backend
+* https://github.com/danslimmon/statsd-opentsdb-backend
diff --git a/conf/localConfig.js b/conf/localConfig.js
index e2f7271..9dcf6f2 100755
--- a/conf/localConfig.js
+++ b/conf/localConfig.js
@@ -1,11 +1,12 @@
+{%- from "statsd/map.jinja" import server with context %}
+
{
- {%- for backend in pillar.statsd.server.backends %}
- {%- if backend.type == 'graphite' %}
- graphitePort: {{ backend.port }},
+ {%- if server.backend.engine == 'carbon' %}
graphiteHost: "{{ backend.host }}",
+ graphitePort: {{ backend.port }},
backends: [ "./backends/graphite" ],
{%- endif %}
- {%- if backend.type == 'amqp' %}
+ {%- if server.backend.engine == 'amqp' %}
amqpHost: '{{ backend.host }}',
amqpPort: {{ backend.port }},
amqpLogin: '{{ backend.user }}',
@@ -14,6 +15,10 @@
amqpQueue: '{{ backend.queue }}',
amqpDefaultExchange: '{{ backend.exchange }}',
{%- endif %}
- {%- endfor %}
+ {%- if server.backend.engine == 'opentsdb' %}
+ opentsdbHost: "{{ backend.host }}",
+ opentsdbPort: {{ backend.port }},
+ opentsdbTagPrefix: "{{ backend.get('prefix', '_t_') }}",
+ {%- endif %}
port: {{ pillar.statsd.server.bind.port }}
}
\ No newline at end of file
diff --git a/server.sls b/server.sls
index 55aacfa..329ddb3 100755
--- a/server.sls
+++ b/server.sls
@@ -1,5 +1,4 @@
-{% from "statsd/map.jinja" import server with context %}
-
+{%- from "statsd/map.jinja" import server with context %}
{%- if server.enabled %}
include:
@@ -69,9 +68,7 @@
- require:
- user: statsd
-{%- for backend in pillar.statsd.server.backends %}
-
-{%- if backend.type == 'amqp' %}
+{%- if server.backend.engine == 'amqp' %}
#statsd_amqp_package:
# npm.installed:
@@ -83,6 +80,12 @@
{%- endif %}
-{%- endfor %}
+{%- if server.backend.engine == 'opentsdb' %}
+
+install_package:
+ cmd.run:
+ - name: npm install statsd-opentsdb-backend
+
+{%- endif %}
{%- endif %}
\ No newline at end of file