Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-12-15 08:23:34 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

app/vmselect: do not export NaN values for stale metrics at /federate endpoint

Browse Source 
Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3185
This commit is contained in:
Aliaksandr Valialkin 2022-10-01 19:47:35 +03:00
parent e6ee725bae
commit ae6c7edf04
No known key found for this signature in database
GPG Key ID: A72BEC6CD3D0DED1
4 changed files with 67 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/vmselect/bufferedwriter/bufferedwriter.go
View File

@ -54,6 +54,9 @@ func (bw *Writer) reset() {
// Write writes p to bw. // Write writes p to bw.
func (bw *Writer) Write(p []byte) (int, error) { func (bw *Writer) Write(p []byte) (int, error) {
if len(p) == 0 {
return 0, nil
}
bw.lock.Lock() bw.lock.Lock()
defer bw.lock.Unlock() defer bw.lock.Unlock()
if bw.err != nil { if bw.err != nil {

23
app/vmselect/prometheus/federate.qtpl
View File

@ -1,4 +1,6 @@
{% import ( {% import (
"math"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/netstorage" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/netstorage"
) %} ) %}
@ -7,10 +9,25 @@
// Federate writes rs in /federate format. // Federate writes rs in /federate format.
// See https://prometheus.io/docs/prometheus/latest/federation/ // See https://prometheus.io/docs/prometheus/latest/federation/
{% func Federate(rs *netstorage.Result) %} {% func Federate(rs *netstorage.Result) %}
{% if len(rs.Timestamps) == 0 || len(rs.Values) == 0 %}{% return %}{% endif %} {% code
values := rs.Values
timestamps := rs.Timestamps
%}
{% if len(timestamps) == 0 || len(values) == 0 %}{% return %}{% endif %}
{% code
lastValue := values[len(values)-1]
%}
{% if math.IsNaN(lastValue) %}
{% comment %}
This is most likely a staleness marker.
Return nothing after the staleness marker.
See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3185
{% endcomment %}
{% return %}
{% endif %}
{%= prometheusMetricName(&rs.MetricName) %}{% space %} {%= prometheusMetricName(&rs.MetricName) %}{% space %}
{%f= rs.Values[len(rs.Values)-1] %}{% space %} {%f= lastValue %}{% space %}
{%dl= rs.Timestamps[len(rs.Timestamps)-1] %}{% newline %} {%dl= timestamps[len(timestamps)-1] %}{% newline %}
{% endfunc %} {% endfunc %}
{% endstripspace %} {% endstripspace %}

71
app/vmselect/prometheus/federate.qtpl.go
View File

@ -6,70 +6,85 @@ package prometheus
//line app/vmselect/prometheus/federate.qtpl:1 //line app/vmselect/prometheus/federate.qtpl:1
import ( import (
"math"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/netstorage" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/netstorage"
) )
// Federate writes rs in /federate format.// See https://prometheus.io/docs/prometheus/latest/federation/ // Federate writes rs in /federate format.// See https://prometheus.io/docs/prometheus/latest/federation/
//line app/vmselect/prometheus/federate.qtpl:9 //line app/vmselect/prometheus/federate.qtpl:11
import ( import (
qtio422016 "io" qtio422016 "io"
qt422016 "github.com/valyala/quicktemplate" qt422016 "github.com/valyala/quicktemplate"
) )
//line app/vmselect/prometheus/federate.qtpl:9 //line app/vmselect/prometheus/federate.qtpl:11
var ( var (
_ = qtio422016.Copy _ = qtio422016.Copy
_ = qt422016.AcquireByteBuffer _ = qt422016.AcquireByteBuffer
) )
//line app/vmselect/prometheus/federate.qtpl:9 //line app/vmselect/prometheus/federate.qtpl:11
func StreamFederate(qw422016 *qt422016.Writer, rs *netstorage.Result) { func StreamFederate(qw422016 *qt422016.Writer, rs *netstorage.Result) {
//line app/vmselect/prometheus/federate.qtpl:10 //line app/vmselect/prometheus/federate.qtpl:13
if len(rs.Timestamps) == 0 || len(rs.Values) == 0 { values := rs.Values
//line app/vmselect/prometheus/federate.qtpl:10 timestamps := rs.Timestamps
//line app/vmselect/prometheus/federate.qtpl:16
if len(timestamps) == 0 || len(values) == 0 {
//line app/vmselect/prometheus/federate.qtpl:16
return return
//line app/vmselect/prometheus/federate.qtpl:10 //line app/vmselect/prometheus/federate.qtpl:16
} }
//line app/vmselect/prometheus/federate.qtpl:11 //line app/vmselect/prometheus/federate.qtpl:18
lastValue := values[len(values)-1]
//line app/vmselect/prometheus/federate.qtpl:20
if math.IsNaN(lastValue) {
//line app/vmselect/prometheus/federate.qtpl:26
return
//line app/vmselect/prometheus/federate.qtpl:27
}
//line app/vmselect/prometheus/federate.qtpl:28
streamprometheusMetricName(qw422016, &rs.MetricName) streamprometheusMetricName(qw422016, &rs.MetricName)
//line app/vmselect/prometheus/federate.qtpl:11 //line app/vmselect/prometheus/federate.qtpl:28
qw422016.N().S(` `) qw422016.N().S(` `)
//line app/vmselect/prometheus/federate.qtpl:12 //line app/vmselect/prometheus/federate.qtpl:29
qw422016.N().F(rs.Values[len(rs.Values)-1]) qw422016.N().F(lastValue)
//line app/vmselect/prometheus/federate.qtpl:12 //line app/vmselect/prometheus/federate.qtpl:29
qw422016.N().S(` `) qw422016.N().S(` `)
//line app/vmselect/prometheus/federate.qtpl:13 //line app/vmselect/prometheus/federate.qtpl:30
qw422016.N().DL(rs.Timestamps[len(rs.Timestamps)-1]) qw422016.N().DL(timestamps[len(timestamps)-1])
//line app/vmselect/prometheus/federate.qtpl:13 //line app/vmselect/prometheus/federate.qtpl:30
qw422016.N().S(` qw422016.N().S(`
`) `)
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
} }
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
func WriteFederate(qq422016 qtio422016.Writer, rs *netstorage.Result) { func WriteFederate(qq422016 qtio422016.Writer, rs *netstorage.Result) {
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
StreamFederate(qw422016, rs) StreamFederate(qw422016, rs)
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
} }
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
func Federate(rs *netstorage.Result) string { func Federate(rs *netstorage.Result) string {
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
WriteFederate(qb422016, rs) WriteFederate(qb422016, rs)
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
return qs422016 return qs422016
//line app/vmselect/prometheus/federate.qtpl:14 //line app/vmselect/prometheus/federate.qtpl:31
} }

1
docs/CHANGELOG.md
View File

@ -49,6 +49,7 @@ See [these docs](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html#m
* FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): add `external_labels` from `global` section at `-promscrape.config` after the [relabeling](https://docs.victoriametrics.com/vmagent.html#relabeling) is applied to scraped metrics. This aligns with Prometheus behaviour. Previously the `external_labels` were added to scrape targets, so they could be modified during relabeling. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3137). * FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): add `external_labels` from `global` section at `-promscrape.config` after the [relabeling](https://docs.victoriametrics.com/vmagent.html#relabeling) is applied to scraped metrics. This aligns with Prometheus behaviour. Previously the `external_labels` were added to scrape targets, so they could be modified during relabeling. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3137).
* FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): allow specifying per-`-remoteWrite.url` limits for on-disk size for pending data via `-remoteWrite.maxDiskUsagePerURL` command-line flag. Thanks to @rbizos for [the pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/3071). * FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): allow specifying per-`-remoteWrite.url` limits for on-disk size for pending data via `-remoteWrite.maxDiskUsagePerURL` command-line flag. Thanks to @rbizos for [the pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/3071).
* BUGFIX: do not export stale metrics via [/federate api](https://docs.victoriametrics.com/#federation) after the staleness markers. Previously such metrics were exported with `NaN` values. this could break some setups. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3185).
* BUGFIX: [vmauth](https://docs.victoriametrics.com/vmauth.html): properly handle request paths ending with `/` such as `/vmui/`. Previously `vmui` was dropping the traling `/`, which could prevent from using `vmui` via `vmauth`. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1752). * BUGFIX: [vmauth](https://docs.victoriametrics.com/vmauth.html): properly handle request paths ending with `/` such as `/vmui/`. Previously `vmui` was dropping the traling `/`, which could prevent from using `vmui` via `vmauth`. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1752).
* BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): properly encode query params for aws signed requests, use `%20` instead of `+` as api requires. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3171). * BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): properly encode query params for aws signed requests, use `%20` instead of `+` as api requires. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3171).
* BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): properly parse relabel config when regex ending with escaped `$`. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3131). * BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): properly parse relabel config when regex ending with escaped `$`. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3131).