github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

vmctl/vm: added datapoints collection bar (#2486)

Browse source 
add progress bars to the VM importer

The new progress bars supposed to display the processing speed per each
VM importer worker. This info should help to identify if there is a bottleneck
on the VM side during the import process, without waiting for its finish.
The new progress bars can be disabled by passing `vm-disable-progress-bar` flag.

Plotting multiple progress bars requires using experimental progress bar pool
from github.com/cheggaaa/pb/v3. Switch to progress bar pool required changes
in all import modes.

The openTSDB mode wasn't changed due to its implementation, which implies individual progress
bars per each series. Because of this, using the pool wasn't possible.

Signed-off-by: dmitryk-dk <kozlovdmitriyy@gmail.com>

Co-authored-by: hagen1778 <roman@victoriametrics.com>
This commit is contained in:
Dmytro Kozlov 2022-05-02 10:06:34 +03:00 committed by GitHub
parent 8688ea8aa8
commit b2294d1cf1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 833 additions and 558 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
app/vmalert/notifier/alertmanager_request.qtpl.go
View file

@ -1,135 +1,135 @@
// Code generated by qtc from "alertmanager_request.qtpl". DO NOT EDIT. // Code generated by qtc from "alertmanager_request.qtpl". DO NOT EDIT.
// See https://github.com/valyala/quicktemplate for details. // See https://github.com/valyala/quicktemplate for details.
//line app/vmalert/notifier/alertmanager_request.qtpl:1 //line notifier/alertmanager_request.qtpl:1
package notifier package notifier
//line app/vmalert/notifier/alertmanager_request.qtpl:1 //line notifier/alertmanager_request.qtpl:1
import ( import (
"time" "time"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel" "github.com/VictoriaMetrics/VictoriaMetrics/lib/promrelabel"
) )
//line app/vmalert/notifier/alertmanager_request.qtpl:8 //line notifier/alertmanager_request.qtpl:8
import ( import (
qtio422016 "io" qtio422016 "io"
qt422016 "github.com/valyala/quicktemplate" qt422016 "github.com/valyala/quicktemplate"
) )
//line app/vmalert/notifier/alertmanager_request.qtpl:8 //line notifier/alertmanager_request.qtpl:8
var ( var (
_ = qtio422016.Copy _ = qtio422016.Copy
_ = qt422016.AcquireByteBuffer _ = qt422016.AcquireByteBuffer
) )
//line app/vmalert/notifier/alertmanager_request.qtpl:8 //line notifier/alertmanager_request.qtpl:8
func streamamRequest(qw422016 *qt422016.Writer, alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) { func streamamRequest(qw422016 *qt422016.Writer, alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) {
//line app/vmalert/notifier/alertmanager_request.qtpl:8 //line notifier/alertmanager_request.qtpl:8
qw422016.N().S(`[`) qw422016.N().S(`[`)
//line app/vmalert/notifier/alertmanager_request.qtpl:10 //line notifier/alertmanager_request.qtpl:10
for i, alert := range alerts { for i, alert := range alerts {
//line app/vmalert/notifier/alertmanager_request.qtpl:10 //line notifier/alertmanager_request.qtpl:10
qw422016.N().S(`{"startsAt":`) qw422016.N().S(`{"startsAt":`)
//line app/vmalert/notifier/alertmanager_request.qtpl:12 //line notifier/alertmanager_request.qtpl:12
qw422016.N().Q(alert.Start.Format(time.RFC3339Nano)) qw422016.N().Q(alert.Start.Format(time.RFC3339Nano))
//line app/vmalert/notifier/alertmanager_request.qtpl:12 //line notifier/alertmanager_request.qtpl:12
qw422016.N().S(`,"generatorURL":`) qw422016.N().S(`,"generatorURL":`)
//line app/vmalert/notifier/alertmanager_request.qtpl:13 //line notifier/alertmanager_request.qtpl:13
qw422016.N().Q(generatorURL(alert)) qw422016.N().Q(generatorURL(alert))
//line app/vmalert/notifier/alertmanager_request.qtpl:13 //line notifier/alertmanager_request.qtpl:13
qw422016.N().S(`,`) qw422016.N().S(`,`)
//line app/vmalert/notifier/alertmanager_request.qtpl:14 //line notifier/alertmanager_request.qtpl:14
if !alert.End.IsZero() { if !alert.End.IsZero() {
//line app/vmalert/notifier/alertmanager_request.qtpl:14 //line notifier/alertmanager_request.qtpl:14
qw422016.N().S(`"endsAt":`) qw422016.N().S(`"endsAt":`)
//line app/vmalert/notifier/alertmanager_request.qtpl:15 //line notifier/alertmanager_request.qtpl:15
qw422016.N().Q(alert.End.Format(time.RFC3339Nano)) qw422016.N().Q(alert.End.Format(time.RFC3339Nano))
//line app/vmalert/notifier/alertmanager_request.qtpl:15 //line notifier/alertmanager_request.qtpl:15
qw422016.N().S(`,`) qw422016.N().S(`,`)
//line app/vmalert/notifier/alertmanager_request.qtpl:16 //line notifier/alertmanager_request.qtpl:16
} }
//line app/vmalert/notifier/alertmanager_request.qtpl:16 //line notifier/alertmanager_request.qtpl:16
qw422016.N().S(`"labels": {"alertname":`) qw422016.N().S(`"labels": {"alertname":`)
//line app/vmalert/notifier/alertmanager_request.qtpl:18 //line notifier/alertmanager_request.qtpl:18
qw422016.N().Q(alert.Name) qw422016.N().Q(alert.Name)
//line app/vmalert/notifier/alertmanager_request.qtpl:19 //line notifier/alertmanager_request.qtpl:19
lbls := alert.toPromLabels(relabelCfg) lbls := alert.toPromLabels(relabelCfg)
//line app/vmalert/notifier/alertmanager_request.qtpl:20 //line notifier/alertmanager_request.qtpl:20
for _, l := range lbls { for _, l := range lbls {
//line app/vmalert/notifier/alertmanager_request.qtpl:20 //line notifier/alertmanager_request.qtpl:20
qw422016.N().S(`,`) qw422016.N().S(`,`)
//line app/vmalert/notifier/alertmanager_request.qtpl:21 //line notifier/alertmanager_request.qtpl:21
qw422016.N().Q(l.Name) qw422016.N().Q(l.Name)
//line app/vmalert/notifier/alertmanager_request.qtpl:21 //line notifier/alertmanager_request.qtpl:21
qw422016.N().S(`:`) qw422016.N().S(`:`)
//line app/vmalert/notifier/alertmanager_request.qtpl:21 //line notifier/alertmanager_request.qtpl:21
qw422016.N().Q(l.Value) qw422016.N().Q(l.Value)
//line app/vmalert/notifier/alertmanager_request.qtpl:22 //line notifier/alertmanager_request.qtpl:22
} }
//line app/vmalert/notifier/alertmanager_request.qtpl:22 //line notifier/alertmanager_request.qtpl:22
qw422016.N().S(`},"annotations": {`) qw422016.N().S(`},"annotations": {`)
//line app/vmalert/notifier/alertmanager_request.qtpl:25 //line notifier/alertmanager_request.qtpl:25
c := len(alert.Annotations) c := len(alert.Annotations)
//line app/vmalert/notifier/alertmanager_request.qtpl:26 //line notifier/alertmanager_request.qtpl:26
for k, v := range alert.Annotations { for k, v := range alert.Annotations {
//line app/vmalert/notifier/alertmanager_request.qtpl:27 //line notifier/alertmanager_request.qtpl:27
c = c - 1 c = c - 1
//line app/vmalert/notifier/alertmanager_request.qtpl:28 //line notifier/alertmanager_request.qtpl:28
qw422016.N().Q(k) qw422016.N().Q(k)
//line app/vmalert/notifier/alertmanager_request.qtpl:28 //line notifier/alertmanager_request.qtpl:28
qw422016.N().S(`:`) qw422016.N().S(`:`)
//line app/vmalert/notifier/alertmanager_request.qtpl:28 //line notifier/alertmanager_request.qtpl:28
qw422016.N().Q(v) qw422016.N().Q(v)
//line app/vmalert/notifier/alertmanager_request.qtpl:28 //line notifier/alertmanager_request.qtpl:28
if c > 0 { if c > 0 {
//line app/vmalert/notifier/alertmanager_request.qtpl:28 //line notifier/alertmanager_request.qtpl:28
qw422016.N().S(`,`) qw422016.N().S(`,`)
//line app/vmalert/notifier/alertmanager_request.qtpl:28 //line notifier/alertmanager_request.qtpl:28
} }
//line app/vmalert/notifier/alertmanager_request.qtpl:29 //line notifier/alertmanager_request.qtpl:29
} }
//line app/vmalert/notifier/alertmanager_request.qtpl:29 //line notifier/alertmanager_request.qtpl:29
qw422016.N().S(`}}`) qw422016.N().S(`}}`)
//line app/vmalert/notifier/alertmanager_request.qtpl:32 //line notifier/alertmanager_request.qtpl:32
if i != len(alerts)-1 { if i != len(alerts)-1 {
//line app/vmalert/notifier/alertmanager_request.qtpl:32 //line notifier/alertmanager_request.qtpl:32
qw422016.N().S(`,`) qw422016.N().S(`,`)
//line app/vmalert/notifier/alertmanager_request.qtpl:32 //line notifier/alertmanager_request.qtpl:32
} }
//line app/vmalert/notifier/alertmanager_request.qtpl:33 //line notifier/alertmanager_request.qtpl:33
} }
//line app/vmalert/notifier/alertmanager_request.qtpl:33 //line notifier/alertmanager_request.qtpl:33
qw422016.N().S(`]`) qw422016.N().S(`]`)
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
} }
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
func writeamRequest(qq422016 qtio422016.Writer, alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) { func writeamRequest(qq422016 qtio422016.Writer, alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) {
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
streamamRequest(qw422016, alerts, generatorURL, relabelCfg) streamamRequest(qw422016, alerts, generatorURL, relabelCfg)
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
} }
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
func amRequest(alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) string { func amRequest(alerts []Alert, generatorURL func(Alert) string, relabelCfg *promrelabel.ParsedConfigs) string {
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
writeamRequest(qb422016, alerts, generatorURL, relabelCfg) writeamRequest(qb422016, alerts, generatorURL, relabelCfg)
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
return qs422016 return qs422016
//line app/vmalert/notifier/alertmanager_request.qtpl:35 //line notifier/alertmanager_request.qtpl:35
} }

36
app/vmalert/tpl/footer.qtpl.go
View file

@ -1,25 +1,25 @@
// Code generated by qtc from "footer.qtpl". DO NOT EDIT. // Code generated by qtc from "footer.qtpl". DO NOT EDIT.
// See https://github.com/valyala/quicktemplate for details. // See https://github.com/valyala/quicktemplate for details.
//line app/vmalert/tpl/footer.qtpl:1 //line tpl/footer.qtpl:1
package tpl package tpl
//line app/vmalert/tpl/footer.qtpl:1 //line tpl/footer.qtpl:1
import ( import (
qtio422016 "io" qtio422016 "io"
qt422016 "github.com/valyala/quicktemplate" qt422016 "github.com/valyala/quicktemplate"
) )
//line app/vmalert/tpl/footer.qtpl:1 //line tpl/footer.qtpl:1
var ( var (
_ = qtio422016.Copy _ = qtio422016.Copy
_ = qt422016.AcquireByteBuffer _ = qt422016.AcquireByteBuffer
) )
//line app/vmalert/tpl/footer.qtpl:1 //line tpl/footer.qtpl:1
func StreamFooter(qw422016 *qt422016.Writer) { func StreamFooter(qw422016 *qt422016.Writer) {
//line app/vmalert/tpl/footer.qtpl:1 //line tpl/footer.qtpl:1
qw422016.N().S(` qw422016.N().S(`
</main> </main>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
@ -56,31 +56,31 @@ func StreamFooter(qw422016 *qt422016.Writer) {
</body> </body>
</html> </html>
`) `)
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
} }
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
func WriteFooter(qq422016 qtio422016.Writer) { func WriteFooter(qq422016 qtio422016.Writer) {
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
StreamFooter(qw422016) StreamFooter(qw422016)
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
} }
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
func Footer() string { func Footer() string {
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
WriteFooter(qb422016) WriteFooter(qb422016)
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
return qs422016 return qs422016
//line app/vmalert/tpl/footer.qtpl:36 //line tpl/footer.qtpl:36
} }

5
app/vmalert/tpl/header.qtpl
View file

@ -9,11 +9,6 @@
min-height: 75rem; min-height: 75rem;
padding-top: 4.5rem; padding-top: 4.5rem;
} }
pre {
overflow: scroll;
max-width: 600px;
min-height: 30px;
}
.group-heading { .group-heading {
cursor: pointer; cursor: pointer;
padding: 5px; padding: 5px;

55
app/vmalert/tpl/header.qtpl.go
View file

@ -1,39 +1,39 @@
// Code generated by qtc from "header.qtpl". DO NOT EDIT. // Code generated by qtc from "header.qtpl". DO NOT EDIT.
// See https://github.com/valyala/quicktemplate for details. // See https://github.com/valyala/quicktemplate for details.
//line app/vmalert/tpl/header.qtpl:1 //line tpl/header.qtpl:1
package tpl package tpl
//line app/vmalert/tpl/header.qtpl:1 //line tpl/header.qtpl:1
import ( import (
qtio422016 "io" qtio422016 "io"
qt422016 "github.com/valyala/quicktemplate" qt422016 "github.com/valyala/quicktemplate"
) )
//line app/vmalert/tpl/header.qtpl:1 //line tpl/header.qtpl:1
var ( var (
_ = qtio422016.Copy _ = qtio422016.Copy
_ = qt422016.AcquireByteBuffer _ = qt422016.AcquireByteBuffer
) )
//line app/vmalert/tpl/header.qtpl:1 //line tpl/header.qtpl:1
func StreamHeader(qw422016 *qt422016.Writer, title string, pages []NavItem) { func StreamHeader(qw422016 *qt422016.Writer, title string, pages []NavItem) {
//line app/vmalert/tpl/header.qtpl:1 //line tpl/header.qtpl:1
qw422016.N().S(` qw422016.N().S(`
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>vmalert`) <title>vmalert`)
//line app/vmalert/tpl/header.qtpl:5 //line tpl/header.qtpl:5
if title != "" { if title != "" {
//line app/vmalert/tpl/header.qtpl:5 //line tpl/header.qtpl:5
qw422016.N().S(` - `) qw422016.N().S(` - `)
//line app/vmalert/tpl/header.qtpl:5 //line tpl/header.qtpl:5
qw422016.E().S(title) qw422016.E().S(title)
//line app/vmalert/tpl/header.qtpl:5 //line tpl/header.qtpl:5
} }
//line app/vmalert/tpl/header.qtpl:5 //line tpl/header.qtpl:5
qw422016.N().S(`</title> qw422016.N().S(`</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<style> <style>
@ -41,11 +41,6 @@ func StreamHeader(qw422016 *qt422016.Writer, title string, pages []NavItem) {
min-height: 75rem; min-height: 75rem;
padding-top: 4.5rem; padding-top: 4.5rem;
} }
pre {
overflow: scroll;
max-width: 600px;
min-height: 30px;
}
.group-heading { .group-heading {
cursor: pointer; cursor: pointer;
padding: 5px; padding: 5px;
@ -71,37 +66,37 @@ func StreamHeader(qw422016 *qt422016.Writer, title string, pages []NavItem) {
</head> </head>
<body> <body>
`) `)
//line app/vmalert/tpl/header.qtpl:41 //line tpl/header.qtpl:36
StreamPrintNavItems(qw422016, title, pages) StreamPrintNavItems(qw422016, title, pages)
//line app/vmalert/tpl/header.qtpl:41 //line tpl/header.qtpl:36
qw422016.N().S(` qw422016.N().S(`
<main class="px-2"> <main class="px-2">
`) `)
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
} }
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
func WriteHeader(qq422016 qtio422016.Writer, title string, pages []NavItem) { func WriteHeader(qq422016 qtio422016.Writer, title string, pages []NavItem) {
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
StreamHeader(qw422016, title, pages) StreamHeader(qw422016, title, pages)
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
} }
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
func Header(title string, pages []NavItem) string { func Header(title string, pages []NavItem) string {
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
WriteHeader(qb422016, title, pages) WriteHeader(qb422016, title, pages)
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
return qs422016 return qs422016
//line app/vmalert/tpl/header.qtpl:43 //line tpl/header.qtpl:38
} }

62
app/vmalert/tpl/nav.qtpl.go
View file

@ -1,96 +1,96 @@
// Code generated by qtc from "nav.qtpl". DO NOT EDIT. // Code generated by qtc from "nav.qtpl". DO NOT EDIT.
// See https://github.com/valyala/quicktemplate for details. // See https://github.com/valyala/quicktemplate for details.
//line app/vmalert/tpl/nav.qtpl:1 //line tpl/nav.qtpl:1
package tpl package tpl
//line app/vmalert/tpl/nav.qtpl:1 //line tpl/nav.qtpl:1
import ( import (
qtio422016 "io" qtio422016 "io"
qt422016 "github.com/valyala/quicktemplate" qt422016 "github.com/valyala/quicktemplate"
) )
//line app/vmalert/tpl/nav.qtpl:1 //line tpl/nav.qtpl:1
var ( var (
_ = qtio422016.Copy _ = qtio422016.Copy
_ = qt422016.AcquireByteBuffer _ = qt422016.AcquireByteBuffer
) )
//line app/vmalert/tpl/nav.qtpl:2 //line tpl/nav.qtpl:2
type NavItem struct { type NavItem struct {
Name string Name string
Url string Url string
} }
//line app/vmalert/tpl/nav.qtpl:8 //line tpl/nav.qtpl:8
func StreamPrintNavItems(qw422016 *qt422016.Writer, current string, items []NavItem) { func StreamPrintNavItems(qw422016 *qt422016.Writer, current string, items []NavItem) {
//line app/vmalert/tpl/nav.qtpl:8 //line tpl/nav.qtpl:8
qw422016.N().S(` qw422016.N().S(`
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark"> <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<div class="container-fluid"> <div class="container-fluid">
<div class="collapse navbar-collapse" id="navbarCollapse"> <div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav me-auto mb-2 mb-md-0"> <ul class="navbar-nav me-auto mb-2 mb-md-0">
`) `)
//line app/vmalert/tpl/nav.qtpl:13 //line tpl/nav.qtpl:13
for _, item := range items { for _, item := range items {
//line app/vmalert/tpl/nav.qtpl:13 //line tpl/nav.qtpl:13
qw422016.N().S(` qw422016.N().S(`
<li class="nav-item"> <li class="nav-item">
<a class="nav-link`) <a class="nav-link`)
//line app/vmalert/tpl/nav.qtpl:15 //line tpl/nav.qtpl:15
if current == item.Name { if current == item.Name {
//line app/vmalert/tpl/nav.qtpl:15 //line tpl/nav.qtpl:15
qw422016.N().S(` active`) qw422016.N().S(` active`)
//line app/vmalert/tpl/nav.qtpl:15 //line tpl/nav.qtpl:15
} }
//line app/vmalert/tpl/nav.qtpl:15 //line tpl/nav.qtpl:15
qw422016.N().S(`" href="`) qw422016.N().S(`" href="`)
//line app/vmalert/tpl/nav.qtpl:15 //line tpl/nav.qtpl:15
qw422016.E().S(item.Url) qw422016.E().S(item.Url)
//line app/vmalert/tpl/nav.qtpl:15 //line tpl/nav.qtpl:15
qw422016.N().S(`"> qw422016.N().S(`">
`) `)
//line app/vmalert/tpl/nav.qtpl:16 //line tpl/nav.qtpl:16
qw422016.E().S(item.Name) qw422016.E().S(item.Name)
//line app/vmalert/tpl/nav.qtpl:16 //line tpl/nav.qtpl:16
qw422016.N().S(` qw422016.N().S(`
</a> </a>
</li> </li>
`) `)
//line app/vmalert/tpl/nav.qtpl:19 //line tpl/nav.qtpl:19
} }
//line app/vmalert/tpl/nav.qtpl:19 //line tpl/nav.qtpl:19
qw422016.N().S(` qw422016.N().S(`
</ul> </ul>
</div> </div>
</nav> </nav>
`) `)
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
} }
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
func WritePrintNavItems(qq422016 qtio422016.Writer, current string, items []NavItem) { func WritePrintNavItems(qq422016 qtio422016.Writer, current string, items []NavItem) {
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
StreamPrintNavItems(qw422016, current, items) StreamPrintNavItems(qw422016, current, items)
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
} }
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
func PrintNavItems(current string, items []NavItem) string { func PrintNavItems(current string, items []NavItem) string {
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
WritePrintNavItems(qb422016, current, items) WritePrintNavItems(qb422016, current, items)
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
return qs422016 return qs422016
//line app/vmalert/tpl/nav.qtpl:23 //line tpl/nav.qtpl:23
} }

4
app/vmalert/web.qtpl
View file

@ -77,7 +77,7 @@
<b>record:</b> {%s r.Name %} <b>record:</b> {%s r.Name %}
{% endif %} {% endif %}
<br> <br>
<code><pre>{%s r.Query %}</pre></code><br> <code><pre class="text-wrap">{%s r.Query %}</pre></code><br>
{% if len(r.Labels) > 0 %} <b>Labels:</b>{% endif %} {% if len(r.Labels) > 0 %} <b>Labels:</b>{% endif %}
{% for k, v := range r.Labels %} {% for k, v := range r.Labels %}
<span class="ms-1 badge bg-primary">{%s k %}={%s v %}</span> <span class="ms-1 badge bg-primary">{%s k %}={%s v %}</span>
@ -343,4 +343,4 @@
{% func badgeRestored() %} {% func badgeRestored() %}
<span class="badge bg-warning text-dark" title="Alert state was restored after the service restart from remote storage">restored</span> <span class="badge bg-warning text-dark" title="Alert state was restored after the service restart from remote storage">restored</span>
{% endfunc %} {% endfunc %}

780
app/vmalert/web.qtpl.go
View file

File diff suppressed because it is too large Load diff

26
app/vmctl/barpool/pool.go Normal file
View file

@ -0,0 +1,26 @@
// Package barpool provides access to the global
// pool of progress bars, so they could be rendered
// altogether.
package barpool
import "github.com/cheggaaa/pb/v3"
var pool = pb.NewPool()
// Add adds bar to the global pool
func Add(bar *pb.ProgressBar) { pool.Add(bar) }
// Start starts the global pool
// Must be called after all progress bars were added
func Start() error { return pool.Start() }
// Stop stops the global pool
func Stop() { _ = pool.Stop() }
// AddWithTemplate adds bar with the given template
// to the global pool
func AddWithTemplate(format string, total int) *pb.ProgressBar {
bar := pb.ProgressBarTemplate(format).New(total)
Add(bar)
return bar
}

5
app/vmctl/flags.go
View file

@ -36,6 +36,7 @@ const (
vmBatchSize = "vm-batch-size" vmBatchSize = "vm-batch-size"
vmSignificantFigures = "vm-significant-figures" vmSignificantFigures = "vm-significant-figures"
vmRoundDigits = "vm-round-digits" vmRoundDigits = "vm-round-digits"
vmDisableProgressBar = "vm-disable-progress-bar"
// also used in vm-native // also used in vm-native
vmExtraLabel = "vm-extra-label" vmExtraLabel = "vm-extra-label"
@ -109,6 +110,10 @@ var (
Usage: "Optional data transfer rate limit in bytes per second.\n" + Usage: "Optional data transfer rate limit in bytes per second.\n" +
"By default the rate limit is disabled. It can be useful for limiting load on configured via '--vmAddr' destination.", "By default the rate limit is disabled. It can be useful for limiting load on configured via '--vmAddr' destination.",
}, },
&cli.BoolFlag{
Name: vmDisableProgressBar,
Usage: "Whether to disable progress bar per each worker during the import.",
},
} }
) )

