Skip to content
This repository was archived by the owner on Aug 18, 2025. It is now read-only.

Commit 8d3e0b7

Browse files
authored
Merge pull request #77 from v3io/development
Development
2 parents 5787e83 + ff7d318 commit 8d3e0b7

File tree

8 files changed

+39
-35
lines changed

8 files changed

+39
-35
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ require (
6262
replace (
6363
github.com/golang/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422
6464
github.com/v3io/frames => github.com/v3io/frames v0.8.1
65-
github.com/v3io/v3io-tsdb => github.com/v3io/v3io-tsdb v0.11.3
65+
github.com/v3io/v3io-tsdb => github.com/v3io/v3io-tsdb v0.11.4
6666
google.golang.org/grpc => google.golang.org/grpc v1.19.1
6767
k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0
6868
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,8 @@ github.com/v3io/v3io-go v0.1.9 h1:etkrrRmrI++i8sxGfK/+13f41TxIMohYeZHwVUM62vw=
394394
github.com/v3io/v3io-go v0.1.9/go.mod h1:5poBlcjZG5TiexRTYI44PE6tHzZz5Z60w+iS899pWtc=
395395
github.com/v3io/v3io-tsdb v0.11.3 h1:zH2rVNsPy9CIm0/gwJ7NNyjDD7G2w4XhUygeZqexLaE=
396396
github.com/v3io/v3io-tsdb v0.11.3/go.mod h1:kp586KxTfROIGwb/nzNxwDbX2Wterxro+HbiZHmK548=
397+
github.com/v3io/v3io-tsdb v0.11.4 h1:tDw+EdFNregIy6r4fPqtOybkAj4ngUl4WRQNH24Xe0M=
398+
github.com/v3io/v3io-tsdb v0.11.4/go.mod h1:kp586KxTfROIGwb/nzNxwDbX2Wterxro+HbiZHmK548=
397399
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
398400
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
399401
github.com/valyala/fasthttp v1.2.0 h1:dzZJf2IuMiclVjdw0kkT+f9u4YdrapbNyGAN47E/qnk=

vendor/github.com/v3io/v3io-tsdb/pkg/appender/appender.go

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/v3io/v3io-tsdb/pkg/appender/ingest.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/v3io/v3io-tsdb/pkg/appender/lru_cache.go

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/v3io/v3io-tsdb/pkg/appender/store.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ github.com/v3io/v3io-go/pkg/dataplane
341341
github.com/v3io/v3io-go/pkg/dataplane/http
342342
github.com/v3io/v3io-go/pkg/dataplane/schemas/node/common
343343
github.com/v3io/v3io-go/pkg/errors
344-
# github.com/v3io/v3io-tsdb v0.11.2 => github.com/v3io/v3io-tsdb v0.11.3
344+
# github.com/v3io/v3io-tsdb v0.11.2 => github.com/v3io/v3io-tsdb v0.11.4
345345
github.com/v3io/v3io-tsdb/internal/pkg/performance
346346
github.com/v3io/v3io-tsdb/pkg/aggregate
347347
github.com/v3io/v3io-tsdb/pkg/appender

web/web.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ import (
7373
v3ioConfig "github.com/v3io/v3io-tsdb/pkg/config"
7474
)
7575

76+
7677
var (
7778
localhostRepresentations = []string{"127.0.0.1", "localhost"}
7879

@@ -828,13 +829,15 @@ func (h *Handler) status(w http.ResponseWriter, r *http.Request) {
828829
status.LastConfigTime = time.Unix(int64(toFloat64(mF)), 0)
829830
}
830831
}
831-
db := h.tsdb()
832-
startTime := time.Now().UnixNano()
833-
status.Stats = db.Head().PostingsCardinalityStats("__name__")
834-
status.Duration = fmt.Sprintf("%.3f", float64(time.Now().UnixNano()-startTime)/float64(1e9))
835-
status.NumSeries = db.Head().NumSeries()
836-
status.MaxTime = db.Head().MaxTime()
837-
status.MinTime = db.Head().MaxTime()
832+
// TODO: Implement for V3IO (IG-16879)
833+
//db := h.tsdb()
834+
//startTime := time.Now().UnixNano()
835+
status.Stats = &index.PostingsStats{}
836+
//status.Stats = db.Head().PostingsCardinalityStats("__name__")
837+
//status.Duration = fmt.Sprintf("%.3f", float64(time.Now().UnixNano()-startTime)/float64(1e9))
838+
//status.NumSeries = db.Head().NumSeries()
839+
//status.MaxTime = db.Head().MaxTime()
840+
//status.MinTime = db.Head().MaxTime()
838841

839842
h.executeTemplate(w, "status.html", status)
840843
}

0 commit comments

Comments
 (0)