From b904ae3722d874f6c993a6ce86039b8059fd235a Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Mon, 14 Dec 2020 14:19:58 +0200 Subject: [PATCH] lib/promscrape: add missing whitespace between duration and `ago` word at `/targets` page --- lib/promscrape/targets_response.qtpl | 6 +++--- lib/promscrape/targets_response.qtpl.go | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/promscrape/targets_response.qtpl b/lib/promscrape/targets_response.qtpl index 7f3d1efe3..f1fa91f9b 100644 --- a/lib/promscrape/targets_response.qtpl +++ b/lib/promscrape/targets_response.qtpl @@ -17,7 +17,7 @@ job={%q= js.job %}{% space %} ({%d js.upCount %}/{%d js.targetsTotal %} {% space {% space %} endpoint={%s= ts.endpoint %}, {% space %} labels={%s= labels %} {% if showOriginLabels %},{% space %} originalLabels={%s= ol %}{% endif %}, - {% space %} last_scrape={%f.3 ts.lastScrapeTime.Seconds() %}s ago, + {% space %} last_scrape={%f.3 ts.lastScrapeTime.Seconds() %}s {% space %} ago, {% space %} scrape_duration={%f.3 float64(ts.scrapeDuration.Seconds()) %}s, {% space %} error={%q= ts.error %} {% newline %} @@ -83,7 +83,7 @@ job={%q= js.job %}{% space %} ({%d js.upCount %}/{%d js.targetsTotal %} {% space {%= formatLabel(ts.labels) %} - {%s ts.lastScrapeTime.String() %} ago + {%s ts.lastScrapeTime.String() %} {% space %} ago {%s ts.scrapeDuration.String() %} {%s= ts.error %} @@ -101,4 +101,4 @@ job={%q= js.job %}{% space %} ({%d js.upCount %}/{%d js.targetsTotal %} {% space {% space %} {%s label.Name %}={%q label.Value %} {% space %} {% endfor %} {% endfunc %} -{% endstripspace %} \ No newline at end of file +{% endstripspace %} diff --git a/lib/promscrape/targets_response.qtpl.go b/lib/promscrape/targets_response.qtpl.go index f5e319f06..b0472bddb 100644 --- a/lib/promscrape/targets_response.qtpl.go +++ b/lib/promscrape/targets_response.qtpl.go @@ -102,7 +102,11 @@ func StreamTargetsResponsePlain(qw422016 *qt422016.Writer, jts []jobTargetsStatu //line lib/promscrape/targets_response.qtpl:20 qw422016.N().FPrec(ts.lastScrapeTime.Seconds(), 3) //line lib/promscrape/targets_response.qtpl:20 - qw422016.N().S(`s ago,`) + qw422016.N().S(`s`) +//line lib/promscrape/targets_response.qtpl:20 + qw422016.N().S(` `) +//line lib/promscrape/targets_response.qtpl:20 + qw422016.N().S(`ago,`) //line lib/promscrape/targets_response.qtpl:21 qw422016.N().S(` `) //line lib/promscrape/targets_response.qtpl:21 @@ -250,6 +254,8 @@ func StreamTargetsResponseHTML(qw422016 *qt422016.Writer, jts []jobTargetsStatus qw422016.N().S(``) //line lib/promscrape/targets_response.qtpl:86 qw422016.E().S(ts.lastScrapeTime.String()) +//line lib/promscrape/targets_response.qtpl:86 + qw422016.N().S(` `) //line lib/promscrape/targets_response.qtpl:86 qw422016.N().S(`ago`) //line lib/promscrape/targets_response.qtpl:87