10
app/vmctl/influx.go
View file

@ -6,9 +6,9 @@ import (
"log" "log"
"sync" "sync"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/influx" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/influx"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
"github.com/cheggaaa/pb/v3"
) )
type influxProcessor struct { type influxProcessor struct {
@ -44,7 +44,11 @@ func (ip *influxProcessor) run(silent, verbose bool) error {
return nil return nil
} }
bar := pb.StartNew(len(series)) bar := barpool.AddWithTemplate(fmt.Sprintf(barTpl, "Processing series"), len(series))
if err := barpool.Start(); err != nil {
return err
}
seriesCh := make(chan *influx.Series) seriesCh := make(chan *influx.Series)
errCh := make(chan error) errCh := make(chan error)
ip.im.ResetStats() ip.im.ResetStats()
@ -84,7 +88,7 @@ func (ip *influxProcessor) run(silent, verbose bool) error {
return fmt.Errorf("import process failed: %s", wrapErr(vmErr, verbose)) return fmt.Errorf("import process failed: %s", wrapErr(vmErr, verbose))
} }
} }
bar.Finish() barpool.Stop()
log.Println("Import finished!") log.Println("Import finished!")
log.Print(ip.im.Stats()) log.Print(ip.im.Stats())
return nil return nil

4
app/vmctl/main.go
View file

