From 70f597b0334d48572c4b0c35940c975aef3031c7 Mon Sep 17 00:00:00 2001 From: Levi Harrison Date: Tue, 31 Aug 2021 11:37:32 -0400 Subject: [PATCH] Configure Scrape Interval and Timeout Via Relabeling (#8911) * Configure scrape interval and timeout with labels Signed-off-by: Levi Harrison --- docs/configuration/configuration.md | 3 + docs/querying/api.md | 6 +- scrape/manager_test.go | 272 +++++++++++++----- scrape/scrape.go | 46 ++- scrape/scrape_test.go | 141 +++++++-- scrape/target.go | 67 ++++- scrape/target_test.go | 26 ++ web/api/v1/api.go | 5 + web/api/v1/api_test.go | 72 +++-- .../src/pages/targets/ScrapePoolList.test.tsx | 3 + .../pages/targets/ScrapePoolPanel.test.tsx | 3 + .../src/pages/targets/ScrapePoolPanel.tsx | 15 +- .../pages/targets/TargetScrapeDuration.tsx | 41 +++ .../pages/targets/__testdata__/testdata.ts | 10 + web/ui/react-app/src/pages/targets/target.ts | 2 + 15 files changed, 578 insertions(+), 134 deletions(-) create mode 100644 web/ui/react-app/src/pages/targets/TargetScrapeDuration.tsx diff --git a/docs/configuration/configuration.md b/docs/configuration/configuration.md index 2e1b73918..dd84d9ad7 100644 --- a/docs/configuration/configuration.md +++ b/docs/configuration/configuration.md @@ -2172,6 +2172,9 @@ it was not set during relabeling. The `__scheme__` and `__metrics_path__` labels are set to the scheme and metrics path of the target respectively. The `__param_` label is set to the value of the first passed URL parameter called ``. +The `__scrape_interval__` and `__scrape_timeout__` labels are set to the target's +interval and timeout. This is **experimental** and could change in the future. + Additional labels prefixed with `__meta_` may be available during the relabeling phase. They are set by the service discovery mechanism that provided the target and vary between mechanisms. diff --git a/docs/querying/api.md b/docs/querying/api.md index 58d5c11eb..7d25c0518 100644 --- a/docs/querying/api.md +++ b/docs/querying/api.md @@ -502,7 +502,9 @@ $ curl http://localhost:9090/api/v1/targets "lastError": "", "lastScrape": "2017-01-17T15:07:44.723715405+01:00", "lastScrapeDuration": 0.050688943, - "health": "up" + "health": "up", + "scrapeInterval": "1m", + "scrapeTimeout": "10s" } ], "droppedTargets": [ @@ -511,6 +513,8 @@ $ curl http://localhost:9090/api/v1/targets "__address__": "127.0.0.1:9100", "__metrics_path__": "/metrics", "__scheme__": "http", + "__scrape_interval__": "1m", + "__scrape_timeout__": "10s", "job": "node" }, } diff --git a/scrape/manager_test.go b/scrape/manager_test.go index 7f94e1989..4b244e301 100644 --- a/scrape/manager_test.go +++ b/scrape/manager_test.go @@ -44,52 +44,66 @@ func TestPopulateLabels(t *testing.T) { "custom": "value", }), cfg: &config.ScrapeConfig{ - Scheme: "https", - MetricsPath: "/metrics", - JobName: "job", + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), }, res: labels.FromMap(map[string]string{ - model.AddressLabel: "1.2.3.4:1000", - model.InstanceLabel: "1.2.3.4:1000", - model.SchemeLabel: "https", - model.MetricsPathLabel: "/metrics", - model.JobLabel: "job", - "custom": "value", + model.AddressLabel: "1.2.3.4:1000", + model.InstanceLabel: "1.2.3.4:1000", + model.SchemeLabel: "https", + model.MetricsPathLabel: "/metrics", + model.JobLabel: "job", + model.ScrapeIntervalLabel: "1s", + model.ScrapeTimeoutLabel: "1s", + "custom": "value", }), resOrig: labels.FromMap(map[string]string{ - model.AddressLabel: "1.2.3.4:1000", - model.SchemeLabel: "https", - model.MetricsPathLabel: "/metrics", - model.JobLabel: "job", - "custom": "value", + model.AddressLabel: "1.2.3.4:1000", + model.SchemeLabel: "https", + model.MetricsPathLabel: "/metrics", + model.JobLabel: "job", + "custom": "value", + model.ScrapeIntervalLabel: "1s", + model.ScrapeTimeoutLabel: "1s", }), }, // Pre-define/overwrite scrape config labels. // Leave out port and expect it to be defaulted to scheme. { in: labels.FromMap(map[string]string{ - model.AddressLabel: "1.2.3.4", - model.SchemeLabel: "http", - model.MetricsPathLabel: "/custom", - model.JobLabel: "custom-job", + model.AddressLabel: "1.2.3.4", + model.SchemeLabel: "http", + model.MetricsPathLabel: "/custom", + model.JobLabel: "custom-job", + model.ScrapeIntervalLabel: "2s", + model.ScrapeTimeoutLabel: "2s", }), cfg: &config.ScrapeConfig{ - Scheme: "https", - MetricsPath: "/metrics", - JobName: "job", + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), }, res: labels.FromMap(map[string]string{ - model.AddressLabel: "1.2.3.4:80", - model.InstanceLabel: "1.2.3.4:80", - model.SchemeLabel: "http", - model.MetricsPathLabel: "/custom", - model.JobLabel: "custom-job", + model.AddressLabel: "1.2.3.4:80", + model.InstanceLabel: "1.2.3.4:80", + model.SchemeLabel: "http", + model.MetricsPathLabel: "/custom", + model.JobLabel: "custom-job", + model.ScrapeIntervalLabel: "2s", + model.ScrapeTimeoutLabel: "2s", }), resOrig: labels.FromMap(map[string]string{ - model.AddressLabel: "1.2.3.4", - model.SchemeLabel: "http", - model.MetricsPathLabel: "/custom", - model.JobLabel: "custom-job", + model.AddressLabel: "1.2.3.4", + model.SchemeLabel: "http", + model.MetricsPathLabel: "/custom", + model.JobLabel: "custom-job", + model.ScrapeIntervalLabel: "2s", + model.ScrapeTimeoutLabel: "2s", }), }, // Provide instance label. HTTPS port default for IPv6. @@ -99,32 +113,40 @@ func TestPopulateLabels(t *testing.T) { model.InstanceLabel: "custom-instance", }), cfg: &config.ScrapeConfig{ - Scheme: "https", - MetricsPath: "/metrics", - JobName: "job", + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), }, res: labels.FromMap(map[string]string{ - model.AddressLabel: "[::1]:443", - model.InstanceLabel: "custom-instance", - model.SchemeLabel: "https", - model.MetricsPathLabel: "/metrics", - model.JobLabel: "job", + model.AddressLabel: "[::1]:443", + model.InstanceLabel: "custom-instance", + model.SchemeLabel: "https", + model.MetricsPathLabel: "/metrics", + model.JobLabel: "job", + model.ScrapeIntervalLabel: "1s", + model.ScrapeTimeoutLabel: "1s", }), resOrig: labels.FromMap(map[string]string{ - model.AddressLabel: "[::1]", - model.InstanceLabel: "custom-instance", - model.SchemeLabel: "https", - model.MetricsPathLabel: "/metrics", - model.JobLabel: "job", + model.AddressLabel: "[::1]", + model.InstanceLabel: "custom-instance", + model.SchemeLabel: "https", + model.MetricsPathLabel: "/metrics", + model.JobLabel: "job", + model.ScrapeIntervalLabel: "1s", + model.ScrapeTimeoutLabel: "1s", }), }, // Address label missing. { in: labels.FromStrings("custom", "value"), cfg: &config.ScrapeConfig{ - Scheme: "https", - MetricsPath: "/metrics", - JobName: "job", + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), }, res: nil, resOrig: nil, @@ -134,9 +156,11 @@ func TestPopulateLabels(t *testing.T) { { in: labels.FromStrings("custom", "host:1234"), cfg: &config.ScrapeConfig{ - Scheme: "https", - MetricsPath: "/metrics", - JobName: "job", + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), RelabelConfigs: []*relabel.Config{ { Action: relabel.Replace, @@ -148,27 +172,33 @@ func TestPopulateLabels(t *testing.T) { }, }, res: labels.FromMap(map[string]string{ - model.AddressLabel: "host:1234", - model.InstanceLabel: "host:1234", - model.SchemeLabel: "https", - model.MetricsPathLabel: "/metrics", - model.JobLabel: "job", - "custom": "host:1234", + model.AddressLabel: "host:1234", + model.InstanceLabel: "host:1234", + model.SchemeLabel: "https", + model.MetricsPathLabel: "/metrics", + model.JobLabel: "job", + model.ScrapeIntervalLabel: "1s", + model.ScrapeTimeoutLabel: "1s", + "custom": "host:1234", }), resOrig: labels.FromMap(map[string]string{ - model.SchemeLabel: "https", - model.MetricsPathLabel: "/metrics", - model.JobLabel: "job", - "custom": "host:1234", + model.SchemeLabel: "https", + model.MetricsPathLabel: "/metrics", + model.JobLabel: "job", + model.ScrapeIntervalLabel: "1s", + model.ScrapeTimeoutLabel: "1s", + "custom": "host:1234", }), }, // Address label missing, but added in relabelling. { in: labels.FromStrings("custom", "host:1234"), cfg: &config.ScrapeConfig{ - Scheme: "https", - MetricsPath: "/metrics", - JobName: "job", + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), RelabelConfigs: []*relabel.Config{ { Action: relabel.Replace, @@ -180,18 +210,22 @@ func TestPopulateLabels(t *testing.T) { }, }, res: labels.FromMap(map[string]string{ - model.AddressLabel: "host:1234", - model.InstanceLabel: "host:1234", - model.SchemeLabel: "https", - model.MetricsPathLabel: "/metrics", - model.JobLabel: "job", - "custom": "host:1234", + model.AddressLabel: "host:1234", + model.InstanceLabel: "host:1234", + model.SchemeLabel: "https", + model.MetricsPathLabel: "/metrics", + model.JobLabel: "job", + model.ScrapeIntervalLabel: "1s", + model.ScrapeTimeoutLabel: "1s", + "custom": "host:1234", }), resOrig: labels.FromMap(map[string]string{ - model.SchemeLabel: "https", - model.MetricsPathLabel: "/metrics", - model.JobLabel: "job", - "custom": "host:1234", + model.SchemeLabel: "https", + model.MetricsPathLabel: "/metrics", + model.JobLabel: "job", + model.ScrapeIntervalLabel: "1s", + model.ScrapeTimeoutLabel: "1s", + "custom": "host:1234", }), }, // Invalid UTF-8 in label. @@ -201,14 +235,102 @@ func TestPopulateLabels(t *testing.T) { "custom": "\xbd", }), cfg: &config.ScrapeConfig{ - Scheme: "https", - MetricsPath: "/metrics", - JobName: "job", + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), }, res: nil, resOrig: nil, err: "invalid label value for \"custom\": \"\\xbd\"", }, + // Invalid duration in interval label. + { + in: labels.FromMap(map[string]string{ + model.AddressLabel: "1.2.3.4:1000", + model.ScrapeIntervalLabel: "2notseconds", + }), + cfg: &config.ScrapeConfig{ + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), + }, + res: nil, + resOrig: nil, + err: "error parsing scrape interval: not a valid duration string: \"2notseconds\"", + }, + // Invalid duration in timeout label. + { + in: labels.FromMap(map[string]string{ + model.AddressLabel: "1.2.3.4:1000", + model.ScrapeTimeoutLabel: "2notseconds", + }), + cfg: &config.ScrapeConfig{ + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), + }, + res: nil, + resOrig: nil, + err: "error parsing scrape timeout: not a valid duration string: \"2notseconds\"", + }, + // 0 interval in timeout label. + { + in: labels.FromMap(map[string]string{ + model.AddressLabel: "1.2.3.4:1000", + model.ScrapeIntervalLabel: "0s", + }), + cfg: &config.ScrapeConfig{ + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), + }, + res: nil, + resOrig: nil, + err: "scrape interval cannot be 0", + }, + // 0 duration in timeout label. + { + in: labels.FromMap(map[string]string{ + model.AddressLabel: "1.2.3.4:1000", + model.ScrapeTimeoutLabel: "0s", + }), + cfg: &config.ScrapeConfig{ + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), + }, + res: nil, + resOrig: nil, + err: "scrape timeout cannot be 0", + }, + // Timeout less than interval. + { + in: labels.FromMap(map[string]string{ + model.AddressLabel: "1.2.3.4:1000", + model.ScrapeIntervalLabel: "1s", + model.ScrapeTimeoutLabel: "2s", + }), + cfg: &config.ScrapeConfig{ + Scheme: "https", + MetricsPath: "/metrics", + JobName: "job", + ScrapeInterval: model.Duration(time.Second), + ScrapeTimeout: model.Duration(time.Second), + }, + res: nil, + resOrig: nil, + err: "scrape timeout cannot be greater than scrape interval (\"2s\" > \"1s\")", + }, } for _, c := range cases { in := c.in.Copy() diff --git a/scrape/scrape.go b/scrape/scrape.go index 6835a23b2..966069197 100644 --- a/scrape/scrape.go +++ b/scrape/scrape.go @@ -253,6 +253,8 @@ type scrapeLoopOptions struct { labelLimits *labelLimits honorLabels bool honorTimestamps bool + interval time.Duration + timeout time.Duration mrc []*relabel.Config cache *scrapeCache } @@ -307,6 +309,8 @@ func newScrapePool(cfg *config.ScrapeConfig, app storage.Appendable, jitterSeed jitterSeed, opts.honorTimestamps, opts.labelLimits, + opts.interval, + opts.timeout, ) } @@ -414,6 +418,7 @@ func (sp *scrapePool) reload(cfg *config.ScrapeConfig) error { } else { cache = newScrapeCache() } + var ( t = sp.activeTargets[fp] s = &targetScraper{Target: t, client: sp.client, timeout: timeout, bodySizeLimit: bodySizeLimit} @@ -426,6 +431,8 @@ func (sp *scrapePool) reload(cfg *config.ScrapeConfig) error { honorTimestamps: honorTimestamps, mrc: mrc, cache: cache, + interval: interval, + timeout: timeout, }) ) wg.Add(1) @@ -435,7 +442,7 @@ func (sp *scrapePool) reload(cfg *config.ScrapeConfig) error { wg.Done() newLoop.setForcedError(forcedErr) - newLoop.run(interval, timeout, nil) + newLoop.run(nil) }(oldLoop, newLoop) sp.loops[fp] = newLoop @@ -509,6 +516,12 @@ func (sp *scrapePool) sync(targets []*Target) { hash := t.hash() if _, ok := sp.activeTargets[hash]; !ok { + // The scrape interval and timeout labels are set to the config's values initially, + // so whether changed via relabeling or not, they'll exist and hold the correct values + // for every target. + var err error + interval, timeout, err = t.intervalAndTimeout(interval, timeout) + s := &targetScraper{Target: t, client: sp.client, timeout: timeout, bodySizeLimit: bodySizeLimit} l := sp.newLoop(scrapeLoopOptions{ target: t, @@ -518,7 +531,12 @@ func (sp *scrapePool) sync(targets []*Target) { honorLabels: honorLabels, honorTimestamps: honorTimestamps, mrc: mrc, + interval: interval, + timeout: timeout, }) + if err != nil { + l.setForcedError(err) + } sp.activeTargets[hash] = t sp.loops[hash] = l @@ -560,7 +578,7 @@ func (sp *scrapePool) sync(targets []*Target) { } for _, l := range uniqueLoops { if l != nil { - go l.run(interval, timeout, nil) + go l.run(nil) } } // Wait for all potentially stopped scrapers to terminate. @@ -772,7 +790,7 @@ func (s *targetScraper) scrape(ctx context.Context, w io.Writer) (string, error) // A loop can run and be stopped again. It must not be reused after it was stopped. type loop interface { - run(interval, timeout time.Duration, errc chan<- error) + run(errc chan<- error) setForcedError(err error) stop() getCache() *scrapeCache @@ -797,6 +815,8 @@ type scrapeLoop struct { forcedErr error forcedErrMtx sync.Mutex labelLimits *labelLimits + interval time.Duration + timeout time.Duration appender func(ctx context.Context) storage.Appender sampleMutator labelsMutator @@ -1065,6 +1085,8 @@ func newScrapeLoop(ctx context.Context, jitterSeed uint64, honorTimestamps bool, labelLimits *labelLimits, + interval time.Duration, + timeout time.Duration, ) *scrapeLoop { if l == nil { l = log.NewNopLogger() @@ -1088,15 +1110,17 @@ func newScrapeLoop(ctx context.Context, parentCtx: ctx, honorTimestamps: honorTimestamps, labelLimits: labelLimits, + interval: interval, + timeout: timeout, } sl.ctx, sl.cancel = context.WithCancel(ctx) return sl } -func (sl *scrapeLoop) run(interval, timeout time.Duration, errc chan<- error) { +func (sl *scrapeLoop) run(errc chan<- error) { select { - case <-time.After(sl.scraper.offset(interval, sl.jitterSeed)): + case <-time.After(sl.scraper.offset(sl.interval, sl.jitterSeed)): // Continue after a scraping offset. case <-sl.ctx.Done(): close(sl.stopped) @@ -1106,7 +1130,7 @@ func (sl *scrapeLoop) run(interval, timeout time.Duration, errc chan<- error) { var last time.Time alignedScrapeTime := time.Now().Round(0) - ticker := time.NewTicker(interval) + ticker := time.NewTicker(sl.interval) defer ticker.Stop() mainLoop: @@ -1126,11 +1150,11 @@ mainLoop: // Calling Round ensures the time used is the wall clock, as otherwise .Sub // and .Add on time.Time behave differently (see time package docs). scrapeTime := time.Now().Round(0) - if AlignScrapeTimestamps && interval > 100*scrapeTimestampTolerance { + if AlignScrapeTimestamps && sl.interval > 100*scrapeTimestampTolerance { // For some reason, a tick might have been skipped, in which case we // would call alignedScrapeTime.Add(interval) multiple times. - for scrapeTime.Sub(alignedScrapeTime) >= interval { - alignedScrapeTime = alignedScrapeTime.Add(interval) + for scrapeTime.Sub(alignedScrapeTime) >= sl.interval { + alignedScrapeTime = alignedScrapeTime.Add(sl.interval) } // Align the scrape time if we are in the tolerance boundaries. if scrapeTime.Sub(alignedScrapeTime) <= scrapeTimestampTolerance { @@ -1138,7 +1162,7 @@ mainLoop: } } - last = sl.scrapeAndReport(interval, timeout, last, scrapeTime, errc) + last = sl.scrapeAndReport(sl.interval, sl.timeout, last, scrapeTime, errc) select { case <-sl.parentCtx.Done(): @@ -1153,7 +1177,7 @@ mainLoop: close(sl.stopped) if !sl.disabledEndOfRunStalenessMarkers { - sl.endOfRunStaleness(last, ticker, interval) + sl.endOfRunStaleness(last, ticker, sl.interval) } } diff --git a/scrape/scrape_test.go b/scrape/scrape_test.go index 7c95b61a5..a78fc2938 100644 --- a/scrape/scrape_test.go +++ b/scrape/scrape_test.go @@ -93,7 +93,7 @@ func TestDroppedTargetsList(t *testing.T) { }, } sp, _ = newScrapePool(cfg, app, 0, nil) - expectedLabelSetString = "{__address__=\"127.0.0.1:9090\", job=\"dropMe\"}" + expectedLabelSetString = "{__address__=\"127.0.0.1:9090\", __scrape_interval__=\"0s\", __scrape_timeout__=\"0s\", job=\"dropMe\"}" expectedLength = 1 ) sp.Sync(tgs) @@ -146,14 +146,16 @@ type testLoop struct { forcedErr error forcedErrMtx sync.Mutex runOnce bool + interval time.Duration + timeout time.Duration } -func (l *testLoop) run(interval, timeout time.Duration, errc chan<- error) { +func (l *testLoop) run(errc chan<- error) { if l.runOnce { panic("loop must be started only once") } l.runOnce = true - l.startFunc(interval, timeout, errc) + l.startFunc(l.interval, l.timeout, errc) } func (l *testLoop) disableEndOfRunStalenessMarkers() { @@ -250,7 +252,7 @@ func TestScrapePoolReload(t *testing.T) { // On starting to run, new loops created on reload check whether their preceding // equivalents have been stopped. newLoop := func(opts scrapeLoopOptions) loop { - l := &testLoop{} + l := &testLoop{interval: time.Duration(reloadCfg.ScrapeInterval), timeout: time.Duration(reloadCfg.ScrapeTimeout)} l.startFunc = func(interval, timeout time.Duration, errc chan<- error) { require.Equal(t, 3*time.Second, interval, "Unexpected scrape interval") require.Equal(t, 2*time.Second, timeout, "Unexpected scrape timeout") @@ -276,8 +278,10 @@ func TestScrapePoolReload(t *testing.T) { // one terminated. for i := 0; i < numTargets; i++ { + labels := labels.FromStrings(model.AddressLabel, fmt.Sprintf("example.com:%d", i)) t := &Target{ - labels: labels.FromStrings(model.AddressLabel, fmt.Sprintf("example.com:%d", i)), + labels: labels, + discoveredLabels: labels, } l := &testLoop{} l.stopFunc = func() { @@ -342,7 +346,7 @@ func TestScrapePoolTargetLimit(t *testing.T) { activeTargets: map[uint64]*Target{}, loops: map[uint64]loop{}, newLoop: newLoop, - logger: nil, + logger: log.NewNopLogger(), client: http.DefaultClient, } @@ -488,8 +492,8 @@ func TestScrapePoolAppender(t *testing.T) { } func TestScrapePoolRaces(t *testing.T) { - interval, _ := model.ParseDuration("500ms") - timeout, _ := model.ParseDuration("1s") + interval, _ := model.ParseDuration("1s") + timeout, _ := model.ParseDuration("500ms") newConfig := func() *config.ScrapeConfig { return &config.ScrapeConfig{ScrapeInterval: interval, ScrapeTimeout: timeout} } @@ -583,6 +587,8 @@ func TestScrapeLoopStopBeforeRun(t *testing.T) { nil, nil, 0, true, nil, + 1, + 0, ) // The scrape pool synchronizes on stopping scrape loops. However, new scrape @@ -611,7 +617,7 @@ func TestScrapeLoopStopBeforeRun(t *testing.T) { runDone := make(chan struct{}) go func() { - sl.run(1, 0, nil) + sl.run(nil) close(runDone) }() @@ -648,6 +654,8 @@ func TestScrapeLoopStop(t *testing.T) { 0, true, nil, + 10*time.Millisecond, + time.Hour, ) // Terminate loop after 2 scrapes. @@ -664,7 +672,7 @@ func TestScrapeLoopStop(t *testing.T) { } go func() { - sl.run(10*time.Millisecond, time.Hour, nil) + sl.run(nil) signal <- struct{}{} }() @@ -716,6 +724,8 @@ func TestScrapeLoopRun(t *testing.T) { 0, true, nil, + time.Second, + time.Hour, ) // The loop must terminate during the initial offset if the context @@ -723,7 +733,7 @@ func TestScrapeLoopRun(t *testing.T) { scraper.offsetDur = time.Hour go func() { - sl.run(time.Second, time.Hour, errc) + sl.run(errc) signal <- struct{}{} }() @@ -764,10 +774,12 @@ func TestScrapeLoopRun(t *testing.T) { 0, true, nil, + time.Second, + 100*time.Millisecond, ) go func() { - sl.run(time.Second, 100*time.Millisecond, errc) + sl.run(errc) signal <- struct{}{} }() @@ -816,6 +828,8 @@ func TestScrapeLoopForcedErr(t *testing.T) { 0, true, nil, + time.Second, + time.Hour, ) forcedErr := fmt.Errorf("forced err") @@ -827,7 +841,7 @@ func TestScrapeLoopForcedErr(t *testing.T) { } go func() { - sl.run(time.Second, time.Hour, errc) + sl.run(errc) signal <- struct{}{} }() @@ -867,6 +881,8 @@ func TestScrapeLoopMetadata(t *testing.T) { 0, true, nil, + 0, + 0, ) defer cancel() @@ -917,6 +933,8 @@ func TestScrapeLoopSeriesAdded(t *testing.T) { 0, true, nil, + 0, + 0, ) defer cancel() @@ -956,6 +974,8 @@ func TestScrapeLoopRunCreatesStaleMarkersOnFailedScrape(t *testing.T) { 0, true, nil, + 10*time.Millisecond, + time.Hour, ) // Succeed once, several failures, then stop. numScrapes := 0 @@ -973,7 +993,7 @@ func TestScrapeLoopRunCreatesStaleMarkersOnFailedScrape(t *testing.T) { } go func() { - sl.run(10*time.Millisecond, time.Hour, nil) + sl.run(nil) signal <- struct{}{} }() @@ -1011,6 +1031,8 @@ func TestScrapeLoopRunCreatesStaleMarkersOnParseFailure(t *testing.T) { 0, true, nil, + 10*time.Millisecond, + time.Hour, ) // Succeed once, several failures, then stop. @@ -1030,7 +1052,7 @@ func TestScrapeLoopRunCreatesStaleMarkersOnParseFailure(t *testing.T) { } go func() { - sl.run(10*time.Millisecond, time.Hour, nil) + sl.run(nil) signal <- struct{}{} }() @@ -1070,6 +1092,8 @@ func TestScrapeLoopCache(t *testing.T) { 0, true, nil, + 10*time.Millisecond, + time.Hour, ) numScrapes := 0 @@ -1106,7 +1130,7 @@ func TestScrapeLoopCache(t *testing.T) { } go func() { - sl.run(10*time.Millisecond, time.Hour, nil) + sl.run(nil) signal <- struct{}{} }() @@ -1145,6 +1169,8 @@ func TestScrapeLoopCacheMemoryExhaustionProtection(t *testing.T) { 0, true, nil, + 10*time.Millisecond, + time.Hour, ) numScrapes := 0 @@ -1164,7 +1190,7 @@ func TestScrapeLoopCacheMemoryExhaustionProtection(t *testing.T) { } go func() { - sl.run(10*time.Millisecond, time.Hour, nil) + sl.run(nil) signal <- struct{}{} }() @@ -1252,6 +1278,8 @@ func TestScrapeLoopAppend(t *testing.T) { 0, true, nil, + 0, + 0, ) now := time.Now() @@ -1294,6 +1322,8 @@ func TestScrapeLoopAppendCacheEntryButErrNotFound(t *testing.T) { 0, true, nil, + 0, + 0, ) fakeRef := uint64(1) @@ -1344,6 +1374,8 @@ func TestScrapeLoopAppendSampleLimit(t *testing.T) { 0, true, nil, + 0, + 0, ) // Get the value of the Counter before performing the append. @@ -1414,6 +1446,8 @@ func TestScrapeLoop_ChangingMetricString(t *testing.T) { 0, true, nil, + 0, + 0, ) now := time.Now() @@ -1455,6 +1489,8 @@ func TestScrapeLoopAppendStaleness(t *testing.T) { 0, true, nil, + 0, + 0, ) now := time.Now() @@ -1499,6 +1535,8 @@ func TestScrapeLoopAppendNoStalenessIfTimestamp(t *testing.T) { 0, true, nil, + 0, + 0, ) now := time.Now() @@ -1601,6 +1639,8 @@ metric_total{n="2"} 2 # {t="2"} 2.0 20000 0, true, nil, + 0, + 0, ) now := time.Now() @@ -1659,6 +1699,8 @@ func TestScrapeLoopAppendExemplarSeries(t *testing.T) { 0, true, nil, + 0, + 0, ) now := time.Now() @@ -1704,6 +1746,8 @@ func TestScrapeLoopRunReportsTargetDownOnScrapeError(t *testing.T) { 0, true, nil, + 10*time.Millisecond, + time.Hour, ) scraper.scrapeFunc = func(ctx context.Context, w io.Writer) error { @@ -1711,7 +1755,7 @@ func TestScrapeLoopRunReportsTargetDownOnScrapeError(t *testing.T) { return errors.New("scrape failed") } - sl.run(10*time.Millisecond, time.Hour, nil) + sl.run(nil) require.Equal(t, 0.0, appender.result[0].v, "bad 'up' value") } @@ -1733,6 +1777,8 @@ func TestScrapeLoopRunReportsTargetDownOnInvalidUTF8(t *testing.T) { 0, true, nil, + 10*time.Millisecond, + time.Hour, ) scraper.scrapeFunc = func(ctx context.Context, w io.Writer) error { @@ -1741,7 +1787,7 @@ func TestScrapeLoopRunReportsTargetDownOnInvalidUTF8(t *testing.T) { return nil } - sl.run(10*time.Millisecond, time.Hour, nil) + sl.run(nil) require.Equal(t, 0.0, appender.result[0].v, "bad 'up' value") } @@ -1775,6 +1821,8 @@ func TestScrapeLoopAppendGracefullyIfAmendOrOutOfOrderOrOutOfBounds(t *testing.T 0, true, nil, + 0, + 0, ) now := time.Unix(1, 0) @@ -1813,6 +1861,8 @@ func TestScrapeLoopOutOfBoundsTimeError(t *testing.T) { 0, true, nil, + 0, + 0, ) now := time.Now().Add(20 * time.Minute) @@ -2064,6 +2114,8 @@ func TestScrapeLoop_RespectTimestamps(t *testing.T) { nil, 0, true, nil, + 0, + 0, ) now := time.Now() @@ -2098,6 +2150,8 @@ func TestScrapeLoop_DiscardTimestamps(t *testing.T) { nil, 0, false, nil, + 0, + 0, ) now := time.Now() @@ -2131,6 +2185,8 @@ func TestScrapeLoopDiscardDuplicateLabels(t *testing.T) { 0, true, nil, + 0, + 0, ) defer cancel() @@ -2182,6 +2238,8 @@ func TestScrapeLoopDiscardUnnamedMetrics(t *testing.T) { 0, true, nil, + 0, + 0, ) defer cancel() @@ -2400,6 +2458,8 @@ func TestScrapeAddFast(t *testing.T) { 0, true, nil, + 0, + 0, ) defer cancel() @@ -2484,6 +2544,8 @@ func TestScrapeReportSingleAppender(t *testing.T) { 0, true, nil, + 10*time.Millisecond, + time.Hour, ) numScrapes := 0 @@ -2498,7 +2560,7 @@ func TestScrapeReportSingleAppender(t *testing.T) { } go func() { - sl.run(10*time.Millisecond, time.Hour, nil) + sl.run(nil) signal <- struct{}{} }() @@ -2613,6 +2675,8 @@ func TestScrapeLoopLabelLimit(t *testing.T) { 0, true, &test.labelLimits, + 0, + 0, ) slApp := sl.appender(context.Background()) @@ -2627,3 +2691,40 @@ func TestScrapeLoopLabelLimit(t *testing.T) { } } } + +func TestTargetScrapeIntervalAndTimeoutRelabel(t *testing.T) { + interval, _ := model.ParseDuration("2s") + timeout, _ := model.ParseDuration("500ms") + config := &config.ScrapeConfig{ + ScrapeInterval: interval, + ScrapeTimeout: timeout, + RelabelConfigs: []*relabel.Config{ + { + SourceLabels: model.LabelNames{model.ScrapeIntervalLabel}, + Regex: relabel.MustNewRegexp("2s"), + Replacement: "3s", + TargetLabel: model.ScrapeIntervalLabel, + Action: relabel.Replace, + }, + { + SourceLabels: model.LabelNames{model.ScrapeTimeoutLabel}, + Regex: relabel.MustNewRegexp("500ms"), + Replacement: "750ms", + TargetLabel: model.ScrapeTimeoutLabel, + Action: relabel.Replace, + }, + }, + } + sp, _ := newScrapePool(config, &nopAppendable{}, 0, nil) + tgts := []*targetgroup.Group{ + { + Targets: []model.LabelSet{{model.AddressLabel: "127.0.0.1:9090"}}, + }, + } + + sp.Sync(tgts) + defer sp.stop() + + require.Equal(t, "3s", sp.ActiveTargets()[0].labels.Get(model.ScrapeIntervalLabel)) + require.Equal(t, "750ms", sp.ActiveTargets()[0].labels.Get(model.ScrapeTimeoutLabel)) +} diff --git a/scrape/target.go b/scrape/target.go index 4a7b6eb0f..ada1bcdc5 100644 --- a/scrape/target.go +++ b/scrape/target.go @@ -143,8 +143,18 @@ func (t *Target) SetMetadataStore(s MetricMetadataStore) { // hash returns an identifying hash for the target. func (t *Target) hash() uint64 { h := fnv.New64a() + + // We must build a label set without the scrape interval and timeout + // labels because those aren't defining attributes of a target + // and can be changed without qualifying its parent as a new target, + // therefore they should not effect its unique hash. + l := t.labels.Map() + delete(l, model.ScrapeIntervalLabel) + delete(l, model.ScrapeTimeoutLabel) + lset := labels.FromMap(l) + //nolint: errcheck - h.Write([]byte(fmt.Sprintf("%016d", t.labels.Hash()))) + h.Write([]byte(fmt.Sprintf("%016d", lset.Hash()))) //nolint: errcheck h.Write([]byte(t.URL().String())) @@ -273,6 +283,31 @@ func (t *Target) Health() TargetHealth { return t.health } +// intervalAndTimeout returns the interval and timeout derived from +// the targets labels. +func (t *Target) intervalAndTimeout(defaultInterval, defaultDuration time.Duration) (time.Duration, time.Duration, error) { + t.mtx.RLock() + defer t.mtx.RUnlock() + + intervalLabel := t.labels.Get(model.ScrapeIntervalLabel) + interval, err := model.ParseDuration(intervalLabel) + if err != nil { + return defaultInterval, defaultDuration, errors.Errorf("Error parsing interval label %q: %v", intervalLabel, err) + } + timeoutLabel := t.labels.Get(model.ScrapeTimeoutLabel) + timeout, err := model.ParseDuration(timeoutLabel) + if err != nil { + return defaultInterval, defaultDuration, errors.Errorf("Error parsing timeout label %q: %v", timeoutLabel, err) + } + + return time.Duration(interval), time.Duration(timeout), nil +} + +// GetValue gets a label value from the entire label set. +func (t *Target) GetValue(name string) string { + return t.labels.Get(name) +} + // Targets is a sortable list of targets. type Targets []*Target @@ -329,6 +364,8 @@ func populateLabels(lset labels.Labels, cfg *config.ScrapeConfig) (res, orig lab // Copy labels into the labelset for the target if they are not set already. scrapeLabels := []labels.Label{ {Name: model.JobLabel, Value: cfg.JobName}, + {Name: model.ScrapeIntervalLabel, Value: cfg.ScrapeInterval.String()}, + {Name: model.ScrapeTimeoutLabel, Value: cfg.ScrapeTimeout.String()}, {Name: model.MetricsPathLabel, Value: cfg.MetricsPath}, {Name: model.SchemeLabel, Value: cfg.Scheme}, } @@ -390,6 +427,34 @@ func populateLabels(lset labels.Labels, cfg *config.ScrapeConfig) (res, orig lab return nil, nil, err } + var interval string + var intervalDuration model.Duration + if interval = lset.Get(model.ScrapeIntervalLabel); interval != cfg.ScrapeInterval.String() { + intervalDuration, err = model.ParseDuration(interval) + if err != nil { + return nil, nil, errors.Errorf("error parsing scrape interval: %v", err) + } + if time.Duration(intervalDuration) == 0 { + return nil, nil, errors.New("scrape interval cannot be 0") + } + } + + var timeout string + var timeoutDuration model.Duration + if timeout = lset.Get(model.ScrapeTimeoutLabel); timeout != cfg.ScrapeTimeout.String() { + timeoutDuration, err = model.ParseDuration(timeout) + if err != nil { + return nil, nil, errors.Errorf("error parsing scrape timeout: %v", err) + } + if time.Duration(timeoutDuration) == 0 { + return nil, nil, errors.New("scrape timeout cannot be 0") + } + } + + if timeoutDuration > intervalDuration { + return nil, nil, errors.Errorf("scrape timeout cannot be greater than scrape interval (%q > %q)", timeout, interval) + } + // Meta labels are deleted after relabelling. Other internal labels propagate to // the target which decides whether they will be part of their label set. for _, l := range lset { diff --git a/scrape/target_test.go b/scrape/target_test.go index 6a7a77fec..d17dcc314 100644 --- a/scrape/target_test.go +++ b/scrape/target_test.go @@ -382,3 +382,29 @@ func TestTargetsFromGroup(t *testing.T) { t.Fatalf("Expected error %s, got %s", expectedError, failures[0]) } } + +func TestTargetHash(t *testing.T) { + target1 := &Target{ + labels: labels.Labels{ + {Name: model.AddressLabel, Value: "localhost"}, + {Name: model.SchemeLabel, Value: "http"}, + {Name: model.MetricsPathLabel, Value: "/metrics"}, + {Name: model.ScrapeIntervalLabel, Value: "15s"}, + {Name: model.ScrapeTimeoutLabel, Value: "500ms"}, + }, + } + hash1 := target1.hash() + + target2 := &Target{ + labels: labels.Labels{ + {Name: model.AddressLabel, Value: "localhost"}, + {Name: model.SchemeLabel, Value: "http"}, + {Name: model.MetricsPathLabel, Value: "/metrics"}, + {Name: model.ScrapeIntervalLabel, Value: "14s"}, + {Name: model.ScrapeTimeoutLabel, Value: "600ms"}, + }, + } + hash2 := target2.hash() + + require.Equal(t, hash1, hash2, "Scrape interval and duration labels should not effect hash.") +} diff --git a/web/api/v1/api.go b/web/api/v1/api.go index 745a28c8d..9ef2ad47e 100644 --- a/web/api/v1/api.go +++ b/web/api/v1/api.go @@ -760,6 +760,9 @@ type Target struct { LastScrape time.Time `json:"lastScrape"` LastScrapeDuration float64 `json:"lastScrapeDuration"` Health scrape.TargetHealth `json:"health"` + + ScrapeInterval string `json:"scrapeInterval"` + ScrapeTimeout string `json:"scrapeTimeout"` } // DroppedTarget has the information for one target that was dropped during relabelling. @@ -899,6 +902,8 @@ func (api *API) targets(r *http.Request) apiFuncResult { LastScrape: target.LastScrape(), LastScrapeDuration: target.LastScrapeDuration().Seconds(), Health: target.Health(), + ScrapeInterval: target.GetValue(model.ScrapeIntervalLabel), + ScrapeTimeout: target.GetValue(model.ScrapeTimeoutLabel), }) } } diff --git a/web/api/v1/api_test.go b/web/api/v1/api_test.go index 420889778..b839e61cd 100644 --- a/web/api/v1/api_test.go +++ b/web/api/v1/api_test.go @@ -534,10 +534,12 @@ func setupTestTargetRetriever(t *testing.T) *testTargetRetriever { { Identifier: "test", Labels: labels.FromMap(map[string]string{ - model.SchemeLabel: "http", - model.AddressLabel: "example.com:8080", - model.MetricsPathLabel: "/metrics", - model.JobLabel: "test", + model.SchemeLabel: "http", + model.AddressLabel: "example.com:8080", + model.MetricsPathLabel: "/metrics", + model.JobLabel: "test", + model.ScrapeIntervalLabel: "15s", + model.ScrapeTimeoutLabel: "5s", }), DiscoveredLabels: nil, Params: url.Values{}, @@ -547,10 +549,12 @@ func setupTestTargetRetriever(t *testing.T) *testTargetRetriever { { Identifier: "blackbox", Labels: labels.FromMap(map[string]string{ - model.SchemeLabel: "http", - model.AddressLabel: "localhost:9115", - model.MetricsPathLabel: "/probe", - model.JobLabel: "blackbox", + model.SchemeLabel: "http", + model.AddressLabel: "localhost:9115", + model.MetricsPathLabel: "/probe", + model.JobLabel: "blackbox", + model.ScrapeIntervalLabel: "20s", + model.ScrapeTimeoutLabel: "10s", }), DiscoveredLabels: nil, Params: url.Values{"target": []string{"example.com"}}, @@ -561,10 +565,12 @@ func setupTestTargetRetriever(t *testing.T) *testTargetRetriever { Identifier: "blackbox", Labels: nil, DiscoveredLabels: labels.FromMap(map[string]string{ - model.SchemeLabel: "http", - model.AddressLabel: "http://dropped.example.com:9115", - model.MetricsPathLabel: "/probe", - model.JobLabel: "blackbox", + model.SchemeLabel: "http", + model.AddressLabel: "http://dropped.example.com:9115", + model.MetricsPathLabel: "/probe", + model.JobLabel: "blackbox", + model.ScrapeIntervalLabel: "30s", + model.ScrapeTimeoutLabel: "15s", }), Params: url.Values{}, Active: false, @@ -951,6 +957,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E LastError: "failed: missing port in address", LastScrape: scrapeStart, LastScrapeDuration: 0.1, + ScrapeInterval: "20s", + ScrapeTimeout: "10s", }, { DiscoveredLabels: map[string]string{}, @@ -964,15 +972,19 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E LastError: "", LastScrape: scrapeStart, LastScrapeDuration: 0.07, + ScrapeInterval: "15s", + ScrapeTimeout: "5s", }, }, DroppedTargets: []*DroppedTarget{ { DiscoveredLabels: map[string]string{ - "__address__": "http://dropped.example.com:9115", - "__metrics_path__": "/probe", - "__scheme__": "http", - "job": "blackbox", + "__address__": "http://dropped.example.com:9115", + "__metrics_path__": "/probe", + "__scheme__": "http", + "job": "blackbox", + "__scrape_interval__": "30s", + "__scrape_timeout__": "15s", }, }, }, @@ -997,6 +1009,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E LastError: "failed: missing port in address", LastScrape: scrapeStart, LastScrapeDuration: 0.1, + ScrapeInterval: "20s", + ScrapeTimeout: "10s", }, { DiscoveredLabels: map[string]string{}, @@ -1010,15 +1024,19 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E LastError: "", LastScrape: scrapeStart, LastScrapeDuration: 0.07, + ScrapeInterval: "15s", + ScrapeTimeout: "5s", }, }, DroppedTargets: []*DroppedTarget{ { DiscoveredLabels: map[string]string{ - "__address__": "http://dropped.example.com:9115", - "__metrics_path__": "/probe", - "__scheme__": "http", - "job": "blackbox", + "__address__": "http://dropped.example.com:9115", + "__metrics_path__": "/probe", + "__scheme__": "http", + "job": "blackbox", + "__scrape_interval__": "30s", + "__scrape_timeout__": "15s", }, }, }, @@ -1043,6 +1061,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E LastError: "failed: missing port in address", LastScrape: scrapeStart, LastScrapeDuration: 0.1, + ScrapeInterval: "20s", + ScrapeTimeout: "10s", }, { DiscoveredLabels: map[string]string{}, @@ -1056,6 +1076,8 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E LastError: "", LastScrape: scrapeStart, LastScrapeDuration: 0.07, + ScrapeInterval: "15s", + ScrapeTimeout: "5s", }, }, DroppedTargets: []*DroppedTarget{}, @@ -1071,10 +1093,12 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E DroppedTargets: []*DroppedTarget{ { DiscoveredLabels: map[string]string{ - "__address__": "http://dropped.example.com:9115", - "__metrics_path__": "/probe", - "__scheme__": "http", - "job": "blackbox", + "__address__": "http://dropped.example.com:9115", + "__metrics_path__": "/probe", + "__scheme__": "http", + "job": "blackbox", + "__scrape_interval__": "30s", + "__scrape_timeout__": "15s", }, }, }, diff --git a/web/ui/react-app/src/pages/targets/ScrapePoolList.test.tsx b/web/ui/react-app/src/pages/targets/ScrapePoolList.test.tsx index 2ae951707..b1b296235 100644 --- a/web/ui/react-app/src/pages/targets/ScrapePoolList.test.tsx +++ b/web/ui/react-app/src/pages/targets/ScrapePoolList.test.tsx @@ -25,6 +25,9 @@ describe('ScrapePoolList', () => { const div = document.createElement('div'); div.id = `series-labels-${pool}-${idx}`; document.body.appendChild(div); + const div2 = document.createElement('div'); + div2.id = `scrape-duration-${pool}-${idx}`; + document.body.appendChild(div2); }); }); mock = fetchMock.mockResponse(JSON.stringify(sampleApiResponse)); diff --git a/web/ui/react-app/src/pages/targets/ScrapePoolPanel.test.tsx b/web/ui/react-app/src/pages/targets/ScrapePoolPanel.test.tsx index 6feec33a9..90b858be1 100644 --- a/web/ui/react-app/src/pages/targets/ScrapePoolPanel.test.tsx +++ b/web/ui/react-app/src/pages/targets/ScrapePoolPanel.test.tsx @@ -57,6 +57,9 @@ describe('ScrapePoolPanel', () => { const div = document.createElement('div'); div.id = `series-labels-prometheus-0`; document.body.appendChild(div); + const div2 = document.createElement('div'); + div2.id = `scrape-duration-prometheus-0`; + document.body.appendChild(div2); const scrapePoolPanel = mount(); const btn = scrapePoolPanel.find(Button); diff --git a/web/ui/react-app/src/pages/targets/ScrapePoolPanel.tsx b/web/ui/react-app/src/pages/targets/ScrapePoolPanel.tsx index 0fe90c490..246da42e3 100644 --- a/web/ui/react-app/src/pages/targets/ScrapePoolPanel.tsx +++ b/web/ui/react-app/src/pages/targets/ScrapePoolPanel.tsx @@ -5,9 +5,10 @@ import styles from './ScrapePoolPanel.module.css'; import { Target } from './target'; import EndpointLink from './EndpointLink'; import TargetLabels from './TargetLabels'; +import TargetScrapeDuration from './TargetScrapeDuration'; import { now } from 'moment'; import { ToggleMoreLess } from '../../components/ToggleMoreLess'; -import { formatRelative, humanizeDuration } from '../../utils'; +import { formatRelative } from '../../utils'; interface PanelProps { scrapePool: string; @@ -54,6 +55,8 @@ const ScrapePoolPanel: FC = ({ scrapePool, targetGroup, expanded, to lastScrape, lastScrapeDuration, health, + scrapeInterval, + scrapeTimeout, } = target; const color = getColor(health); @@ -69,7 +72,15 @@ const ScrapePoolPanel: FC = ({ scrapePool, targetGroup, expanded, to {formatRelative(lastScrape, now())} - {humanizeDuration(lastScrapeDuration * 1000)} + + + {lastError ? {lastError} : null} ); diff --git a/web/ui/react-app/src/pages/targets/TargetScrapeDuration.tsx b/web/ui/react-app/src/pages/targets/TargetScrapeDuration.tsx new file mode 100644 index 000000000..66fac4e08 --- /dev/null +++ b/web/ui/react-app/src/pages/targets/TargetScrapeDuration.tsx @@ -0,0 +1,41 @@ +import React, { FC, Fragment, useState } from 'react'; +import { Tooltip } from 'reactstrap'; +import 'css.escape'; +import { humanizeDuration } from '../../utils'; + +export interface TargetScrapeDurationProps { + duration: number; + interval: string; + timeout: string; + idx: number; + scrapePool: string; +} + +const TargetScrapeDuration: FC = ({ duration, interval, timeout, idx, scrapePool }) => { + const [scrapeTooltipOpen, setScrapeTooltipOpen] = useState(false); + const id = `scrape-duration-${scrapePool}-${idx}`; + + return ( + <> +
+ {humanizeDuration(duration * 1000)} +
+ setScrapeTooltipOpen(!scrapeTooltipOpen)} + target={CSS.escape(id)} + style={{ maxWidth: 'none', textAlign: 'left' }} + > + + Interval: {interval} +
+ + + Timeout: {timeout} + + + + ); +}; + +export default TargetScrapeDuration; diff --git a/web/ui/react-app/src/pages/targets/__testdata__/testdata.ts b/web/ui/react-app/src/pages/targets/__testdata__/testdata.ts index 53f6a7e48..b0838b72e 100644 --- a/web/ui/react-app/src/pages/targets/__testdata__/testdata.ts +++ b/web/ui/react-app/src/pages/targets/__testdata__/testdata.ts @@ -25,6 +25,8 @@ export const targetGroups: ScrapePools = Object.freeze({ lastScrape: '2019-11-04T11:52:14.759299-07:00', lastScrapeDuration: 36560147, health: 'up', + scrapeInterval: '15s', + scrapeTimeout: '500ms', }, { discoveredLabels: { @@ -45,6 +47,8 @@ export const targetGroups: ScrapePools = Object.freeze({ lastScrape: '2019-11-04T11:52:24.731096-07:00', lastScrapeDuration: 49448763, health: 'up', + scrapeInterval: '15s', + scrapeTimeout: '500ms', }, { discoveredLabels: { @@ -65,6 +69,8 @@ export const targetGroups: ScrapePools = Object.freeze({ lastScrape: '2019-11-04T11:52:13.516654-07:00', lastScrapeDuration: 120916592, health: 'down', + scrapeInterval: '15s', + scrapeTimeout: '500ms', }, ], }, @@ -89,6 +95,8 @@ export const targetGroups: ScrapePools = Object.freeze({ lastScrape: '2019-11-04T11:52:14.145703-07:00', lastScrapeDuration: 3842307, health: 'up', + scrapeInterval: '15s', + scrapeTimeout: '500ms', }, ], }, @@ -113,6 +121,8 @@ export const targetGroups: ScrapePools = Object.freeze({ lastScrape: '2019-11-04T11:52:18.479731-07:00', lastScrapeDuration: 4050976, health: 'up', + scrapeInterval: '15s', + scrapeTimeout: '500ms', }, ], }, diff --git a/web/ui/react-app/src/pages/targets/target.ts b/web/ui/react-app/src/pages/targets/target.ts index 909c67e7b..faa89bb18 100644 --- a/web/ui/react-app/src/pages/targets/target.ts +++ b/web/ui/react-app/src/pages/targets/target.ts @@ -12,6 +12,8 @@ export interface Target { lastScrape: string; lastScrapeDuration: number; health: string; + scrapeInterval: string; + scrapeTimeout: string; } export interface DroppedTarget {