From 9c435d7a9dde9bb58785b0da9706a5de6bd11c69 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 14 Jul 2022 00:54:23 +0300 Subject: [PATCH 1/2] docs: update descriptions for command-line flags according to the latest changes --- README.md | 2 +- app/vmagent/README.md | 4 ++-- docs/README.md | 2 +- docs/Single-server-VictoriaMetrics.md | 2 +- docs/vmagent.md | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fe7efac2d..6211c543a 100644 --- a/README.md +++ b/README.md @@ -2005,7 +2005,7 @@ Pass `-help` to VictoriaMetrics in order to see the list of supported command-li -precisionBits int The number of precision bits to store per each value. Lower precision bits improves data compression at the cost of precision loss (default 64) -promscrape.azureSDCheckInterval duration - Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) + Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) -promscrape.cluster.memberNum string The number of number in the cluster of scrapers. It must be an unique value in the range 0 ... promscrape.cluster.membersCount-1 across scrapers in the cluster. Can be specified as pod name of Kubernetes StatefulSet - pod-name-Num, where Num is a numeric part of pod name (default "0") -promscrape.cluster.membersCount int diff --git a/app/vmagent/README.md b/app/vmagent/README.md index 14a29fe31..ee69ce6a7 100644 --- a/app/vmagent/README.md +++ b/app/vmagent/README.md @@ -1001,7 +1001,7 @@ See the docs at https://docs.victoriametrics.com/vmagent.html . -pprofAuthKey string Auth key for /debug/pprof/* endpoints. It must be passed via authKey query arg. It overrides httpAuth.* settings -promscrape.azureSDCheckInterval duration - Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) + Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) -promscrape.cluster.memberNum string The number of number in the cluster of scrapers. It must be an unique value in the range 0 ... promscrape.cluster.membersCount-1 across scrapers in the cluster. Can be specified as pod name of Kubernetes StatefulSet - pod-name-Num, where Num is a numeric part of pod name (default "0") -promscrape.cluster.membersCount int @@ -1091,7 +1091,7 @@ See the docs at https://docs.victoriametrics.com/vmagent.html . -remoteWrite.aws.secretKey array Optional AWS SecretKey to use for the corresponding -remoteWrite.url if -remoteWrite.aws.useSigv4 is set Supports an array of values separated by comma or specified via multiple flags. - -remoteWrite.aws.serice array + -remoteWrite.aws.service array Optional AWS Service to use for the corresponding -remoteWrite.url if -remoteWrite.aws.useSigv4 is set. Defaults to "aps" Supports an array of values separated by comma or specified via multiple flags. -remoteWrite.aws.useSigv4 array diff --git a/docs/README.md b/docs/README.md index fe7efac2d..6211c543a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2005,7 +2005,7 @@ Pass `-help` to VictoriaMetrics in order to see the list of supported command-li -precisionBits int The number of precision bits to store per each value. Lower precision bits improves data compression at the cost of precision loss (default 64) -promscrape.azureSDCheckInterval duration - Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) + Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) -promscrape.cluster.memberNum string The number of number in the cluster of scrapers. It must be an unique value in the range 0 ... promscrape.cluster.membersCount-1 across scrapers in the cluster. Can be specified as pod name of Kubernetes StatefulSet - pod-name-Num, where Num is a numeric part of pod name (default "0") -promscrape.cluster.membersCount int diff --git a/docs/Single-server-VictoriaMetrics.md b/docs/Single-server-VictoriaMetrics.md index 9fa2c6352..772adeafb 100644 --- a/docs/Single-server-VictoriaMetrics.md +++ b/docs/Single-server-VictoriaMetrics.md @@ -2009,7 +2009,7 @@ Pass `-help` to VictoriaMetrics in order to see the list of supported command-li -precisionBits int The number of precision bits to store per each value. Lower precision bits improves data compression at the cost of precision loss (default 64) -promscrape.azureSDCheckInterval duration - Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) + Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) -promscrape.cluster.memberNum string The number of number in the cluster of scrapers. It must be an unique value in the range 0 ... promscrape.cluster.membersCount-1 across scrapers in the cluster. Can be specified as pod name of Kubernetes StatefulSet - pod-name-Num, where Num is a numeric part of pod name (default "0") -promscrape.cluster.membersCount int diff --git a/docs/vmagent.md b/docs/vmagent.md index 344eb4a65..96f202c9e 100644 --- a/docs/vmagent.md +++ b/docs/vmagent.md @@ -1005,7 +1005,7 @@ See the docs at https://docs.victoriametrics.com/vmagent.html . -pprofAuthKey string Auth key for /debug/pprof/* endpoints. It must be passed via authKey query arg. It overrides httpAuth.* settings -promscrape.azureSDCheckInterval duration - Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) + Interval for checking for changes in Azure. This works only if azure_sd_configs is configured in '-promscrape.config' file. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config for details (default 1m0s) -promscrape.cluster.memberNum string The number of number in the cluster of scrapers. It must be an unique value in the range 0 ... promscrape.cluster.membersCount-1 across scrapers in the cluster. Can be specified as pod name of Kubernetes StatefulSet - pod-name-Num, where Num is a numeric part of pod name (default "0") -promscrape.cluster.membersCount int @@ -1095,7 +1095,7 @@ See the docs at https://docs.victoriametrics.com/vmagent.html . -remoteWrite.aws.secretKey array Optional AWS SecretKey to use for the corresponding -remoteWrite.url if -remoteWrite.aws.useSigv4 is set Supports an array of values separated by comma or specified via multiple flags. - -remoteWrite.aws.serice array + -remoteWrite.aws.service array Optional AWS Service to use for the corresponding -remoteWrite.url if -remoteWrite.aws.useSigv4 is set. Defaults to "aps" Supports an array of values separated by comma or specified via multiple flags. -remoteWrite.aws.useSigv4 array From f9500abfe08bbb585d1b80821fd2f7738b96216d Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 14 Jul 2022 10:59:05 +0300 Subject: [PATCH 2/2] app: fix `make publish-*` after ed93330e6691255a3b28fd7e9c16c75cf6d205b3 Add missing `-linux` substring to built binary names for copying into Docker images --- app/victoria-metrics/multiarch/Dockerfile | 2 +- app/vmagent/multiarch/Dockerfile | 2 +- app/vmalert/multiarch/Dockerfile | 2 +- app/vmauth/multiarch/Dockerfile | 2 +- app/vmbackup/multiarch/Dockerfile | 2 +- app/vmctl/multiarch/Dockerfile | 2 +- app/vmrestore/multiarch/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/victoria-metrics/multiarch/Dockerfile b/app/victoria-metrics/multiarch/Dockerfile index 2357d5218..c197a5718 100644 --- a/app/victoria-metrics/multiarch/Dockerfile +++ b/app/victoria-metrics/multiarch/Dockerfile @@ -9,4 +9,4 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica EXPOSE 8428 ENTRYPOINT ["/victoria-metrics-prod"] ARG TARGETARCH -COPY victoria-metrics-${TARGETARCH}-prod ./victoria-metrics-prod +COPY victoria-metrics-linux-${TARGETARCH}-prod ./victoria-metrics-prod diff --git a/app/vmagent/multiarch/Dockerfile b/app/vmagent/multiarch/Dockerfile index f074775a5..c1eca858f 100644 --- a/app/vmagent/multiarch/Dockerfile +++ b/app/vmagent/multiarch/Dockerfile @@ -9,4 +9,4 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica EXPOSE 8429 ENTRYPOINT ["/vmagent-prod"] ARG TARGETARCH -COPY vmagent-${TARGETARCH}-prod ./vmagent-prod +COPY vmagent-linux-${TARGETARCH}-prod ./vmagent-prod diff --git a/app/vmalert/multiarch/Dockerfile b/app/vmalert/multiarch/Dockerfile index 14ad8f0e8..2311d3082 100644 --- a/app/vmalert/multiarch/Dockerfile +++ b/app/vmalert/multiarch/Dockerfile @@ -9,4 +9,4 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica EXPOSE 8880 ENTRYPOINT ["/vmalert-prod"] ARG TARGETARCH -COPY vmalert-${TARGETARCH}-prod ./vmalert-prod +COPY vmalert-linux-${TARGETARCH}-prod ./vmalert-prod diff --git a/app/vmauth/multiarch/Dockerfile b/app/vmauth/multiarch/Dockerfile index 2f510fa6a..77382d4e2 100644 --- a/app/vmauth/multiarch/Dockerfile +++ b/app/vmauth/multiarch/Dockerfile @@ -9,4 +9,4 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica EXPOSE 8427 ENTRYPOINT ["/vmauth-prod"] ARG TARGETARCH -COPY vmauth-${TARGETARCH}-prod ./vmauth-prod +COPY vmauth-linux-${TARGETARCH}-prod ./vmauth-prod diff --git a/app/vmbackup/multiarch/Dockerfile b/app/vmbackup/multiarch/Dockerfile index 594b66c0f..15954766e 100644 --- a/app/vmbackup/multiarch/Dockerfile +++ b/app/vmbackup/multiarch/Dockerfile @@ -8,4 +8,4 @@ FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/vmbackup-prod"] ARG TARGETARCH -COPY vmbackup-${TARGETARCH}-prod ./vmbackup-prod +COPY vmbackup-linux-${TARGETARCH}-prod ./vmbackup-prod diff --git a/app/vmctl/multiarch/Dockerfile b/app/vmctl/multiarch/Dockerfile index 0db55b3be..ed75e7809 100644 --- a/app/vmctl/multiarch/Dockerfile +++ b/app/vmctl/multiarch/Dockerfile @@ -8,4 +8,4 @@ FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/vmctl-prod"] ARG TARGETARCH -COPY vmctl-${TARGETARCH}-prod ./vmctl-prod +COPY vmctl-linux-${TARGETARCH}-prod ./vmctl-prod diff --git a/app/vmrestore/multiarch/Dockerfile b/app/vmrestore/multiarch/Dockerfile index 85fe70603..2cdf012ab 100644 --- a/app/vmrestore/multiarch/Dockerfile +++ b/app/vmrestore/multiarch/Dockerfile @@ -8,4 +8,4 @@ FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/vmrestore-prod"] ARG TARGETARCH -COPY vmrestore-${TARGETARCH}-prod ./vmrestore-prod +COPY vmrestore-linux-${TARGETARCH}-prod ./vmrestore-prod