@ -55,6 +55,9 @@ func main() {
} }
vmCfg := initConfigVM(c) vmCfg := initConfigVM(c)
// disable progress bars since openTSDB implementation
// does not use progress bar pool
vmCfg.DisableProgressBar = true
importer, err := vm.NewImporter(vmCfg) importer, err := vm.NewImporter(vmCfg)
if err != nil { if err != nil {
return fmt.Errorf("failed to create VM importer: %s", err) return fmt.Errorf("failed to create VM importer: %s", err)
@ -233,5 +236,6 @@ func initConfigVM(c *cli.Context) vm.Config {
RoundDigits: c.Int(vmRoundDigits), RoundDigits: c.Int(vmRoundDigits),
ExtraLabels: c.StringSlice(vmExtraLabel), ExtraLabels: c.StringSlice(vmExtraLabel),
RateLimit: c.Int64(vmRateLimit), RateLimit: c.Int64(vmRateLimit),
DisableProgressBar: c.Bool(vmDisableProgressBar),
} }
} }

11
app/vmctl/prometheus.go
View file

@ -5,9 +5,9 @@ import (
"log" "log"
"sync" "sync"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/prometheus" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/prometheus"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
"github.com/cheggaaa/pb/v3"
"github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/tsdb"
) )
@ -38,7 +38,12 @@ func (pp *prometheusProcessor) run(silent, verbose bool) error {
return nil return nil
} }
bar := pb.StartNew(len(blocks)) bar := barpool.AddWithTemplate(fmt.Sprintf(barTpl, "Processing blocks"), len(blocks))
if err := barpool.Start(); err != nil {
return err
}
blockReadersCh := make(chan tsdb.BlockReader) blockReadersCh := make(chan tsdb.BlockReader)
errCh := make(chan error, pp.cc) errCh := make(chan error, pp.cc)
pp.im.ResetStats() pp.im.ResetStats()
@ -81,7 +86,7 @@ func (pp *prometheusProcessor) run(silent, verbose bool) error {
return fmt.Errorf("import process failed: %s", wrapErr(vmErr, verbose)) return fmt.Errorf("import process failed: %s", wrapErr(vmErr, verbose))
} }
} }
bar.Finish() barpool.Stop()
log.Println("Import finished!") log.Println("Import finished!")
log.Print(pp.im.Stats()) log.Print(pp.im.Stats())
return nil return nil

