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

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"
 )

config/config.go

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

config/helpers.go

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

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)
+	}
 }

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 {

config/printer.go

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

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"

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"

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"
 )

retrieval/format/processor.go

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

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"

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"

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

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"
 )

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"
 )

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"
 )

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"
 )

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"
 )

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"
 )

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"

rules/ast/functions.go

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

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"
 )
 

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"

rules/lexer.l.go

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

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"

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"
 )

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 {

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"
 )
 

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"

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"
 )
 

storage/metric/interface.go

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

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"
 )
 

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"
 )
 

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"

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"
 )

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"
 )
 

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"
 )
 

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"

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"

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 {

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 {

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"
 )
 

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 (

storage/raw/interface.go

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

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"
 )
 

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"
 )