diff --git a/app/vmctl/main.go b/app/vmctl/main.go index 1ad1e3aaf..83faaa168 100644 --- a/app/vmctl/main.go +++ b/app/vmctl/main.go @@ -86,13 +86,13 @@ func main() { fmt.Println("InfluxDB import mode") // create TLS config - influxCertFile := c.String(influxCertFile) - influxKeyFile := c.String(influxKeyFile) - influxCAFile := c.String(influxCAFile) - influxServerName := c.String(influxServerName) - influxInsecureSkipVerify := c.Bool(influxInsecureSkipVerify) + certFile := c.String(influxCertFile) + keyFile := c.String(influxKeyFile) + caFile := c.String(influxCAFile) + serverName := c.String(influxServerName) + insecureSkipVerify := c.Bool(influxInsecureSkipVerify) - tc, err := httputils.TLSConfig(influxCertFile, influxCAFile, influxKeyFile, influxServerName, influxInsecureSkipVerify) + tc, err := httputils.TLSConfig(certFile, caFile, keyFile, serverName, insecureSkipVerify) if err != nil { return fmt.Errorf("failed to create TLS Config: %s", err) } diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b3eb4dcf4..c0f39e369 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -29,6 +29,7 @@ The sandbox cluster installation is running under the constant load generated by ## tip * FEATURE: [Single-node VictoriaMetrics](https://docs.victoriametrics.com/) and `vmstorage` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/cluster-victoriametrics/): expose `vm_last_partition_parts` [metrics](https://docs.victoriametrics.com/#monitoring), which show the number of [parts in the latest partition](https://docs.victoriametrics.com/#storage). These metrics may help debugging query performance slowdown related to the increased number of parts in the last partition, since usually all the ingested data is written to the last partition and all the queries are performed over the recently ingested data, e.g. the last partition. +* FEATURE: [vmctl](https://docs.victoriametrics.com/vmctl.html): support client-side TLS configuration for [InfluxDB](https://docs.victoriametrics.com/vmctl/#migrating-data-from-influxdb-1x). See [this feature request](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5748). Thanks to @khushijain21 [the pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/5783). ## [v1.98.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.98.0) @@ -67,7 +68,6 @@ Released at 2024-02-14 * BUGFIX: [vmui](https://docs.victoriametrics.com/#vmui): clear entered text in select after selecting a value. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5727). * BUGFIX: [vmui](https://docs.victoriametrics.com/#vmui): improve the operation of the context for autocomplete. See [this](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5736), [this](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5737) and [this](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5739) issues. * BUGFIX: [dashboards](https://grafana.com/orgs/victoriametrics): update `Storage full ETA` panels for Single-node and Cluster dashboards to prevent them from showing negative or blank results caused by increase of deduplicated samples. Deduplicated samples were part of the expression to provide a better estimate for disk usage, but due to sporadic nature of [deduplication](https://docs.victoriametrics.com/#deduplication) in VictoriaMetrics it rather produced skewed results. See [this pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/5747). -* FEATURE: [vmctl](https://docs.victoriametrics.com/vmctl.html): support client-side TLS configuration for migration from influx db. See [this feature request](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5748). # [v1.97.2](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.97.2) diff --git a/docs/vmctl.md b/docs/vmctl.md index 074fe9ed2..135939237 100644 --- a/docs/vmctl.md +++ b/docs/vmctl.md @@ -280,15 +280,12 @@ foo_field2{tag1="value1", tag2="value2"} 40 ### Configuration -The configuration flags should contain self-explanatory descriptions. - +Run the following command to get all configuration options: ```sh --influx-cert-file value Optional path to client-side TLS certificate file to use when connecting to influxAddr --influx-key-file value Optional path to client-side TLS key to use when connecting to influxAddr --influx-CA-file value Optional path to TLS CA file to use for verifying connections to influxAddr. By default, system CA is used --influx-server-name value Optional TLS server name to use for connections to influxAddr. By default, the server name from influxAddr is used --influx-insecure-skip-verify Whether to skip tls verification when connecting to infuxAddr (default: false) +./vmctl influx --help ``` + + ### Filtering The filtering consists of two parts: timeseries and time. @@ -428,7 +425,11 @@ So no data changes will be applied. ### Configuration -The configuration flags should contain self-explanatory descriptions. +Run the following command to get all configuration options: +```sh +./vmctl prometheus --help +``` + ### Filtering