2
app/vmctl/utils.go
View file

@ -9,6 +9,8 @@ import (
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
) )
const barTpl = `{{ blue "%s:" }} {{ counters . }} {{ bar . "[" "█" (cycle . "█") "▒" "]" }} {{ percent . }}`
func prompt(question string) bool { func prompt(question string) bool {
reader := bufio.NewReader(os.Stdin) reader := bufio.NewReader(os.Stdin)
fmt.Print(question, " [Y/n] ") fmt.Print(question, " [Y/n] ")

27
app/vmctl/vm/vm.go
View file

@ -13,6 +13,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/cheggaaa/pb/v3"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/limiter" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/limiter"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal" "github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
) )
@ -51,6 +54,8 @@ type Config struct {
// RateLimit defines a data transfer speed in bytes per second. // RateLimit defines a data transfer speed in bytes per second.
// Is applied to each worker (see Concurrency) independently. // Is applied to each worker (see Concurrency) independently.
RateLimit int64 RateLimit int64
// Whether to disable progress bar per VM worker
DisableProgressBar bool
} }
// Importer performs insertion of timeseries // Importer performs insertion of timeseries
@ -144,15 +149,22 @@ func NewImporter(cfg Config) (*Importer, error) {
im.wg.Add(int(cfg.Concurrency)) im.wg.Add(int(cfg.Concurrency))
for i := 0; i < int(cfg.Concurrency); i++ { for i := 0; i < int(cfg.Concurrency); i++ {
go func() { var bar *pb.ProgressBar
if !cfg.DisableProgressBar {
pbPrefix := fmt.Sprintf(`{{ green "VM worker %d:" }}`, i)
bar = barpool.AddWithTemplate(pbPrefix+pbTpl, 0)
}
go func(bar *pb.ProgressBar) {
defer im.wg.Done() defer im.wg.Done()
im.startWorker(cfg.BatchSize, cfg.SignificantFigures, cfg.RoundDigits) im.startWorker(bar, cfg.BatchSize, cfg.SignificantFigures, cfg.RoundDigits)
}() }(bar)
} }
im.ResetStats() im.ResetStats()
return im, nil return im, nil
} }
const pbTpl = `{{ (cycle . "←" "↖" "↑" "↗" "→" "↘" "↓" "↙" ) }} {{speed . "%s samples/s"}}`
// ImportError is type of error generated // ImportError is type of error generated
// in case of unsuccessful import request // in case of unsuccessful import request
type ImportError struct { type ImportError struct {
@ -182,7 +194,7 @@ func (im *Importer) Close() {
}) })
} }
func (im *Importer) startWorker(batchSize, significantFigures, roundDigits int) { func (im *Importer) startWorker(bar *pb.ProgressBar, batchSize, significantFigures, roundDigits int) {
var batch []*TimeSeries var batch []*TimeSeries
var dataPoints int var dataPoints int
var waitForBatch time.Time var waitForBatch time.Time
@ -217,6 +229,11 @@ func (im *Importer) startWorker(batchSize, significantFigures, roundDigits int)
batch = append(batch, ts) batch = append(batch, ts)
dataPoints += len(ts.Values) dataPoints += len(ts.Values)
if bar != nil {
bar.Add(len(ts.Values))
}
if dataPoints < batchSize { if dataPoints < batchSize {
continue continue
} }
@ -232,8 +249,8 @@ func (im *Importer) startWorker(batchSize, significantFigures, roundDigits int)
// make a new batch, since old one was referenced as err // make a new batch, since old one was referenced as err
batch = make([]*TimeSeries, len(batch)) batch = make([]*TimeSeries, len(batch))
} }
batch = batch[:0]
dataPoints = 0 dataPoints = 0
batch = batch[:0]
waitForBatch = time.Now() waitForBatch = time.Now()
} }
} }

