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 (
"code.google.com/p/gorest"
"errors"
"github.com/matttproud/prometheus/rules"
"github.com/matttproud/prometheus/rules/ast"
"github.com/prometheus/prometheus/rules"
"github.com/prometheus/prometheus/rules/ast"
"sort"
"time"
)

2
config/config.go
View File

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

2
config/helpers.go
View File

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

2
config/parser.y.go
View File

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

2
config/printer.go
View File

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

14
main.go
View File

@ -16,14 +16,14 @@ package main
import (
"code.google.com/p/gorest"
"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/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"
"net/http"
"os"

2
model/dto.go
View File

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

2
retrieval/format/discriminator_test.go
View File

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

2
retrieval/format/processor.go
View File

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

2
retrieval/format/processor0_0_1.go
View File

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

4
retrieval/format/processor0_0_1_test.go
View File

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

2
retrieval/format/result.go
View File

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

2
retrieval/scheduler_test.go
View File

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

4
retrieval/target.go
View File

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

6
retrieval/targetmanager.go
View File

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

4
retrieval/targetmanager_test.go
View File

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

2
retrieval/targetpool.go
View File

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

2
retrieval/targetpool_test.go
View File

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

2
rules/ast/ast.go
View File

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

2
rules/ast/functions.go
View File

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

4
rules/ast/persistence_adapter.go
View File

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

4
rules/helpers.go
View File

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

2
rules/lexer.l.go
View File

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

2
rules/load.go
View File

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

4
rules/manager.go
View File

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

4
rules/parser.y.go
View File

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

4
rules/rules.go
View File

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

4
rules/rules_test.go
View File

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

6
rules/testdata.go
View File

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

2
storage/metric/interface.go
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
storage/raw/interface.go
View File

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

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

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

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

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