Commit 7bb482bb65704089c8a404b12acd6cd00c9154ba

Authored by vparomskiy
1 parent 3fddabb3

fix property and env variables names

... ... @@ -64,7 +64,7 @@ cluster:
64 64
65 65 # Plugins configuration parameters
66 66 plugins:
67   - # Comma seperated package list used during classpath scanning for plugins
  67 + # Comma separated package list used during classpath scanning for plugins
68 68 scan_packages: "${PLUGINS_SCAN_PACKAGES:org.thingsboard.server.extensions,org.thingsboard.rule.engine}"
69 69
70 70 # Security parameters
... ... @@ -84,7 +84,7 @@ dashboard:
84 84 max_datapoints_limit: "${DASHBOARD_MAX_DATAPOINTS_LIMIT:50000}"
85 85
86 86 database:
87   - ts_max_intervals: "${DATABASE_TS_MAX_INTERVALS:700}" # mas number of DB queries generated by single API call to fetch telemetry records
  87 + ts_max_intervals: "${DATABASE_TS_MAX_INTERVALS:700}" # Max number of DB queries generated by single API call to fetch telemetry records
88 88 entities:
89 89 type: "${DATABASE_ENTITIES_TYPE:sql}" # cassandra OR sql
90 90 ts:
... ... @@ -107,7 +107,7 @@ cassandra:
107 107 metrics: "${CASSANDRA_DISABLE_METRICS:true}"
108 108 # NONE SNAPPY LZ4
109 109 compression: "${CASSANDRA_COMPRESSION:none}"
110   - # Specify cassandra claster initialization timeout (if no hosts available during startup)
  110 + # Specify cassandra cluster initialization timeout in milliseconds (if no hosts available during startup)
111 111 init_timeout_ms: "${CASSANDRA_CLUSTER_INIT_TIMEOUT_MS:300000}"
112 112 # Specify cassandra claster initialization retry interval (if no hosts available during startup)
113 113 init_retry_interval_ms: "${CASSANDRA_CLUSTER_INIT_RETRY_INTERVAL_MS:3000}"
... ... @@ -153,8 +153,6 @@ sql:
153 153
154 154 # Actor system parameters
155 155 actors:
156   - cluster:
157   - grpc_callback_thread_pool_size: "${ACTORS_CLUSTER_GRPC_CALLBACK_THREAD_POOL_SIZE:10}"
158 156 tenant:
159 157 create_components_on_init: "${ACTORS_TENANT_CREATE_COMPONENTS_ON_INIT:true}"
160 158 session:
... ... @@ -310,7 +308,7 @@ audit_log:
310 308 "user": "${AUDIT_LOG_MASK_USER:W}"
311 309 "rule_chain": "${AUDIT_LOG_MASK_RULE_CHAIN:W}"
312 310 "alarm": "${AUDIT_LOG_MASK_ALARM:W}"
313   - "entity_view": "${AUDIT_LOG_MASK_RULE_CHAIN:W}"
  311 + "entity_view": "${AUDIT_LOG_MASK_ENTITY_VIEW:W}"
314 312 sink:
315 313 # Type of external sink. possible options: none, elasticsearch
316 314 type: "${AUDIT_LOG_SINK_TYPE:none}"
... ... @@ -324,7 +322,7 @@ audit_log:
324 322 date_format: "${AUDIT_LOG_SINK_DATE_FORMAT:YYYY.MM.DD}"
325 323 scheme_name: "${AUDIT_LOG_SINK_SCHEME_NAME:http}" # http or https
326 324 host: "${AUDIT_LOG_SINK_HOST:localhost}"
327   - port: "${AUDIT_LOG_SINK_POST:9200}"
  325 + port: "${AUDIT_LOG_SINK_PORT:9200}"
328 326 user_name: "${AUDIT_LOG_SINK_USER_NAME:}"
329 327 password: "${AUDIT_LOG_SINK_PASSWORD:}"
330 328
... ... @@ -344,7 +342,7 @@ kafka:
344 342 requests_topic: "${TB_TRANSPORT_API_REQUEST_TOPIC:tb.transport.api.requests}"
345 343 responses_topic: "${TB_TRANSPORT_API_RESPONSE_TOPIC:tb.transport.api.responses}"
346 344 max_pending_requests: "${TB_TRANSPORT_MAX_PENDING_REQUESTS:10000}"
347   - request_timeout: "${TB_TRANSPORT_MAX_REQUEST_TIMEOUT:10000}"
  345 + max_requests_timeout: "${TB_TRANSPORT_MAX_REQUEST_TIMEOUT:10000}"
348 346 request_poll_interval: "${TB_TRANSPORT_REQUEST_POLL_INTERVAL_MS:25}"
349 347 request_auto_commit_interval: "${TB_TRANSPORT_REQUEST_AUTO_COMMIT_INTERVAL_MS:100}"
350 348 rule_engine:
... ... @@ -371,7 +369,7 @@ js:
371 369 # JS Eval request topic
372 370 request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js.eval.requests}"
373 371 # JS Eval responses topic prefix that is combined with node id
374   - response_topic_prefix: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js.eval.responses}"
  372 + response_topic_prefix: "${REMOTE_JS_EVAL_RESPONSE_TOPIC:js.eval.responses}"
375 373 # JS Eval max pending requests
376 374 max_pending_requests: "${REMOTE_JS_MAX_PENDING_REQUESTS:10000}"
377 375 # JS Eval max request timeout
... ...