13
app/vmctl/vm_native.go
View file

@ -7,8 +7,7 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/cheggaaa/pb/v3" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/limiter" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/limiter"
"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
) )
@ -49,7 +48,7 @@ const (
nativeExportAddr = "api/v1/export/native" nativeExportAddr = "api/v1/export/native"
nativeImportAddr = "api/v1/import/native" nativeImportAddr = "api/v1/import/native"
barTpl = `Total: {{counters . }} {{ cycle . "↖" "↗" "↘" "↙" }} Speed: {{speed . }} {{string . "suffix"}}` nativeBarTpl = `Total: {{counters . }} {{ cycle . "↖" "↗" "↘" "↙" }} Speed: {{speed . }} {{string . "suffix"}}`
) )
func (p *vmNativeProcessor) run() error { func (p *vmNativeProcessor) run() error {
@ -84,8 +83,12 @@ func (p *vmNativeProcessor) run() error {
}() }()
fmt.Printf("Initing import process to %q:\n", p.dst.addr) fmt.Printf("Initing import process to %q:\n", p.dst.addr)
bar := pb.ProgressBarTemplate(barTpl).Start64(0) bar := barpool.AddWithTemplate(nativeBarTpl, 0)
barReader := bar.NewProxyReader(exportReader) barReader := bar.NewProxyReader(exportReader)
if err := barpool.Start(); err != nil {
log.Printf("error start process bars pool: %s", err)
return err
}
w := io.Writer(pw) w := io.Writer(pw)
if p.rateLimit > 0 { if p.rateLimit > 0 {
@ -101,7 +104,7 @@ func (p *vmNativeProcessor) run() error {
} }
<-sync <-sync
bar.Finish() barpool.Stop()
return nil return nil
} }

