这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

cmd/bosun: fix missed minip refactor in elastic #2296

Merged
merged 1 commit into from
Aug 20, 2018
Merged

cmd/bosun: fix missed minip refactor in elastic #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/bosun/expr/elastic2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"sync"

"bosun.org/opentsdb"
"github.com/MiniProfiler/go/miniprofiler"
"github.com/jinzhu/now"

elastic "gopkg.in/olivere/elastic.v3"
Expand All @@ -31,7 +30,7 @@ func init() {
esClients.m = make(map[string]*elastic.Client)
}

func ESAll(e *State, T miniprofiler.Timer) (*Results, error) {
func ESAll(e *State) (*Results, error) {
var r Results
q := ESQuery{
Query: elastic.NewMatchAllQuery(),
Expand Down
11 changes: 5 additions & 6 deletions cmd/bosun/expr/elastic5.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"sync"

"bosun.org/opentsdb"
"github.com/MiniProfiler/go/miniprofiler"
"github.com/jinzhu/now"
)

Expand Down Expand Up @@ -329,19 +328,19 @@ func ESMonthly(e *State, timeField, indexRoot, layout string) (*Results, error)
return &r, nil
}

func ESCount(prefix string, e *State, T miniprofiler.Timer, indexer ESIndexer, keystring string, filter ESQuery, interval, sduration, eduration string) (r *Results, err error) {
return ESDateHistogram(prefix, e, T, indexer, keystring, filter.Query, interval, sduration, eduration, "", "", 0)
func ESCount(prefix string, e *State, indexer ESIndexer, keystring string, filter ESQuery, interval, sduration, eduration string) (r *Results, err error) {
return ESDateHistogram(prefix, e, indexer, keystring, filter.Query, interval, sduration, eduration, "", "", 0)
}

// ESStat returns a bucketed statistical reduction for the specified field.
func ESStat(prefix string, e *State, T miniprofiler.Timer, indexer ESIndexer, keystring string, filter ESQuery, field, rstat, interval, sduration, eduration string) (r *Results, err error) {
return ESDateHistogram(prefix, e, T, indexer, keystring, filter.Query, interval, sduration, eduration, field, rstat, 0)
func ESStat(prefix string, e *State, indexer ESIndexer, keystring string, filter ESQuery, field, rstat, interval, sduration, eduration string) (r *Results, err error) {
return ESDateHistogram(prefix, e, indexer, keystring, filter.Query, interval, sduration, eduration, field, rstat, 0)
}

// 2016-09-22T22:26:14.679270711Z
const elasticRFC3339 = "date_optional_time"

func ESDateHistogram(prefix string, e *State, T miniprofiler.Timer, indexer ESIndexer, keystring string, filter elastic.Query, interval, sduration, eduration, stat_field, rstat string, size int) (r *Results, err error) {
func ESDateHistogram(prefix string, e *State, indexer ESIndexer, keystring string, filter elastic.Query, interval, sduration, eduration, stat_field, rstat string, size int) (r *Results, err error) {
r = new(Results)
req, err := ESBaseQuery(e.now, indexer, filter, sduration, eduration, size, prefix)
if err != nil {
Expand Down