未验证 提交 9a61835c 编写于 作者: J jianweizhang 提交者: GitHub

Fix influxdb config resubmit (#5903)

上级 6e0a2444
...@@ -30,6 +30,7 @@ Release Notes. ...@@ -30,6 +30,7 @@ Release Notes.
* Add `contain` and `not contain` OPS in OAL. * Add `contain` and `not contain` OPS in OAL.
* Add Envoy ALS analyzer based on metadata exchange. * Add Envoy ALS analyzer based on metadata exchange.
* Add `listMetrics` GraphQL query. * Add `listMetrics` GraphQL query.
* Add group name into services of so11y and istio relevant metrics
* Support keeping collecting the slowly segments in the sampling mechanism. * Support keeping collecting the slowly segments in the sampling mechanism.
* Support choose files to active the meter analyzer. * Support choose files to active the meter analyzer.
* Support nested class definition in the Service, ServiceInstance, Endpoint, ServiceRelation, and ServiceInstanceRelation sources. * Support nested class definition in the Service, ServiceInstance, Endpoint, ServiceRelation, and ServiceInstanceRelation sources.
...@@ -55,7 +56,7 @@ Release Notes. ...@@ -55,7 +56,7 @@ Release Notes.
* Fix "transaction too large error" when use TiDB as storage. * Fix "transaction too large error" when use TiDB as storage.
* Add otel rules to ui template to observe Istio control plane. * Add otel rules to ui template to observe Istio control plane.
* Remove istio mixer * Remove istio mixer
* Insert group name into services of so11y and istio relevant metrics * Support close influxdb batch write model.
#### UI #### UI
* Fix incorrect label in radial chart in topology. * Fix incorrect label in radial chart in topology.
......
...@@ -138,6 +138,7 @@ core|default|role|Option values, `Mixed/Receiver/Aggregator`. **Receiver** mode ...@@ -138,6 +138,7 @@ core|default|role|Option values, `Mixed/Receiver/Aggregator`. **Receiver** mode
| - | - | database | Database of InfluxDB. | SW_STORAGE_INFLUXDB_DATABASE | skywalking | | - | - | database | Database of InfluxDB. | SW_STORAGE_INFLUXDB_DATABASE | skywalking |
| - | - | actions | The number of actions to collect. | SW_STORAGE_INFLUXDB_ACTIONS | 1000 | | - | - | actions | The number of actions to collect. | SW_STORAGE_INFLUXDB_ACTIONS | 1000 |
| - | - | duration | The time to wait at most (milliseconds). | SW_STORAGE_INFLUXDB_DURATION | 1000| | - | - | duration | The time to wait at most (milliseconds). | SW_STORAGE_INFLUXDB_DURATION | 1000|
| - | - | batchEnabled | If true, write points with batch api. | SW_STORAGE_INFLUXDB_BATCH_ENABLED | true|
| - | - | fetchTaskLogMaxSize | The max number of fetch task log in a request. | SW_STORAGE_INFLUXDB_FETCH_TASK_LOG_MAX_SIZE | 5000| | - | - | fetchTaskLogMaxSize | The max number of fetch task log in a request. | SW_STORAGE_INFLUXDB_FETCH_TASK_LOG_MAX_SIZE | 5000|
| agent-analyzer | default | Agent Analyzer. | SW_AGENT_ANALYZER | default | | agent-analyzer | default | Agent Analyzer. | SW_AGENT_ANALYZER | default |
| - | -| sampleRate|Sampling rate for receiving trace. The precision is 1/10000. 10000 means 100% sample in default.|SW_TRACE_SAMPLE_RATE|10000| | - | -| sampleRate|Sampling rate for receiving trace. The precision is 1/10000. 10000 means 100% sample in default.|SW_TRACE_SAMPLE_RATE|10000|
......
...@@ -192,6 +192,7 @@ storage: ...@@ -192,6 +192,7 @@ storage:
database: ${SW_STORAGE_INFLUXDB_DATABASE:skywalking} database: ${SW_STORAGE_INFLUXDB_DATABASE:skywalking}
actions: ${SW_STORAGE_INFLUXDB_ACTIONS:1000} # the number of actions to collect actions: ${SW_STORAGE_INFLUXDB_ACTIONS:1000} # the number of actions to collect
duration: ${SW_STORAGE_INFLUXDB_DURATION:1000} # the time to wait at most (milliseconds) duration: ${SW_STORAGE_INFLUXDB_DURATION:1000} # the time to wait at most (milliseconds)
batchEnabled: ${SW_STORAGE_INFLUXDB_BATCH_ENABLED:true}
fetchTaskLogMaxSize: ${SW_STORAGE_INFLUXDB_FETCH_TASK_LOG_MAX_SIZE:5000} # the max number of fetch task log in a request fetchTaskLogMaxSize: ${SW_STORAGE_INFLUXDB_FETCH_TASK_LOG_MAX_SIZE:5000} # the max number of fetch task log in a request
agent-analyzer: agent-analyzer:
......
...@@ -80,7 +80,10 @@ public class InfluxClient implements Client, HealthCheckable { ...@@ -80,7 +80,10 @@ public class InfluxClient implements Client, HealthCheckable {
influx.query(new Query("CREATE DATABASE " + database)); influx.query(new Query("CREATE DATABASE " + database));
influx.enableGzip(); influx.enableGzip();
influx.enableBatch(config.getActions(), config.getDuration(), TimeUnit.MILLISECONDS); if (config.isBatchEnabled()) {
influx.enableBatch(config.getActions(), config.getDuration(), TimeUnit.MILLISECONDS);
}
influx.setDatabase(database); influx.setDatabase(database);
healthChecker.health(); healthChecker.health();
} catch (Throwable e) { } catch (Throwable e) {
......
...@@ -32,6 +32,7 @@ public class InfluxStorageConfig extends ModuleConfig { ...@@ -32,6 +32,7 @@ public class InfluxStorageConfig extends ModuleConfig {
private int actions; private int actions;
private int duration; private int duration;
private boolean batchEnabled = true;
private int fetchTaskLogMaxSize = 5000; private int fetchTaskLogMaxSize = 5000;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册