diff --git a/app/vmbackup/README.md b/app/vmbackup/README.md index b998f5c61..4be337306 100644 --- a/app/vmbackup/README.md +++ b/app/vmbackup/README.md @@ -383,7 +383,7 @@ Run `vmbackup -help` in order to see all the available options: Prefixing endpoint with bucket name when set false, true by default. (default true) -s3StorageClass string The Storage Class applied to objects uploaded to AWS S3. Supported values are: GLACIER, DEEP_ARCHIVE, GLACIER_IR, INTELLIGENT_TIERING, ONEZONE_IA, OUTPOSTS, REDUCED_REDUNDANCY, STANDARD, STANDARD_IA. - See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html/ + See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html -snapshot.createURL string VictoriaMetrics create snapshot url. When this is given a snapshot will automatically be created during backup. Example: http://victoriametrics:8428/snapshot/create . There is no need in setting -snapshotName if -snapshot.createURL is set -snapshot.deleteURL string diff --git a/app/vmbackupmanager/README.md b/app/vmbackupmanager/README.md index 258b5e8aa..deecd4858 100644 --- a/app/vmbackupmanager/README.md +++ b/app/vmbackupmanager/README.md @@ -525,7 +525,7 @@ command-line flags: Prefixing endpoint with bucket name when set false, true by default. (default true) -s3StorageClass string The Storage Class applied to objects uploaded to AWS S3. Supported values are: GLACIER, DEEP_ARCHIVE, GLACIER_IR, INTELLIGENT_TIERING, ONEZONE_IA, OUTPOSTS, REDUCED_REDUNDANCY, STANDARD, STANDARD_IA. - See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html/ + See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html -snapshot.createURL string VictoriaMetrics create snapshot url. When this is given a snapshot will automatically be created during backup.Example: http://victoriametrics:8428/snapshot/create -snapshot.deleteURL string diff --git a/app/vmrestore/README.md b/app/vmrestore/README.md index 4d483f1c7..141cc1e22 100644 --- a/app/vmrestore/README.md +++ b/app/vmrestore/README.md @@ -179,7 +179,7 @@ i.e. the end result would be similar to [rsync --delete](https://askubuntu.com/q Prefixing endpoint with bucket name when set false, true by default. (default true) -s3StorageClass string The Storage Class applied to objects uploaded to AWS S3. Supported values are: GLACIER, DEEP_ARCHIVE, GLACIER_IR, INTELLIGENT_TIERING, ONEZONE_IA, OUTPOSTS, REDUCED_REDUNDANCY, STANDARD, STANDARD_IA. - See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html/ + See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html -skipBackupCompleteCheck Whether to skip checking for 'backup complete' file in -src. This may be useful for restoring from old backups, which were created without 'backup complete' file -src string diff --git a/docs/vmbackup.md b/docs/vmbackup.md index 1c5bc3b01..0b461a39d 100644 --- a/docs/vmbackup.md +++ b/docs/vmbackup.md @@ -394,7 +394,7 @@ Run `vmbackup -help` in order to see all the available options: Prefixing endpoint with bucket name when set false, true by default. (default true) -s3StorageClass string The Storage Class applied to objects uploaded to AWS S3. Supported values are: GLACIER, DEEP_ARCHIVE, GLACIER_IR, INTELLIGENT_TIERING, ONEZONE_IA, OUTPOSTS, REDUCED_REDUNDANCY, STANDARD, STANDARD_IA. - See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html/ + See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html -snapshot.createURL string VictoriaMetrics create snapshot url. When this is given a snapshot will automatically be created during backup. Example: http://victoriametrics:8428/snapshot/create . There is no need in setting -snapshotName if -snapshot.createURL is set -snapshot.deleteURL string diff --git a/docs/vmbackupmanager.md b/docs/vmbackupmanager.md index 486a8237a..21f6032f1 100644 --- a/docs/vmbackupmanager.md +++ b/docs/vmbackupmanager.md @@ -536,7 +536,7 @@ command-line flags: Prefixing endpoint with bucket name when set false, true by default. (default true) -s3StorageClass string The Storage Class applied to objects uploaded to AWS S3. Supported values are: GLACIER, DEEP_ARCHIVE, GLACIER_IR, INTELLIGENT_TIERING, ONEZONE_IA, OUTPOSTS, REDUCED_REDUNDANCY, STANDARD, STANDARD_IA. - See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html/ + See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html -snapshot.createURL string VictoriaMetrics create snapshot url. When this is given a snapshot will automatically be created during backup.Example: http://victoriametrics:8428/snapshot/create -snapshot.deleteURL string diff --git a/docs/vmrestore.md b/docs/vmrestore.md index 239099932..e0f12cd3e 100644 --- a/docs/vmrestore.md +++ b/docs/vmrestore.md @@ -190,7 +190,7 @@ i.e. the end result would be similar to [rsync --delete](https://askubuntu.com/q Prefixing endpoint with bucket name when set false, true by default. (default true) -s3StorageClass string The Storage Class applied to objects uploaded to AWS S3. Supported values are: GLACIER, DEEP_ARCHIVE, GLACIER_IR, INTELLIGENT_TIERING, ONEZONE_IA, OUTPOSTS, REDUCED_REDUNDANCY, STANDARD, STANDARD_IA. - See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html/ + See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html -skipBackupCompleteCheck Whether to skip checking for 'backup complete' file in -src. This may be useful for restoring from old backups, which were created without 'backup complete' file -src string diff --git a/lib/backup/actions/util.go b/lib/backup/actions/util.go index 046ff921e..a6836c90d 100644 --- a/lib/backup/actions/util.go +++ b/lib/backup/actions/util.go @@ -26,7 +26,7 @@ var ( s3ForcePathStyle = flag.Bool("s3ForcePathStyle", true, "Prefixing endpoint with bucket name when set false, true by default.") s3StorageClass = flag.String("s3StorageClass", "", "The Storage Class applied to objects uploaded to AWS S3. Supported values are: GLACIER, "+ "DEEP_ARCHIVE, GLACIER_IR, INTELLIGENT_TIERING, ONEZONE_IA, OUTPOSTS, REDUCED_REDUNDANCY, STANDARD, STANDARD_IA.\n"+ - "See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html/") + "See https://docs.aws.amazon.com/AmazonS3/latest/userguide/storage-class-intro.html") ) func runParallel(concurrency int, parts []common.Part, f func(p common.Part) error, progress func(elapsed time.Duration)) error { diff --git a/lib/storage/storage.go b/lib/storage/storage.go index 7d88d36c5..0ac02b1bb 100644 --- a/lib/storage/storage.go +++ b/lib/storage/storage.go @@ -1720,7 +1720,7 @@ func (s *Storage) add(rows []rawRow, dstMrs []*MetricRow, mrs []MetricRow, preci for i := range mrs { mr := &mrs[i] if math.IsNaN(mr.Value) { - if !decimal.IsStaleNaN(mr.Value) { + if decimal.IsStaleNaN(mr.Value) { // Skip NaNs other than Prometheus staleness marker, since the underlying encoding // doesn't know how to work with them. continue