diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml index 72c436a41..64b7d394b 100644 --- a/salt/influxdb/defaults.yaml +++ b/salt/influxdb/defaults.yaml @@ -2,7 +2,7 @@ influxdb: config: bolt-path: /var/lib/influxdb2/influxd.bolt engine-path: /var/lib/influxdb2/engine - feature-flags: + feature-flags: "" flux-log-enabled: false hardening-enabled: true http-bind-address: :8086 @@ -13,7 +13,7 @@ influxdb: influxql-max-select-buckets: 0 influxql-max-select-point: 0 influxql-max-select-series: 0 - instance-id: + instance-id: "" log-level: info metrics-disabled: true no-tasks: false @@ -52,18 +52,18 @@ influxdb: tls-key: /conf/influxdb.key tls-min-version: 1.2 tls-strict-ciphers: true - tracing-type: log + tracing-type: "" ui-disabled: false - vault-addr: - vault-cacert: - vault-capath: - vault-client-cert: - vault-client-key: + vault-addr: "" + vault-cacert: "" + vault-capath: "" + vault-client-cert: "" + vault-client-key: "" vault-client-timeout: 60s vault-max-retries: 2 vault-skip-verify: false - vault-tls-server-name: - vault-token: + vault-tls-server-name: "" + vault-token: "" retention_policies: so_short_term: default: True diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf index d72052a01..391033766 100644 --- a/salt/nginx/etc/nginx.conf +++ b/salt/nginx/etc/nginx.conf @@ -186,7 +186,7 @@ http { location /influxdb/ { auth_request /auth/sessions/whoami; rewrite /influxdb/(.*) /$1 break; - proxy_pass http://{{ GLOBALS.manager_ip }}:8086/; + proxy_pass https://{{ GLOBALS.manager_ip }}:8086/; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host;