mirror of
https://github.com/VictoriaMetrics/VictoriaMetrics.git
synced 2024-11-21 14:44:00 +00:00
lib/streamaggr: set correct suffix <output>_prometheus
(#6228)
Set correct suffix `<output>_prometheus` for aggregation outputs `increase_prometheus` and `total_prometheus` Before, outputs `total` and `total_prometheus` or `increase` and `increase_prometheus` had the same suffix. Signed-off-by: hagen1778 <roman@victoriametrics.com>
This commit is contained in:
parent
a9283e06a3
commit
8a03e987cb
3 changed files with 18 additions and 14 deletions
|
@ -41,6 +41,7 @@ See also [LTS releases](https://docs.victoriametrics.com/lts-releases/).
|
||||||
|
|
||||||
* BUGFIX: [vmui](https://docs.victoriametrics.com/#vmui): fix bug that prevents the first query trace from expanding on click event. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6186). The issue was introduced in [v1.100.0](https://docs.victoriametrics.com/changelog/#v11000) release.
|
* BUGFIX: [vmui](https://docs.victoriametrics.com/#vmui): fix bug that prevents the first query trace from expanding on click event. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6186). The issue was introduced in [v1.100.0](https://docs.victoriametrics.com/changelog/#v11000) release.
|
||||||
* BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent/): prevent potential panic during [stream aggregation](https://docs.victoriametrics.com/stream-aggregation.html) if more than one `--remoteWrite.streamAggr.dedupInterval` is configured. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6205).
|
* BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent/): prevent potential panic during [stream aggregation](https://docs.victoriametrics.com/stream-aggregation.html) if more than one `--remoteWrite.streamAggr.dedupInterval` is configured. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/6205).
|
||||||
|
* BUGFIX: [stream aggregation](https://docs.victoriametrics.com/stream-aggregation/): set correct suffix `<output>_prometheus` for aggregation outputs [increase_prometheus](https://docs.victoriametrics.com/stream-aggregation/#increase_prometheus) and [total_prometheus](https://docs.victoriametrics.com/stream-aggregation/#total_prometheus). Before, outputs `total` and `total_prometheus` or `increase` and `increase_prometheus` had the same suffix.
|
||||||
|
|
||||||
## [v1.101.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.101.0)
|
## [v1.101.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.101.0)
|
||||||
|
|
||||||
|
|
|
@ -518,8 +518,8 @@ foo:1m_total 0
|
||||||
`, `
|
`, `
|
||||||
foo 123
|
foo 123
|
||||||
bar{baz="qwe"} 4.34
|
bar{baz="qwe"} 4.34
|
||||||
`, `bar:1m_total{baz="qwe"} 0
|
`, `bar:1m_total_prometheus{baz="qwe"} 0
|
||||||
foo:1m_total 0
|
foo:1m_total_prometheus 0
|
||||||
`, "11")
|
`, "11")
|
||||||
|
|
||||||
// total output for repeated series
|
// total output for repeated series
|
||||||
|
@ -554,10 +554,10 @@ foo{baz="qwe"} -5
|
||||||
bar{baz="qwer"} 343
|
bar{baz="qwer"} 343
|
||||||
bar{baz="qwer"} 344
|
bar{baz="qwer"} 344
|
||||||
foo{baz="qwe"} 10
|
foo{baz="qwe"} 10
|
||||||
`, `bar:1m_total{baz="qwe"} 5.02
|
`, `bar:1m_total_prometheus{baz="qwe"} 5.02
|
||||||
bar:1m_total{baz="qwer"} 1
|
bar:1m_total_prometheus{baz="qwer"} 1
|
||||||
foo:1m_total 0
|
foo:1m_total_prometheus 0
|
||||||
foo:1m_total{baz="qwe"} 15
|
foo:1m_total_prometheus{baz="qwe"} 15
|
||||||
`, "11111111")
|
`, "11111111")
|
||||||
|
|
||||||
// total output for repeated series with group by __name__
|
// total output for repeated series with group by __name__
|
||||||
|
@ -592,8 +592,8 @@ foo{baz="qwe"} -5
|
||||||
bar{baz="qwer"} 343
|
bar{baz="qwer"} 343
|
||||||
bar{baz="qwer"} 344
|
bar{baz="qwer"} 344
|
||||||
foo{baz="qwe"} 10
|
foo{baz="qwe"} 10
|
||||||
`, `bar:1m_total 6.02
|
`, `bar:1m_total_prometheus 6.02
|
||||||
foo:1m_total 15
|
foo:1m_total_prometheus 15
|
||||||
`, "11111111")
|
`, "11111111")
|
||||||
|
|
||||||
// increase output for non-repeated series
|
// increase output for non-repeated series
|
||||||
|
@ -614,8 +614,8 @@ foo:1m_increase 0
|
||||||
`, `
|
`, `
|
||||||
foo 123
|
foo 123
|
||||||
bar{baz="qwe"} 4.34
|
bar{baz="qwe"} 4.34
|
||||||
`, `bar:1m_increase{baz="qwe"} 0
|
`, `bar:1m_increase_prometheus{baz="qwe"} 0
|
||||||
foo:1m_increase 0
|
foo:1m_increase_prometheus 0
|
||||||
`, "11")
|
`, "11")
|
||||||
|
|
||||||
// increase output for repeated series
|
// increase output for repeated series
|
||||||
|
@ -650,10 +650,10 @@ foo{baz="qwe"} -5
|
||||||
bar{baz="qwer"} 343
|
bar{baz="qwer"} 343
|
||||||
bar{baz="qwer"} 344
|
bar{baz="qwer"} 344
|
||||||
foo{baz="qwe"} 10
|
foo{baz="qwe"} 10
|
||||||
`, `bar:1m_increase{baz="qwe"} 5.02
|
`, `bar:1m_increase_prometheus{baz="qwe"} 5.02
|
||||||
bar:1m_increase{baz="qwer"} 1
|
bar:1m_increase_prometheus{baz="qwer"} 1
|
||||||
foo:1m_increase 0
|
foo:1m_increase_prometheus 0
|
||||||
foo:1m_increase{baz="qwe"} 15
|
foo:1m_increase_prometheus{baz="qwe"} 15
|
||||||
`, "11111111")
|
`, "11111111")
|
||||||
|
|
||||||
// multiple aggregate configs
|
// multiple aggregate configs
|
||||||
|
|
|
@ -53,6 +53,9 @@ func newTotalAggrState(stalenessInterval time.Duration, resetTotalOnFlush, keepF
|
||||||
if resetTotalOnFlush {
|
if resetTotalOnFlush {
|
||||||
suffix = "increase"
|
suffix = "increase"
|
||||||
}
|
}
|
||||||
|
if !keepFirstSample {
|
||||||
|
suffix += "_prometheus"
|
||||||
|
}
|
||||||
return &totalAggrState{
|
return &totalAggrState{
|
||||||
suffix: suffix,
|
suffix: suffix,
|
||||||
resetTotalOnFlush: resetTotalOnFlush,
|
resetTotalOnFlush: resetTotalOnFlush,
|
||||||
|
|
Loading…
Reference in a new issue