RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:prometheus/prometheus

This commit is contained in:
Matt T. Proud 2013-01-27 19:37:14 +01:00
parent 56d0ecf410 2c1c0593f4
commit 567e2948d3
46 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/query.go
View File

@ -3,8 +3,8 @@ package api
import ( import (
"code.google.com/p/gorest" "code.google.com/p/gorest"
"errors" "errors"
"github.com/matttproud/prometheus/rules" "github.com/prometheus/prometheus/rules"
"github.com/matttproud/prometheus/rules/ast" "github.com/prometheus/prometheus/rules/ast"
"sort" "sort"
"time" "time"
) )

2
config/config.go
View File

@ -3,7 +3,7 @@ package config
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"time" "time"
) )

2
config/helpers.go
View File

@ -2,7 +2,7 @@ package config
import ( import (
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"log" "log"
"regexp" "regexp"
"strconv" "strconv"

10
config/load_test.go
View File

@ -14,12 +14,12 @@
package config package config
import ( import (
"testing" "testing"
) )
func TestLoadFromFile(t *testing.T) { func TestLoadFromFile(t *testing.T) {
_, err := LoadFromFile("file-does-not-exist.conf") _, err := LoadFromFile("file-does-not-exist.conf")
if err == nil { if err == nil {
t.Error(err) t.Error(err)
} }
} }

2
config/parser.y.go
View File

@ -3,7 +3,7 @@
package config package config
import "fmt" import "fmt"
import "github.com/matttproud/prometheus/model" import "github.com/prometheus/prometheus/model"
//line parser.y:8 //line parser.y:8
type yySymType struct { type yySymType struct {

2
config/printer.go
View File

@ -2,7 +2,7 @@ package config
import ( import (
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"strings" "strings"
) )

14
main.go
View File

@ -16,14 +16,14 @@ package main
import ( import (
"code.google.com/p/gorest" "code.google.com/p/gorest"
"flag" "flag"
"github.com/matttproud/prometheus/api"
"github.com/matttproud/prometheus/config"
"github.com/matttproud/prometheus/retrieval"
"github.com/matttproud/prometheus/retrieval/format"
"github.com/matttproud/prometheus/rules"
"github.com/matttproud/prometheus/rules/ast"
"github.com/matttproud/prometheus/storage/metric/leveldb"
"github.com/prometheus/client_golang" "github.com/prometheus/client_golang"
"github.com/prometheus/prometheus/api"
"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/retrieval"
"github.com/prometheus/prometheus/retrieval/format"
"github.com/prometheus/prometheus/rules"
"github.com/prometheus/prometheus/rules/ast"
"github.com/prometheus/prometheus/storage/metric/leveldb"
"log" "log"
"net/http" "net/http"
"os" "os"

2
model/dto.go
View File

@ -18,7 +18,7 @@ import (
"crypto/md5" "crypto/md5"
"encoding/hex" "encoding/hex"
"errors" "errors"
dto "github.com/matttproud/prometheus/model/generated" dto "github.com/prometheus/prometheus/model/generated"
"io" "io"
"sort" "sort"
"time" "time"

2
retrieval/format/discriminator_test.go
View File

@ -15,7 +15,7 @@ package format
import ( import (
"fmt" "fmt"
"github.com/matttproud/prometheus/utility/test" "github.com/prometheus/prometheus/utility/test"
"net/http" "net/http"
"testing" "testing"
) )

2
retrieval/format/processor.go
View File

@ -14,7 +14,7 @@
package format package format
import ( import (
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"io" "io"
) )

2
retrieval/format/processor0_0_1.go
View File

@ -16,7 +16,7 @@ package format
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"io" "io"
"io/ioutil" "io/ioutil"
"time" "time"

4
retrieval/format/processor0_0_1_test.go
View File

@ -16,8 +16,8 @@ package format
import ( import (
"container/list" "container/list"
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"github.com/matttproud/prometheus/utility/test" "github.com/prometheus/prometheus/utility/test"
"io/ioutil" "io/ioutil"
"strings" "strings"
"testing" "testing"

2
retrieval/format/result.go
View File

@ -14,7 +14,7 @@
package format package format
import ( import (
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
) )
// Result encapsulates the outcome from processing a given sample from a // Result encapsulates the outcome from processing a given sample from a

2
retrieval/scheduler_test.go
View File

@ -14,7 +14,7 @@
package retrieval package retrieval
import ( import (
"github.com/matttproud/prometheus/utility/test" "github.com/prometheus/prometheus/utility/test"
"testing" "testing"
"time" "time"
) )

4
retrieval/target.go
View File

@ -14,9 +14,9 @@ package retrieval
import ( import (
"fmt" "fmt"
"github.com/matttproud/prometheus/model"
"github.com/matttproud/prometheus/retrieval/format"
"github.com/prometheus/client_golang/metrics" "github.com/prometheus/client_golang/metrics"
"github.com/prometheus/prometheus/model"
"github.com/prometheus/prometheus/retrieval/format"
"net/http" "net/http"
"time" "time"
) )

6
retrieval/targetmanager.go
View File

@ -15,9 +15,9 @@ package retrieval
import ( import (
"container/heap" "container/heap"
"github.com/matttproud/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"github.com/matttproud/prometheus/retrieval/format" "github.com/prometheus/prometheus/retrieval/format"
"log" "log"
"time" "time"
) )

4
retrieval/targetmanager_test.go
View File

@ -14,8 +14,8 @@
package retrieval package retrieval
import ( import (
"github.com/matttproud/prometheus/retrieval/format" "github.com/prometheus/prometheus/retrieval/format"
"github.com/matttproud/prometheus/utility/test" "github.com/prometheus/prometheus/utility/test"
"testing" "testing"
"time" "time"
) )

2
retrieval/targetpool.go
View File

@ -2,7 +2,7 @@ package retrieval
import ( import (
"container/heap" "container/heap"
"github.com/matttproud/prometheus/retrieval/format" "github.com/prometheus/prometheus/retrieval/format"
"log" "log"
"time" "time"
) )

2
retrieval/targetpool_test.go
View File

@ -15,7 +15,7 @@ package retrieval
import ( import (
"container/heap" "container/heap"
"github.com/matttproud/prometheus/utility/test" "github.com/prometheus/prometheus/utility/test"
"testing" "testing"
"time" "time"
) )

2
rules/ast/ast.go
View File

@ -3,7 +3,7 @@ package ast
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"log" "log"
"math" "math"
"sort" "sort"

2
rules/ast/functions.go
View File

@ -3,7 +3,7 @@ package ast
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"time" "time"
) )

4
rules/ast/persistence_adapter.go
View File

@ -2,8 +2,8 @@ package ast
import ( import (
"flag" "flag"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"github.com/matttproud/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"time" "time"
) )

4
rules/helpers.go
View File

@ -3,8 +3,8 @@ package rules
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"github.com/matttproud/prometheus/rules/ast" "github.com/prometheus/prometheus/rules/ast"
"regexp" "regexp"
"strconv" "strconv"
"time" "time"

2
rules/lexer.l.go
View File

@ -10,7 +10,7 @@ import (
"sort" "sort"
) )
import ( import (
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"strconv" "strconv"
) )

2
rules/load.go
View File

@ -3,7 +3,7 @@ package rules
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/matttproud/prometheus/rules/ast" "github.com/prometheus/prometheus/rules/ast"
"io" "io"
"os" "os"
"strings" "strings"

4
rules/manager.go
View File

@ -14,8 +14,8 @@
package rules package rules
import ( import (
"github.com/matttproud/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/matttproud/prometheus/rules/ast" "github.com/prometheus/prometheus/rules/ast"
"log" "log"
"time" "time"
) )

4
rules/parser.y.go
View File

@ -3,8 +3,8 @@
package rules package rules
import "fmt" import "fmt"
import "github.com/matttproud/prometheus/model" import "github.com/prometheus/prometheus/model"
import "github.com/matttproud/prometheus/rules/ast" import "github.com/prometheus/prometheus/rules/ast"
//line parser.y:9 //line parser.y:9
type yySymType struct { type yySymType struct {

4
rules/rules.go
View File

@ -2,8 +2,8 @@ package rules
import ( import (
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"github.com/matttproud/prometheus/rules/ast" "github.com/prometheus/prometheus/rules/ast"
"time" "time"
) )

4
rules/rules_test.go
View File

@ -2,8 +2,8 @@ package rules
import ( import (
"fmt" "fmt"
"github.com/matttproud/prometheus/rules/ast" "github.com/prometheus/prometheus/rules/ast"
"github.com/matttproud/prometheus/storage/metric/leveldb" "github.com/prometheus/prometheus/storage/metric/leveldb"
"io/ioutil" "io/ioutil"
"os" "os"
"strings" "strings"

6
rules/testdata.go
View File

@ -1,9 +1,9 @@
package rules package rules
import ( import (
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"github.com/matttproud/prometheus/rules/ast" "github.com/prometheus/prometheus/rules/ast"
"github.com/matttproud/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"time" "time"
) )

2
storage/metric/interface.go
View File

@ -14,7 +14,7 @@
package metric package metric
import ( import (
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"time" "time"
) )

10
storage/metric/leveldb/diagnostics.go
View File

@ -16,11 +16,11 @@ package leveldb
import ( import (
"code.google.com/p/goprotobuf/proto" "code.google.com/p/goprotobuf/proto"
"errors" "errors"
"github.com/matttproud/prometheus/coding" "github.com/prometheus/prometheus/coding"
"github.com/matttproud/prometheus/coding/indexable" "github.com/prometheus/prometheus/coding/indexable"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
dto "github.com/matttproud/prometheus/model/generated" dto "github.com/prometheus/prometheus/model/generated"
"github.com/matttproud/prometheus/utility" "github.com/prometheus/prometheus/utility"
"log" "log"
) )

2
storage/metric/leveldb/interface_test.go
View File

@ -14,7 +14,7 @@
package leveldb package leveldb
import ( import (
"github.com/matttproud/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"testing" "testing"
) )

6
storage/metric/leveldb/leveldb_test.go
View File

@ -16,9 +16,9 @@ package leveldb
import ( import (
"code.google.com/p/goprotobuf/proto" "code.google.com/p/goprotobuf/proto"
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
dto "github.com/matttproud/prometheus/model/generated" dto "github.com/prometheus/prometheus/model/generated"
"github.com/matttproud/prometheus/utility/test" "github.com/prometheus/prometheus/utility/test"
"io/ioutil" "io/ioutil"
"math" "math"
"math/rand" "math/rand"

4
storage/metric/leveldb/lifecycle.go
View File

@ -14,8 +14,8 @@
package leveldb package leveldb
import ( import (
index "github.com/matttproud/prometheus/storage/raw/index/leveldb" index "github.com/prometheus/prometheus/storage/raw/index/leveldb"
storage "github.com/matttproud/prometheus/storage/raw/leveldb" storage "github.com/prometheus/prometheus/storage/raw/leveldb"
"io" "io"
"log" "log"
) )

8
storage/metric/leveldb/mutable.go
View File

@ -15,10 +15,10 @@ package leveldb
import ( import (
"code.google.com/p/goprotobuf/proto" "code.google.com/p/goprotobuf/proto"
"github.com/matttproud/prometheus/coding" "github.com/prometheus/prometheus/coding"
"github.com/matttproud/prometheus/coding/indexable" "github.com/prometheus/prometheus/coding/indexable"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
dto "github.com/matttproud/prometheus/model/generated" dto "github.com/prometheus/prometheus/model/generated"
"time" "time"
) )

12
storage/metric/leveldb/reading.go
View File

@ -15,12 +15,12 @@ package leveldb
import ( import (
"code.google.com/p/goprotobuf/proto" "code.google.com/p/goprotobuf/proto"
"github.com/matttproud/prometheus/coding" "github.com/prometheus/prometheus/coding"
"github.com/matttproud/prometheus/coding/indexable" "github.com/prometheus/prometheus/coding/indexable"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
dto "github.com/matttproud/prometheus/model/generated" dto "github.com/prometheus/prometheus/model/generated"
"github.com/matttproud/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/matttproud/prometheus/utility" "github.com/prometheus/prometheus/utility"
"time" "time"
) )

2
storage/metric/leveldb/regressions_test.go
View File

@ -14,7 +14,7 @@
package leveldb package leveldb
import ( import (
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"io/ioutil" "io/ioutil"
"os" "os"
"testing" "testing"

6
storage/metric/leveldb/rule_integration_test.go
View File

@ -15,9 +15,9 @@ package leveldb
import ( import (
"fmt" "fmt"
"github.com/matttproud/prometheus/model" "github.com/prometheus/prometheus/model"
"github.com/matttproud/prometheus/storage/metric" "github.com/prometheus/prometheus/storage/metric"
"github.com/matttproud/prometheus/utility/test" "github.com/prometheus/prometheus/utility/test"
"io/ioutil" "io/ioutil"
"os" "os"
"testing" "testing"

4
storage/metric/leveldb/type.go
View File

@ -14,8 +14,8 @@
package leveldb package leveldb
import ( import (
index "github.com/matttproud/prometheus/storage/raw/index/leveldb" index "github.com/prometheus/prometheus/storage/raw/index/leveldb"
storage "github.com/matttproud/prometheus/storage/raw/leveldb" storage "github.com/prometheus/prometheus/storage/raw/leveldb"
) )
type LevelDBMetricPersistence struct { type LevelDBMetricPersistence struct {

2
storage/raw/index/interface.go
View File

@ -14,7 +14,7 @@
package index package index
import ( import (
"github.com/matttproud/prometheus/coding" "github.com/prometheus/prometheus/coding"
) )
type MembershipIndex interface { type MembershipIndex interface {

2
storage/raw/index/leveldb/interface_test.go
View File

@ -14,7 +14,7 @@
package leveldb package leveldb
import ( import (
"github.com/matttproud/prometheus/storage/raw/index" "github.com/prometheus/prometheus/storage/raw/index"
"testing" "testing"
) )

6
storage/raw/index/leveldb/leveldb.go
View File

@ -14,9 +14,9 @@
package leveldb package leveldb
import ( import (
"github.com/matttproud/prometheus/coding" "github.com/prometheus/prometheus/coding"
dto "github.com/matttproud/prometheus/model/generated" dto "github.com/prometheus/prometheus/model/generated"
"github.com/matttproud/prometheus/storage/raw/leveldb" "github.com/prometheus/prometheus/storage/raw/leveldb"
) )
var ( var (

2
storage/raw/interface.go
View File

@ -14,7 +14,7 @@
package raw package raw
import ( import (
"github.com/matttproud/prometheus/coding" "github.com/prometheus/prometheus/coding"
) )
type Pair struct { type Pair struct {

2
storage/raw/leveldb/interface_test.go
View File

@ -14,7 +14,7 @@
package leveldb package leveldb
import ( import (
"github.com/matttproud/prometheus/storage/raw" "github.com/prometheus/prometheus/storage/raw"
"testing" "testing"
) )

4
storage/raw/leveldb/leveldb.go
View File

@ -15,8 +15,8 @@ package leveldb
import ( import (
"github.com/jmhodges/levigo" "github.com/jmhodges/levigo"
"github.com/matttproud/prometheus/coding" "github.com/prometheus/prometheus/coding"
"github.com/matttproud/prometheus/storage/raw" "github.com/prometheus/prometheus/storage/raw"
"io" "io"
) )