diff --git a/api/query.go b/api/query.go index b04123247..71853ca7a 100644 --- a/api/query.go +++ b/api/query.go @@ -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" ) diff --git a/config/config.go b/config/config.go index d501e5357..ac866ef7c 100644 --- a/config/config.go +++ b/config/config.go @@ -3,7 +3,7 @@ package config import ( "errors" "fmt" - "github.com/matttproud/prometheus/model" + "github.com/prometheus/prometheus/model" "time" ) diff --git a/config/helpers.go b/config/helpers.go index 450f12b10..ab84032f7 100644 --- a/config/helpers.go +++ b/config/helpers.go @@ -2,7 +2,7 @@ package config import ( "fmt" - "github.com/matttproud/prometheus/model" + "github.com/prometheus/prometheus/model" "log" "regexp" "strconv" diff --git a/config/load_test.go b/config/load_test.go index 61f93edca..3c03110b5 100644 --- a/config/load_test.go +++ b/config/load_test.go @@ -14,12 +14,12 @@ package config import ( - "testing" + "testing" ) func TestLoadFromFile(t *testing.T) { - _, err := LoadFromFile("file-does-not-exist.conf") - if err == nil { - t.Error(err) - } + _, err := LoadFromFile("file-does-not-exist.conf") + if err == nil { + t.Error(err) + } } diff --git a/config/parser.y.go b/config/parser.y.go index d6b0e4503..abbc24d5b 100644 --- a/config/parser.y.go +++ b/config/parser.y.go @@ -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 { diff --git a/config/printer.go b/config/printer.go index fe4e17f5d..992c51894 100644 --- a/config/printer.go +++ b/config/printer.go @@ -2,7 +2,7 @@ package config import ( "fmt" - "github.com/matttproud/prometheus/model" + "github.com/prometheus/prometheus/model" "strings" ) diff --git a/main.go b/main.go index 2f9c2b440..0672c41c2 100644 --- a/main.go +++ b/main.go @@ -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" diff --git a/model/dto.go b/model/dto.go index 113ba0676..e9695cd13 100644 --- a/model/dto.go +++ b/model/dto.go @@ -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" diff --git a/retrieval/format/discriminator_test.go b/retrieval/format/discriminator_test.go index edd8148c8..e7e48036b 100644 --- a/retrieval/format/discriminator_test.go +++ b/retrieval/format/discriminator_test.go @@ -15,7 +15,7 @@ package format import ( "fmt" - "github.com/matttproud/prometheus/utility/test" + "github.com/prometheus/prometheus/utility/test" "net/http" "testing" ) diff --git a/retrieval/format/processor.go b/retrieval/format/processor.go index 16719218d..cff9012d4 100644 --- a/retrieval/format/processor.go +++ b/retrieval/format/processor.go @@ -14,7 +14,7 @@ package format import ( - "github.com/matttproud/prometheus/model" + "github.com/prometheus/prometheus/model" "io" ) diff --git a/retrieval/format/processor0_0_1.go b/retrieval/format/processor0_0_1.go index 4990f4c24..bda8d962e 100644 --- a/retrieval/format/processor0_0_1.go +++ b/retrieval/format/processor0_0_1.go @@ -16,7 +16,7 @@ package format import ( "encoding/json" "fmt" - "github.com/matttproud/prometheus/model" + "github.com/prometheus/prometheus/model" "io" "io/ioutil" "time" diff --git a/retrieval/format/processor0_0_1_test.go b/retrieval/format/processor0_0_1_test.go index c7382354e..19b98fea3 100644 --- a/retrieval/format/processor0_0_1_test.go +++ b/retrieval/format/processor0_0_1_test.go @@ -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" diff --git a/retrieval/format/result.go b/retrieval/format/result.go index c04f744a9..c7ee6dcfd 100644 --- a/retrieval/format/result.go +++ b/retrieval/format/result.go @@ -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 diff --git a/retrieval/scheduler_test.go b/retrieval/scheduler_test.go index c02253c60..bed42929c 100644 --- a/retrieval/scheduler_test.go +++ b/retrieval/scheduler_test.go @@ -14,7 +14,7 @@ package retrieval import ( - "github.com/matttproud/prometheus/utility/test" + "github.com/prometheus/prometheus/utility/test" "testing" "time" ) diff --git a/retrieval/target.go b/retrieval/target.go index d0e0dc567..c7187d4ec 100644 --- a/retrieval/target.go +++ b/retrieval/target.go @@ -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" ) diff --git a/retrieval/targetmanager.go b/retrieval/targetmanager.go index bfe5f4cac..08c28a638 100644 --- a/retrieval/targetmanager.go +++ b/retrieval/targetmanager.go @@ -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" ) diff --git a/retrieval/targetmanager_test.go b/retrieval/targetmanager_test.go index 62c19fe25..7eb6909c8 100644 --- a/retrieval/targetmanager_test.go +++ b/retrieval/targetmanager_test.go @@ -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" ) diff --git a/retrieval/targetpool.go b/retrieval/targetpool.go index fed9ea8cf..1737709dd 100644 --- a/retrieval/targetpool.go +++ b/retrieval/targetpool.go @@ -2,7 +2,7 @@ package retrieval import ( "container/heap" - "github.com/matttproud/prometheus/retrieval/format" + "github.com/prometheus/prometheus/retrieval/format" "log" "time" ) diff --git a/retrieval/targetpool_test.go b/retrieval/targetpool_test.go index 07197b717..71afb7ef5 100644 --- a/retrieval/targetpool_test.go +++ b/retrieval/targetpool_test.go @@ -15,7 +15,7 @@ package retrieval import ( "container/heap" - "github.com/matttproud/prometheus/utility/test" + "github.com/prometheus/prometheus/utility/test" "testing" "time" ) diff --git a/rules/ast/ast.go b/rules/ast/ast.go index 6fc589d65..3b74edc71 100644 --- a/rules/ast/ast.go +++ b/rules/ast/ast.go @@ -3,7 +3,7 @@ package ast import ( "errors" "fmt" - "github.com/matttproud/prometheus/model" + "github.com/prometheus/prometheus/model" "log" "math" "sort" diff --git a/rules/ast/functions.go b/rules/ast/functions.go index 5c14ae4d4..f3e0930ce 100644 --- a/rules/ast/functions.go +++ b/rules/ast/functions.go @@ -3,7 +3,7 @@ package ast import ( "errors" "fmt" - "github.com/matttproud/prometheus/model" + "github.com/prometheus/prometheus/model" "time" ) diff --git a/rules/ast/persistence_adapter.go b/rules/ast/persistence_adapter.go index 36f634413..681f4c0b7 100644 --- a/rules/ast/persistence_adapter.go +++ b/rules/ast/persistence_adapter.go @@ -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" ) diff --git a/rules/helpers.go b/rules/helpers.go index 3dca4ef21..9f0951bc6 100644 --- a/rules/helpers.go +++ b/rules/helpers.go @@ -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" diff --git a/rules/lexer.l.go b/rules/lexer.l.go index a6e6876af..aceeaec4a 100644 --- a/rules/lexer.l.go +++ b/rules/lexer.l.go @@ -10,7 +10,7 @@ import ( "sort" ) import ( -"github.com/matttproud/prometheus/model" +"github.com/prometheus/prometheus/model" "strconv" ) diff --git a/rules/load.go b/rules/load.go index 7b71599b2..bf12fdde8 100644 --- a/rules/load.go +++ b/rules/load.go @@ -3,7 +3,7 @@ package rules import ( "errors" "fmt" - "github.com/matttproud/prometheus/rules/ast" + "github.com/prometheus/prometheus/rules/ast" "io" "os" "strings" diff --git a/rules/manager.go b/rules/manager.go index 16380f93b..c80440058 100644 --- a/rules/manager.go +++ b/rules/manager.go @@ -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" ) diff --git a/rules/parser.y.go b/rules/parser.y.go index f1712842c..7e6b3c521 100644 --- a/rules/parser.y.go +++ b/rules/parser.y.go @@ -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 { diff --git a/rules/rules.go b/rules/rules.go index 1dda711fc..cccadbd79 100644 --- a/rules/rules.go +++ b/rules/rules.go @@ -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" ) diff --git a/rules/rules_test.go b/rules/rules_test.go index b9e9c3bbe..c02fac029 100644 --- a/rules/rules_test.go +++ b/rules/rules_test.go @@ -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" diff --git a/rules/testdata.go b/rules/testdata.go index 54c73afd7..4d5ab70e9 100644 --- a/rules/testdata.go +++ b/rules/testdata.go @@ -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" ) diff --git a/storage/metric/interface.go b/storage/metric/interface.go index c4a230e7c..a6c2c688c 100644 --- a/storage/metric/interface.go +++ b/storage/metric/interface.go @@ -14,7 +14,7 @@ package metric import ( - "github.com/matttproud/prometheus/model" + "github.com/prometheus/prometheus/model" "time" ) diff --git a/storage/metric/leveldb/diagnostics.go b/storage/metric/leveldb/diagnostics.go index 3c38f1810..de6a72528 100644 --- a/storage/metric/leveldb/diagnostics.go +++ b/storage/metric/leveldb/diagnostics.go @@ -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" ) diff --git a/storage/metric/leveldb/interface_test.go b/storage/metric/leveldb/interface_test.go index f40994fef..bbd54a923 100644 --- a/storage/metric/leveldb/interface_test.go +++ b/storage/metric/leveldb/interface_test.go @@ -14,7 +14,7 @@ package leveldb import ( - "github.com/matttproud/prometheus/storage/metric" + "github.com/prometheus/prometheus/storage/metric" "testing" ) diff --git a/storage/metric/leveldb/leveldb_test.go b/storage/metric/leveldb/leveldb_test.go index 91ff6df74..d914ac28c 100644 --- a/storage/metric/leveldb/leveldb_test.go +++ b/storage/metric/leveldb/leveldb_test.go @@ -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" diff --git a/storage/metric/leveldb/lifecycle.go b/storage/metric/leveldb/lifecycle.go index a9938193a..e09c83f10 100644 --- a/storage/metric/leveldb/lifecycle.go +++ b/storage/metric/leveldb/lifecycle.go @@ -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" ) diff --git a/storage/metric/leveldb/mutable.go b/storage/metric/leveldb/mutable.go index 13a482d93..ab927ed45 100644 --- a/storage/metric/leveldb/mutable.go +++ b/storage/metric/leveldb/mutable.go @@ -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" ) diff --git a/storage/metric/leveldb/reading.go b/storage/metric/leveldb/reading.go index 0f83188af..2906ca145 100644 --- a/storage/metric/leveldb/reading.go +++ b/storage/metric/leveldb/reading.go @@ -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" ) diff --git a/storage/metric/leveldb/regressions_test.go b/storage/metric/leveldb/regressions_test.go index e89985127..94559bc46 100644 --- a/storage/metric/leveldb/regressions_test.go +++ b/storage/metric/leveldb/regressions_test.go @@ -14,7 +14,7 @@ package leveldb import ( - "github.com/matttproud/prometheus/model" + "github.com/prometheus/prometheus/model" "io/ioutil" "os" "testing" diff --git a/storage/metric/leveldb/rule_integration_test.go b/storage/metric/leveldb/rule_integration_test.go index a8db95fb5..c7cf6b3ad 100644 --- a/storage/metric/leveldb/rule_integration_test.go +++ b/storage/metric/leveldb/rule_integration_test.go @@ -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" diff --git a/storage/metric/leveldb/type.go b/storage/metric/leveldb/type.go index 92d84121b..e5c7be6f7 100644 --- a/storage/metric/leveldb/type.go +++ b/storage/metric/leveldb/type.go @@ -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 { diff --git a/storage/raw/index/interface.go b/storage/raw/index/interface.go index 9118dd60f..7ffecd7f0 100644 --- a/storage/raw/index/interface.go +++ b/storage/raw/index/interface.go @@ -14,7 +14,7 @@ package index import ( - "github.com/matttproud/prometheus/coding" + "github.com/prometheus/prometheus/coding" ) type MembershipIndex interface { diff --git a/storage/raw/index/leveldb/interface_test.go b/storage/raw/index/leveldb/interface_test.go index bc3a6b298..3b005d745 100644 --- a/storage/raw/index/leveldb/interface_test.go +++ b/storage/raw/index/leveldb/interface_test.go @@ -14,7 +14,7 @@ package leveldb import ( - "github.com/matttproud/prometheus/storage/raw/index" + "github.com/prometheus/prometheus/storage/raw/index" "testing" ) diff --git a/storage/raw/index/leveldb/leveldb.go b/storage/raw/index/leveldb/leveldb.go index 0d5a73d6d..df5456c95 100644 --- a/storage/raw/index/leveldb/leveldb.go +++ b/storage/raw/index/leveldb/leveldb.go @@ -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 ( diff --git a/storage/raw/interface.go b/storage/raw/interface.go index 502390ede..5f2539bcc 100644 --- a/storage/raw/interface.go +++ b/storage/raw/interface.go @@ -14,7 +14,7 @@ package raw import ( - "github.com/matttproud/prometheus/coding" + "github.com/prometheus/prometheus/coding" ) type Pair struct { diff --git a/storage/raw/leveldb/interface_test.go b/storage/raw/leveldb/interface_test.go index ce556287f..25158470f 100644 --- a/storage/raw/leveldb/interface_test.go +++ b/storage/raw/leveldb/interface_test.go @@ -14,7 +14,7 @@ package leveldb import ( - "github.com/matttproud/prometheus/storage/raw" + "github.com/prometheus/prometheus/storage/raw" "testing" ) diff --git a/storage/raw/leveldb/leveldb.go b/storage/raw/leveldb/leveldb.go index 52afd506e..264a4ada1 100644 --- a/storage/raw/leveldb/leveldb.go +++ b/storage/raw/leveldb/leveldb.go @@ -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" )