From: Petr Michalec <epcim@apealive.net>
Date: Thu, 7 Dec 2017 11:01:09 +0000 (+0100)
Subject: Merge pull request #25 from Perceptyx/master
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=a054a52f03659cbfdd2b8cd7aa9aab6fbae6ff7f;hp=-c

Merge pull request #25 from Perceptyx/master

Ensure custom paths are created and have correct permissions
---

a054a52f03659cbfdd2b8cd7aa9aab6fbae6ff7f
diff --combined README.rst
index a27364f,2b8349d..769bb2d
--- a/README.rst
+++ b/README.rst
@@@ -40,8 -40,8 +40,8 @@@ Single-node influxdb, SSL for http fron
                key_file: /etc/influxdb/ssl/key.pem
                cert_file: /etc/influxdb/ssl/cert.pem
  
- Single-node influxdb where you specify paths for data and metastore directories. You
- need to ensure that directories exist:
+ Single-node influxdb where you specify paths for data and metastore directories. Custom
+ directories are created by this formula:
  
  .. code-block:: yaml
  
@@@ -264,34 -264,6 +264,34 @@@ InfluxDB client for configuring databas
              database: mydb1
              privilege: all
  
 +InfluxDB relay with HTTP outputs:
 +
 +.. code-block:: yaml
 +
 +    influxdb:
 +      relay:
 +        enabled: true
 +        telemetry:
 +          enabled: true
 +          bind:
 +            address: 127.0.0.1
 +            port: 9196
 +        listen:
 +          http_backend:
 +            type: http
 +            bind:
 +              address: 127.0.0.1
 +              port: 9096
 +            output:
 +              server1:
 +                location: http://server1:8086/write
 +                timeout: 20s
 +                buffer_size_mb: 512
 +                max_batch_kb: 1024
 +                max_delay_interval: 30s
 +              server2:
 +                location: http://server2:8086/write
 +  
  Read more
  =========
  
diff --combined influxdb/map.jinja
index 8cf164d,2c61594..83047b6
--- a/influxdb/map.jinja
+++ b/influxdb/map.jinja
@@@ -3,6 -3,8 +3,8 @@@ default
    pkgs:
    - influxdb
    service: influxdb
+   service_user: influxdb
+   service_group: influxdb
    container_mode: false
    prefix_dir: /
    reporting_disabled: true
@@@ -41,10 -43,6 +43,10 @@@
      'http_errors_percentage': 5,
      'failed_points_percentage': 5,
      'dropped_points_percentage': 5,
 +    'max_relay_buffer_percentage': 70,
 +    'relay_failed_requests_percentage': 5,
 +    'service_failed_warning_threshold_percent': 0.3,
 +    'service_failed_critical_threshold_percent': 0.6,
    },
  }, grain='os_family', merge=salt['pillar.get']('influxdb:monitoring')) %}
  
@@@ -52,12 -50,3 +54,12 @@@
      'default': {
      },
  }, merge=salt['pillar.get']('influxdb:client')) %}
 +
 +{%- set relay = salt['grains.filter_by']({
 +    'default': {
 +        'pkgs': ['influxdb-relay'],
 +        'service': 'influxdb-relay',
 +        'listen': {},
 +        'telemetry': {},
 +    },
 +}, merge=salt['pillar.get']('influxdb:relay')) %}