From: Marek Knappe <mknappe@perceptyx.com>
Date: Mon, 21 May 2018 08:56:39 +0000 (+1000)
Subject: Added raw_rules to udp/data/http
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=d13348982abcc06559e95b1ecfb5573afadc079c

Added raw_rules to udp/data/http
---

diff --git a/README.rst b/README.rst
index de42459..9e6269f 100644
--- a/README.rst
+++ b/README.rst
@@ -288,6 +288,30 @@ Create an continuous queries:
                 SELECT mean("passengers") INTO "transportation"."three_weeks"."average_passengers" FROM "bus_data" GROUP BY time(1h)
 
 
+Example how to add options to http/udp/data/admin that are not supported by the formula yet:
+
+.. code-block:: yaml
+
+    influxdb:
+      server:
+        enabled: true
+        http:
+          enabled: true
+          raw_rules:
+            - 'max-row-limit = 20000'
+        udp:
+          enabled: true
+          raw_rules:
+            - 'max-row-limit = 20000'
+        data:
+          enabled: true
+          raw_rules:
+            - 'something_else = 10'
+        admin:
+          raw_rules:
+            - 'something_here = 55'
+
+
 Rich example for RP and CQ for Telegraf vmstats collected:
 
 .. code-block:: yaml
diff --git a/influxdb/files/influxdb.conf b/influxdb/files/influxdb.conf
index 181ba43..9eeaba8 100644
--- a/influxdb/files/influxdb.conf
+++ b/influxdb/files/influxdb.conf
@@ -66,6 +66,11 @@ reporting-disabled = {{ server.reporting_disabled | lower }}
   cache-snapshot-write-cold-duration = "{{ server.data.cache_snapshot_write_cold_duration|default('10m') }}"
   compact-full-write-cold-duration = "{{ server.data.compact_full_write_cold_duration|default('4h') }}"
   max-values-per-tag = {{ server.data.max_values_per_tag|default(100000) }}
+  {%- if server.data.raw_rules is defined -%}
+    {% for rule in server.data.raw_rules %}
+  {{ rule }}
+    {%- endfor -%}
+  {%- endif %}
 {%- else %}
 [data]
   enabled = false
@@ -141,6 +146,11 @@ reporting-disabled = {{ server.reporting_disabled | lower }}
   {%- else %}
   https-enabled = false
   {%- endif %}
+  {%- if server.admin.raw_rules is defined -%}
+    {% for rule in server.admin.raw_rules %}
+  {{ rule }}
+    {%- endfor -%}
+  {%- endif %}
 {%- else %}
 [admin]
   enabled = false
@@ -180,6 +190,11 @@ reporting-disabled = {{ server.reporting_disabled | lower }}
     {%- endfor %}
   ]
   {%- endif %}
+  {%- if server.http.raw_rules is defined -%}
+    {% for rule in server.http.raw_rules %}
+  {{ rule }}
+    {%- endfor -%}
+  {%- endif %}
 {%- else %}
 [http]
   enabled = false
@@ -313,6 +328,13 @@ reporting-disabled = {{ server.reporting_disabled | lower }}
     {%- endfor %}
   ]
   {%- endif %}
+  
+  {%- if server.udp.raw_rules is defined -%}
+    {% for rule in server.udp.raw_rules %}
+  {{ rule }}
+    {%- endfor -%}
+  {%- endif %}
+
 {%- else %}
 [[udp]]
   enabled = false