From 49e800ba55613165a2411f0a6cc0fef135db3b07 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Tue, 15 Dec 2020 20:39:12 +0200 Subject: [PATCH] app/vmagent: add `vmagent_remotewrite_blocks_sent_total` and `vmagent_remotewrite_bytes_sent_total` metrics per each `-remoteWrite.url` --- app/vmagent/remotewrite/client.go | 6 ++++++ docs/CHANGELOG.md | 2 ++ 2 files changed, 8 insertions(+) diff --git a/app/vmagent/remotewrite/client.go b/app/vmagent/remotewrite/client.go index 2ffdfab12c..b5f693c8bd 100644 --- a/app/vmagent/remotewrite/client.go +++ b/app/vmagent/remotewrite/client.go @@ -49,6 +49,8 @@ type client struct { fq *persistentqueue.FastQueue hc *http.Client + bytesSent *metrics.Counter + blocksSent *metrics.Counter requestDuration *metrics.Histogram requestsOKCount *metrics.Counter errorsCount *metrics.Counter @@ -111,6 +113,8 @@ func newClient(argIdx int, remoteWriteURL, sanitizedURL string, fq *persistentqu }, stopCh: make(chan struct{}), } + c.bytesSent = metrics.GetOrCreateCounter(fmt.Sprintf(`vmagent_remotewrite_bytes_sent_total{url=%q}`, c.sanitizedURL)) + c.blocksSent = metrics.GetOrCreateCounter(fmt.Sprintf(`vmagent_remotewrite_blocks_sent_total{url=%q}`, c.sanitizedURL)) c.requestDuration = metrics.GetOrCreateHistogram(fmt.Sprintf(`vmagent_remotewrite_duration_seconds{url=%q}`, c.sanitizedURL)) c.requestsOKCount = metrics.GetOrCreateCounter(fmt.Sprintf(`vmagent_remotewrite_requests_total{url=%q, status_code="2XX"}`, c.sanitizedURL)) c.errorsCount = metrics.GetOrCreateCounter(fmt.Sprintf(`vmagent_remotewrite_errors_total{url=%q}`, c.sanitizedURL)) @@ -187,6 +191,8 @@ func (c *client) runWorker() { func (c *client) sendBlock(block []byte) { retryDuration := time.Second retriesCount := 0 + c.bytesSent.Add(len(block)) + c.blocksSent.Inc() again: req, err := http.NewRequest("POST", c.remoteWriteURL, bytes.NewBuffer(block)) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c3f9b63b4c..3c556eab81 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,6 +2,8 @@ # tip +* FEATURE: vmagent: export `vmagent_remotewrite_blocks_sent_total` and `vmagent_remotewrite_blocks_sent_total` metrics for each `-remoteWrite.url`. + # [v1.50.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.50.0)