2
go.mod
View file

@ -13,7 +13,7 @@ require (
github.com/VictoriaMetrics/metricsql v0.43.0 github.com/VictoriaMetrics/metricsql v0.43.0
github.com/aws/aws-sdk-go v1.44.0 github.com/aws/aws-sdk-go v1.44.0
github.com/cespare/xxhash/v2 v2.1.2 github.com/cespare/xxhash/v2 v2.1.2
github.com/cheggaaa/pb/v3 v3.0.8 github.com/cheggaaa/pb/v3 v3.0.9-0.20211222075416-90c02fa07ea4
github.com/golang/snappy v0.0.4 github.com/golang/snappy v0.0.4
github.com/influxdata/influxdb v1.9.6 github.com/influxdata/influxdb v1.9.6
github.com/klauspost/compress v1.15.1 github.com/klauspost/compress v1.15.1

4
go.sum
View file

@ -198,8 +198,8 @@ github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tj
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA= github.com/cheggaaa/pb/v3 v3.0.9-0.20211222075416-90c02fa07ea4 h1:sbHAiGddrdLsd3i9/RYsm0OKOEh+UDFOONxai8YMMcw=
github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA= github.com/cheggaaa/pb/v3 v3.0.9-0.20211222075416-90c02fa07ea4/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=

7
vendor/github.com/cheggaaa/pb/v3/pb.go generated vendored
View file

@ -408,6 +408,13 @@ func (pb *ProgressBar) IsStarted() bool {
return pb.finish != nil return pb.finish != nil
} }
// IsFinished indicates progress bar is finished
func (pb *ProgressBar) IsFinished() bool {
pb.mu.RLock()
defer pb.mu.RUnlock()
return pb.finished
}
// SetTemplateString sets ProgressBar tempate string and parse it // SetTemplateString sets ProgressBar tempate string and parse it
func (pb *ProgressBar) SetTemplateString(tmpl string) *ProgressBar { func (pb *ProgressBar) SetTemplateString(tmpl string) *ProgressBar {
pb.mu.Lock() pb.mu.Lock()

105
vendor/github.com/cheggaaa/pb/v3/pool.go generated vendored Normal file
View file

@ -0,0 +1,105 @@
// +build linux darwin freebsd netbsd openbsd solaris dragonfly windows plan9 aix
package pb
import (
"io"
"sync"
"time"
"github.com/cheggaaa/pb/v3/termutil"
)
// Create and start new pool with given bars
// You need call pool.Stop() after work
func StartPool(pbs ...*ProgressBar) (pool *Pool, err error) {
pool = new(Pool)
if err = pool.Start(); err != nil {
return
}
pool.Add(pbs...)
return
}
// NewPool initialises a pool with progress bars, but
// doesn't start it. You need to call Start manually
func NewPool(pbs ...*ProgressBar) (pool *Pool) {
pool = new(Pool)
pool.Add(pbs...)
return
}
type Pool struct {
Output io.Writer
RefreshRate time.Duration
bars []*ProgressBar
lastBarsCount int
shutdownCh chan struct{}
workerCh chan struct{}
m sync.Mutex
finishOnce sync.Once
}
// Add progress bars.
func (p *Pool) Add(pbs ...*ProgressBar) {
p.m.Lock()
defer p.m.Unlock()
for _, bar := range pbs {
bar.Set(Static, true)
bar.Start()
p.bars = append(p.bars, bar)
}
}
func (p *Pool) Start() (err error) {
p.RefreshRate = defaultRefreshRate
p.shutdownCh, err = termutil.RawModeOn()
if err != nil {
return
}
p.workerCh = make(chan struct{})
go p.writer()
return
}
func (p *Pool) writer() {
var first = true
defer func() {
if first == false {
p.print(false)
} else {
p.print(true)
p.print(false)
}
close(p.workerCh)
}()
for {
select {
case <-time.After(p.RefreshRate):
if p.print(first) {
p.print(false)
return
}
first = false
case <-p.shutdownCh:
return
}
}
}
// Restore terminal state and close pool
func (p *Pool) Stop() error {
p.finishOnce.Do(func() {
if p.shutdownCh != nil {
close(p.shutdownCh)
}
})
// Wait for the worker to complete
select {
case <-p.workerCh:
}
return termutil.RawModeOff()
}

46
vendor/github.com/cheggaaa/pb/v3/pool_win.go generated vendored Normal file
View file

@ -0,0 +1,46 @@
// +build windows
package pb
import (
"fmt"
"log"
"github.com/cheggaaa/pb/v3/termutil"
)
func (p *Pool) print(first bool) bool {
p.m.Lock()
defer p.m.Unlock()
var out string
if !first {
coords, err := termutil.GetCursorPos()
if err != nil {
log.Panic(err)
}
coords.Y -= int16(p.lastBarsCount)
if coords.Y < 0 {
coords.Y = 0
}
coords.X = 0
err = termutil.SetCursorPos(coords)
if err != nil {
log.Panic(err)
}
}
isFinished := true
for _, bar := range p.bars {
if !bar.IsFinished() {
isFinished = false
}
out += fmt.Sprintf("\r%s\n", bar.String())
}
if p.Output != nil {
fmt.Fprint(p.Output, out)
} else {
fmt.Print(out)
}
p.lastBarsCount = len(p.bars)
return isFinished
}

43
vendor/github.com/cheggaaa/pb/v3/pool_x.go generated vendored Normal file
View file

@ -0,0 +1,43 @@
// +build linux darwin freebsd netbsd openbsd solaris dragonfly plan9 aix
package pb
import (
"fmt"
"os"
"github.com/cheggaaa/pb/v3/termutil"
)
func (p *Pool) print(first bool) bool {
p.m.Lock()
defer p.m.Unlock()
var out string
if !first {
out = fmt.Sprintf("\033[%dA", p.lastBarsCount)
}
isFinished := true
bars := p.bars
rows, cols, err := termutil.TerminalSize()
if err != nil {
cols = defaultBarWidth
}
if rows > 0 && len(bars) > rows {
// we need to hide bars that overflow terminal height
bars = bars[len(bars)-rows:]
}
for _, bar := range bars {
if !bar.IsFinished() {
isFinished = false
}
bar.SetWidth(cols)
out += fmt.Sprintf("\r%s\n", bar.String())
}
if p.Output != nil {
fmt.Fprint(p.Output, out)
} else {
fmt.Fprint(os.Stderr, out)
}
p.lastBarsCount = len(bars)
return isFinished
}

16
vendor/github.com/cheggaaa/pb/v3/termutil/term.go generated vendored
View file

@ -10,6 +10,16 @@ import (
var echoLocked bool var echoLocked bool
var echoLockMutex sync.Mutex var echoLockMutex sync.Mutex
var errLocked = errors.New("terminal locked") var errLocked = errors.New("terminal locked")
var autoTerminate = true
// AutoTerminate enables or disables automatic terminate signal catching.
// It's needed to restore the terminal state after the pool was used.
// By default, it's enabled.
func AutoTerminate(enable bool) {
echoLockMutex.Lock()
defer echoLockMutex.Unlock()
autoTerminate = enable
}
// RawModeOn switches terminal to raw mode // RawModeOn switches terminal to raw mode
func RawModeOn() (quit chan struct{}, err error) { func RawModeOn() (quit chan struct{}, err error) {
@ -45,8 +55,10 @@ func RawModeOff() (err error) {
// listen exit signals and restore terminal state // listen exit signals and restore terminal state
func catchTerminate(quit chan struct{}) { func catchTerminate(quit chan struct{}) {
sig := make(chan os.Signal, 1) sig := make(chan os.Signal, 1)
signal.Notify(sig, unlockSignals...) if autoTerminate {
defer signal.Stop(sig) signal.Notify(sig, unlockSignals...)
defer signal.Stop(sig)
}
select { select {
case <-quit: case <-quit:
RawModeOff() RawModeOff()

4
vendor/github.com/cheggaaa/pb/v3/termutil/term_win.go generated vendored
View file

@ -111,7 +111,7 @@ func termWidthTPut() (width int, err error) {
return strconv.Atoi(string(res)) return strconv.Atoi(string(res))
} }
func getCursorPos() (pos coordinates, err error) { func GetCursorPos() (pos coordinates, err error) {
var info consoleScreenBufferInfo var info consoleScreenBufferInfo
_, _, e := syscall.Syscall(procGetConsoleScreenBufferInfo.Addr(), 2, uintptr(syscall.Stdout), uintptr(unsafe.Pointer(&info)), 0) _, _, e := syscall.Syscall(procGetConsoleScreenBufferInfo.Addr(), 2, uintptr(syscall.Stdout), uintptr(unsafe.Pointer(&info)), 0)
if e != 0 { if e != 0 {
@ -120,7 +120,7 @@ func getCursorPos() (pos coordinates, err error) {
return info.dwCursorPosition, nil return info.dwCursorPosition, nil
} }
func setCursorPos(pos coordinates) error { func SetCursorPos(pos coordinates) error {
_, _, e := syscall.Syscall(setConsoleCursorPosition.Addr(), 2, uintptr(syscall.Stdout), uintptr(uint32(uint16(pos.Y))<<16|uint32(uint16(pos.X))), 0) _, _, e := syscall.Syscall(setConsoleCursorPosition.Addr(), 2, uintptr(syscall.Stdout), uintptr(uint32(uint16(pos.Y))<<16|uint32(uint16(pos.X))), 0)
if e != 0 { if e != 0 {
return error(e) return error(e)

10
vendor/github.com/cheggaaa/pb/v3/termutil/term_x.go generated vendored
View file

@ -35,6 +35,12 @@ func init() {
// TerminalWidth returns width of the terminal. // TerminalWidth returns width of the terminal.
func TerminalWidth() (int, error) { func TerminalWidth() (int, error) {
_, c, err := TerminalSize()
return c, err
}
// TerminalSize returns size of the terminal.
func TerminalSize() (rows, cols int, err error) {
w := new(window) w := new(window)
res, _, err := syscall.Syscall(sysIoctl, res, _, err := syscall.Syscall(sysIoctl,
tty.Fd(), tty.Fd(),
@ -42,9 +48,9 @@ func TerminalWidth() (int, error) {
uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(w)),
) )
if int(res) == -1 { if int(res) == -1 {
return 0, err return 0, 0, err
} }
return int(w.Col), nil return int(w.Row), int(w.Col), nil
} }
var oldState syscall.Termios var oldState syscall.Termios

2
vendor/modules.txt vendored
View file

@ -93,7 +93,7 @@ github.com/beorn7/perks/quantile
# github.com/cespare/xxhash/v2 v2.1.2 # github.com/cespare/xxhash/v2 v2.1.2
## explicit; go 1.11 ## explicit; go 1.11
github.com/cespare/xxhash/v2 github.com/cespare/xxhash/v2
# github.com/cheggaaa/pb/v3 v3.0.8 # github.com/cheggaaa/pb/v3 v3.0.9-0.20211222075416-90c02fa07ea4
## explicit; go 1.12 ## explicit; go 1.12
github.com/cheggaaa/pb/v3 github.com/cheggaaa/pb/v3
github.com/cheggaaa/pb/v3/termutil github.com/cheggaaa/pb/v3/termutil