diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 998eb067b..9348dbb2f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -16,6 +16,8 @@ The following tip changes can be tested by building VictoriaMetrics components f * FEATURE: [vmalert](https://docs.victoriametrics.com/vmalert.html): add ability to use OAuth2 for `-datasource.url`, `-notifier.url` and `-remoteRead.url`. See the corresponding command-line flags containing `oauth2` in their names [here](https://docs.victoriametrics.com/vmalert.html#flags). * FEATURE: [vmalert](https://docs.victoriametrics.com/vmalert.html): add ability to use Bearer Token for `-notifier.url` via `-notifier.bearerToken` and `-notifier.bearerTokenFile` command-line flags. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1824). +* FEATURE: [vmalert](https://docs.victoriametrics.com/vmalert.html): add `sortByLabel` template function in order to be consistent with Prometheus. See [these docs](https://prometheus.io/docs/prometheus/latest/configuration/template_reference/#functions) for more details. +* FEATURE: [vmalert](https://docs.victoriametrics.com/vmalert.html): improve compliance with [Prometheus Alert Generator Specification](https://github.com/prometheus/compliance/blob/main/alert_generator/specification.md). ## [v1.74.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.74.0) diff --git a/lib/storage/storage.go b/lib/storage/storage.go index 6189ebfea..8c1ad1229 100644 --- a/lib/storage/storage.go +++ b/lib/storage/storage.go @@ -1076,7 +1076,7 @@ func (s *Storage) searchTSIDs(tfss []*TagFilters, tr TimeRange, maxMetrics int, // on idb level. // Limit the number of concurrent goroutines that may search TSIDS in the storage. - // This should prevent from out of memory errors and CPU trashing when too many + // This should prevent from out of memory errors and CPU thrashing when too many // goroutines call searchTSIDs. select { case searchTSIDsConcurrencyCh <- struct{}{}: @@ -1550,7 +1550,7 @@ func (s *Storage) AddRows(mrs []MetricRow, precisionBits uint8) error { } // Limit the number of concurrent goroutines that may add rows to the storage. - // This should prevent from out of memory errors and CPU trashing when too many + // This should prevent from out of memory errors and CPU thrashing when too many // goroutines call AddRows. select { case addRowsConcurrencyCh <- struct{}{}: