fix: bucket config

Author: SMillerDev

influxdb/buckets.sls

@@ -4,6 +4,10 @@
 jq:
   pkg.installed
 
+{% if "remote" in influxdb %}
+{%- set base_url = "https://" ~ influxdb['remote']['host'] ~ ":" ~ influxdb['remote']['port'] %}
+{% endif %}
+
 {%- if "bucket" in influxdb %}
 {%- for config in influxdb["bucket"] %}
 {% if "remote" not in influxdb %}
@@ -19,32 +23,33 @@ influxdb_bucket_{{ config['name'] }}:
       - pkg: jq
 {%- set bucket = salt['cmd.shell']("influx bucket list --json | jq -r '.[] | select(.name == \"" + config['name'] + "\").id'") %}
 {% else %}
+{%- set orgID = salt['cmd.shell']("curl -s -f -H'Authorization: Token " ~ influxdb['user']['admin']['token'] ~ "' '" ~ base_url ~ "/api/v2/orgs' | jq -r '.orgs[0].id'") %}
+
 get_bucket_{{ config['name'] }}:
   http.query:
-    - name: 'https://{{ influxdb['remote']['host'] }}/api/v2/buckets/{{ config['name'] }}'
+    - name: '{{ base_url }}/api/v2/buckets?orgId={{ orgID }}&name={{ config['name'] }}'
     - status: 200
     - method: GET
     - header_dict:
         Authorization: Token {{ influxdb['user']['admin']['token'] }}
 
 {%- set bucket_data = {
-  name: config['name'],
-  description: config['description'] | default('A bucket for ' + config['name']),
-  orgID: config['orgID'],
-  retentionRules: [],
-  rp: config['retention_policy']
+  'name':           config['name'],
+  'description':    config['description'] | default('A bucket for ' + config['name']),
+  'orgID':          orgID,
+  'rp':             config['retention_policy'] | default('0'),
 } %}
 create_bucket_{{ config['name'] }}:
   http.query:
-    - name: 'https://{{ influxdb['remote']['host'] }}/api/v2/buckets'
-    - status: 200
+    - name: '{{ base_url }}/api/v2/buckets'
+    - status: 201
     - method: POST
     - data: '{{ bucket_data | tojson }}'
     - header_dict:
         Authorization: Token {{ influxdb['user']['admin']['token'] }}
     - onfail:
         - http: get_bucket_{{ config['name'] }}
-{%- set bucket = salt['cmd.shell']("curl -s -f -H'Authorization: Token {{ influxdb['user']['admin']['token'] }}' https://{{ influxdb['remote']['host'] }}/api/v2/buckets | jq -r '.[] | select(.name == \"" + config['name'] + "\").id'") %}
+{%- set bucket = salt['cmd.shell']("curl -s -f -H'Authorization: Token " ~ influxdb['user']['admin']['token'] ~ "' '" ~ base_url ~ "/api/v2/buckets' | jq -r '.buckets[] | select(.name == \"" + config['name'] + "\").id'") %}
 {% endif %}
 
 {%- if 'mapping' in config and bucket %}
@@ -61,10 +66,30 @@ influxdb_bucket_{{ config['name'] }}_mapping_{{ dbrp_config['db'] }}/{{ dbrp_con
     - require:
       - cmd: influxdb_bucket_{{ config['name'] }}
 {%- else %}
-influxdb_bucket_{{ config['name'] }}_mapping_{{ dbrp_config['db'] }}/{{ dbrp_config['rp'] }}:
-  cmd.run:
-    - name: >
-        echo "{{ bucket }}"
+get_bucket_{{ config['name'] }}_mapping_{{ dbrp_config['db'] }}/{{ dbrp_config['rp'] }}:
+  http.query:
+    - name: '{{ base_url }}/api/v2/dbrps?orgID={{ orgID }}&bucketID={{ bucket }}&db={{ dbrp_config['db'] }}&rp={{ dbrp_config['rp'] }}'
+    - status: 200
+    - method: GET
+    - header_dict:
+        Authorization: Token {{ influxdb['user']['admin']['token'] }}
+
+{%- set dbrp_data = {
+  'bucketID':         bucket,
+  'database':         dbrp_config['db'],
+  'retention_policy': dbrp_config['rp'] | default('autogen'),
+  'orgID':            orgID,
+} %}
+create_bucket_{{ config['name'] }}_mapping_{{ dbrp_config['db'] }}/{{ dbrp_config['rp'] }}:
+  http.query:
+    - name: '{{ base_url }}/api/v2/dbrps'
+    - status: 201
+    - method: POST
+    - data: '{{ dbrp_data | tojson }}'
+    - header_dict:
+        Authorization: Token {{ influxdb['user']['admin']['token'] }}
+    - onfail:
+        - http: get_bucket_{{ config['name'] }}_mapping_{{ dbrp_config['db'] }}/{{ dbrp_config['rp'] }}
 {%- endif %}
 {%- endfor %}
 {%- endif %}

influxdb/users.sls

@@ -17,19 +17,20 @@ influxdb_user_{{ loop.index0 }}:
 {% endif %}
 
 {% if "user" in influxdb and "remote" in influxdb %}
+{%- set base_url = "https://" ~ influxdb['remote']['host'] ~ ":" ~ influxdb['remote']['port'] %}
 {% for name,config in influxdb["user"].items() %}
 get_user_{{ loop.index0 }}:
   http.query:
-    - name: 'https://{{ influxdb['remote']['host'] }}/api/v2/users/{{ name }}'
+    - name: '{{ base_url }}/api/v2/users/?name={{ name }}'
     - status: 200
     - method: GET
     - header_dict:
         Authorization: Token {{ influxdb['user']['admin']['token'] }}
 
 create_user_{{ loop.index0 }}:
   http.query:
-    - name: 'https://{{ influxdb['remote']['host'] }}/api/v2/users'
-    - status: 200
+    - name: '{{ base_url }}/api/v2/users'
+    - status: 201
     - method: POST
     - data: '{"name": "{{ name }}"}'
     - header_dict:
@@ -38,10 +39,11 @@ create_user_{{ loop.index0 }}:
         - http: get_user_{{ loop.index0 }}
 
 {% if "password" in config %}
+{%- set id = salt['cmd.shell']("curl -s -f -H'Authorization: Token " ~ influxdb['user']['admin']['token'] ~ "' '" ~ base_url ~ "/api/v2/users?name=" ~ name ~ "' | jq -r '.users[0].id'") %}
 set_password_{{ loop.index0 }}:
   http.query:
-    - name: 'https://{{ influxdb['remote']['host'] }}/api/v2/users{{ name }}/password'
-    - status: 200
+    - name: '{{ base_url }}/api/v2/users/{{ id }}/password'
+    - status: 204
     - method: POST
     - data: '{"password": "{{ config["password"] }}"}'
     - header_dict: