Merge remote-tracking branch 'remotes/origin/dev' into pipeline

This commit is contained in:
Mike Reeves
2021-06-08 11:03:14 -04:00
10 changed files with 161 additions and 155 deletions
+2 -1
View File
@@ -50,7 +50,8 @@
"username": "",
"password": "",
"cacheMs": {{ ES_FIELDCAPS_CACHE }},
"verifyCert": false
"verifyCert": false,
"timeoutMs": {{ API_TIMEOUT }}
},
"influxdb": {
{%- if grains['role'] in ['so-import'] or (grains['role'] == 'so-eval' and GRAFANA == 0) %}