diff --git a/.gitignore b/.gitignore index 083a2044948..8e336b69af2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -cmd/prism/prism +cmd/cortex/cortex .uptodate .pkg diff --git a/Makefile b/Makefile index 1b28736123d..ab45a8bbe08 100644 --- a/Makefile +++ b/Makefile @@ -25,17 +25,17 @@ images: $(info $(IMAGE_NAMES)) # List of exes please -PRISM_EXE := ./cmd/prism/prism -EXES = $(PRISM_EXE) +CORTEX_EXE := ./cmd/cortex/cortex +EXES = $(CORTEX_EXE) all: $(UPTODATE_FILES) # And what goes into each exe -$(PRISM_EXE): $(shell find . -name '*.go') $(shell find ui/static ui/templates) +$(CORTEX_EXE): $(shell find . -name '*.go') $(shell find ui/static ui/templates) # And now what goes into each image -prism-build/$(UPTODATE): prism-build/* -cmd/prism/$(UPTODATE): $(PRISM_EXE) +cortex-build/$(UPTODATE): cortex-build/* +cmd/cortex/$(UPTODATE): $(CORTEX_EXE) # All the boiler plate for building golang follows: SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E") @@ -53,23 +53,23 @@ NETGO_CHECK = @strings $@ | grep cgo_stub\\\.go >/dev/null || { \ ifeq ($(BUILD_IN_CONTAINER),true) -$(EXES) lint test assets: prism-build/$(UPTODATE) +$(EXES) lint test assets: cortex-build/$(UPTODATE) @mkdir -p $(shell pwd)/.pkg $(SUDO) docker run $(RM) -ti \ -v $(shell pwd)/.pkg:/go/pkg \ - -v $(shell pwd):/go/src/github.com/weaveworks/prism \ - $(IMAGE_PREFIX)/prism-build $@ + -v $(shell pwd):/go/src/github.com/weaveworks/cortex \ + $(IMAGE_PREFIX)/cortex-build $@ else -$(EXES): prism-build/$(UPTODATE) +$(EXES): cortex-build/$(UPTODATE) go build $(GO_FLAGS) -o $@ ./$(@D) $(NETGO_CHECK) -lint: prism-build/$(UPTODATE) +lint: cortex-build/$(UPTODATE) ./tools/lint -notestpackage -ignorespelling queriers -ignorespelling Queriers . -test: prism-build/$(UPTODATE) +test: cortex-build/$(UPTODATE) ./tools/test -no-go-get # Manual step that needs to be run after making any changes to the web assets @@ -78,7 +78,7 @@ test: prism-build/$(UPTODATE) # TODO(juliusv): Figure out if we can make this an automatic part of the build # process. It currently produces diffs (source file timestamps are getting # baked into bindata.go) and those make CI fail. -assets: prism-build/$(UPTODATE) +assets: cortex-build/$(UPTODATE) go-bindata -pkg ui -o ui/bindata.go -ignore '(.*\.map|bootstrap\.js|bootstrap-theme\.css|bootstrap\.css)' ui/templates/... ui/static/... endif diff --git a/README.md b/README.md index 8b52a068e41..bae63cd9ac1 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# Prism: A multitenant, horizontally scalable Prometheus as a service +# Cortex: A multitenant, horizontally scalable Prometheus as a service -[![Circle CI](https://circleci.com/gh/weaveworks/prism/tree/master.svg?style=shield)](https://circleci.com/gh/weaveworks/prism/tree/master) +[![Circle CI](https://circleci.com/gh/weaveworks/cortex/tree/master.svg?style=shield)](https://circleci.com/gh/weaveworks/cortex/tree/master) [![Slack Status](https://slack.weave.works/badge.svg)](https://slack.weave.works) *NB this is a pre-release, pre-alpha service. Availability will not be 100%. APIs will change. Data will be lost.* -Prism is an API compatible [Prometheus](https://prometheus.io) +Cortex is an API compatible [Prometheus](https://prometheus.io) implementation, that natively supports multitenancy and scale-out clustering. -Prism is a [Weaveworks](https://weave.works) project that forms a major part +Cortex is a [Weaveworks](https://weave.works) project that forms a major part of [Weave Cloud](https://cloud.weave.works). If you are interested in using our hosted Prometheus as a service, please contact [help@weave.works](mailto:help@weave.works). diff --git a/chunk/chunk_cache.go b/chunk/chunk_cache.go index 1b6deb568ff..364a69c1ec3 100644 --- a/chunk/chunk_cache.go +++ b/chunk/chunk_cache.go @@ -24,19 +24,19 @@ import ( var ( memcacheRequests = prometheus.NewCounter(prometheus.CounterOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "memcache_requests_total", Help: "Total count of chunks requested from memcache.", }) memcacheHits = prometheus.NewCounter(prometheus.CounterOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "memcache_hits_total", Help: "Total count of chunks found in memcache.", }) memcacheRequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "memcache_request_duration_seconds", Help: "Total time spent in seconds doing memcache requests.", Buckets: []float64{.001, .0025, .005, .01, .025, .05}, diff --git a/chunk/chunk_store.go b/chunk/chunk_store.go index a39e4f70d48..f3a699140d3 100644 --- a/chunk/chunk_store.go +++ b/chunk/chunk_store.go @@ -36,7 +36,7 @@ import ( "github.com/weaveworks/scope/common/instrument" "golang.org/x/net/context" - "github.com/weaveworks/prism/user" + "github.com/weaveworks/cortex/user" ) const ( @@ -51,29 +51,29 @@ const ( var ( dynamoRequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "dynamo_request_duration_seconds", Help: "Time spent doing DynamoDB requests.", Buckets: []float64{.001, .0025, .005, .01, .025, .05, .1, .25, .5, 1}, }, []string{"operation", "status_code"}) dynamoRequestPages = prometheus.NewHistogram(prometheus.HistogramOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "dynamo_request_pages", Help: "Number of pages by DynamoDB request", Buckets: prometheus.ExponentialBuckets(1, 2.0, 5), }) dynamoConsumedCapacity = prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "dynamo_consumed_capacity_total", Help: "The capacity units consumed by operation.", }, []string{"operation"}) droppedMatches = prometheus.NewCounter(prometheus.CounterOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "dropped_matches_total", Help: "The number of chunks fetched but later dropped for not matching.", }) s3RequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "s3_request_duration_seconds", Help: "Time spent doing S3 requests.", Buckets: []float64{.025, .05, .1, .25, .5, 1, 2}, diff --git a/chunk/chunk_store_test.go b/chunk/chunk_store_test.go index 51ffdc5e8ec..ca6cb57f364 100644 --- a/chunk/chunk_store_test.go +++ b/chunk/chunk_store_test.go @@ -26,7 +26,7 @@ import ( "github.com/tomwilkie/go-mockaws" "golang.org/x/net/context" - "github.com/weaveworks/prism/user" + "github.com/weaveworks/cortex/user" ) func init() { diff --git a/circle.yml b/circle.yml index d5bb3d69141..cde8e7b0ffe 100644 --- a/circle.yml +++ b/circle.yml @@ -19,5 +19,5 @@ deployment: branch: master commands: - docker login -e "$DOCKER_REGISTRY_EMAIL" -u "$DOCKER_REGISTRY_USER" -p "$DOCKER_REGISTRY_PASSWORD" - - docker push weaveworks/prism:$(./tools/image-tag) - - wcloud deploy -u circle weaveworks/prism:$(./tools/image-tag) + - docker push weaveworks/cortex:$(./tools/image-tag) + - wcloud deploy -u circle weaveworks/cortex:$(./tools/image-tag) diff --git a/cmd/prism/Dockerfile b/cmd/cortex/Dockerfile similarity index 50% rename from cmd/prism/Dockerfile rename to cmd/cortex/Dockerfile index ba51cf6f3e4..171344d2b33 100644 --- a/cmd/prism/Dockerfile +++ b/cmd/cortex/Dockerfile @@ -1,4 +1,4 @@ FROM quay.io/prometheus/busybox:latest -COPY prism /bin/prism +COPY cortex /bin/cortex EXPOSE 9094 -ENTRYPOINT [ "/bin/prism" ] +ENTRYPOINT [ "/bin/cortex" ] diff --git a/cmd/prism/main.go b/cmd/cortex/main.go similarity index 89% rename from cmd/prism/main.go rename to cmd/cortex/main.go index 6ef4b9ce957..a83765b7e80 100644 --- a/cmd/prism/main.go +++ b/cmd/cortex/main.go @@ -31,12 +31,12 @@ import ( "github.com/weaveworks/scope/common/middleware" "golang.org/x/net/context" - "github.com/weaveworks/prism" - "github.com/weaveworks/prism/chunk" - "github.com/weaveworks/prism/ingester" - "github.com/weaveworks/prism/ring" - "github.com/weaveworks/prism/ui" - "github.com/weaveworks/prism/user" + "github.com/weaveworks/cortex" + "github.com/weaveworks/cortex/chunk" + "github.com/weaveworks/cortex/ingester" + "github.com/weaveworks/cortex/ring" + "github.com/weaveworks/cortex/ui" + "github.com/weaveworks/cortex/user" ) const ( @@ -49,7 +49,7 @@ const ( var ( requestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "request_duration_seconds", Help: "Time (in seconds) spent serving HTTP requests.", Buckets: prometheus.DefBuckets, @@ -78,7 +78,7 @@ type cfg struct { numTokens int logSuccess bool - distributorConfig prism.DistributorConfig + distributorConfig cortex.DistributorConfig } func main() { @@ -120,8 +120,8 @@ func main() { case modeDistributor: ring := ring.New(consul) cfg.distributorConfig.Ring = ring - cfg.distributorConfig.ClientFactory = func(address string) (*prism.IngesterClient, error) { - return prism.NewIngesterClient(address, cfg.remoteTimeout) + cfg.distributorConfig.ClientFactory = func(address string) (*cortex.IngesterClient, error) { + return cortex.NewIngesterClient(address, cfg.remoteTimeout) } defer ring.Stop() setupDistributor(cfg.distributorConfig, chunkStore, cfg.logSuccess) @@ -186,18 +186,18 @@ func setupChunkStore(cfg cfg) (chunk.Store, error) { } func setupDistributor( - cfg prism.DistributorConfig, + cfg cortex.DistributorConfig, chunkStore chunk.Store, logSuccess bool, ) { - distributor, err := prism.NewDistributor(cfg) + distributor, err := cortex.NewDistributor(cfg) if err != nil { log.Fatal(err) } prometheus.MustRegister(distributor) prefix := "/api/prom" - http.Handle(prefix+"/push", instrument(logSuccess, prism.AppenderHandler(distributor))) + http.Handle(prefix+"/push", instrument(logSuccess, cortex.AppenderHandler(distributor))) // TODO: Move querier to separate binary. setupQuerier(distributor, chunkStore, prefix, logSuccess) @@ -209,15 +209,15 @@ func setupDistributor( // | // `----------> ChunkQuerier -> DynamoDB/S3 func setupQuerier( - distributor *prism.Distributor, + distributor *cortex.Distributor, chunkStore chunk.Store, prefix string, logSuccess bool, ) { - querier := prism.MergeQuerier{ - Queriers: []prism.Querier{ + querier := cortex.MergeQuerier{ + Queriers: []cortex.Querier{ distributor, - &prism.ChunkQuerier{ + &cortex.ChunkQuerier{ Store: chunkStore, }, }, @@ -256,9 +256,9 @@ func setupIngester( } prometheus.MustRegister(ingester) - http.Handle("/push", instrument(logSuccess, prism.AppenderHandler(ingester))) - http.Handle("/query", instrument(logSuccess, prism.QueryHandler(ingester))) - http.Handle("/label_values", instrument(logSuccess, prism.LabelValuesHandler(ingester))) + http.Handle("/push", instrument(logSuccess, cortex.AppenderHandler(ingester))) + http.Handle("/query", instrument(logSuccess, cortex.QueryHandler(ingester))) + http.Handle("/label_values", instrument(logSuccess, cortex.LabelValuesHandler(ingester))) return ingester } diff --git a/prism-build/Dockerfile b/cortex-build/Dockerfile similarity index 100% rename from prism-build/Dockerfile rename to cortex-build/Dockerfile diff --git a/prism-build/build.sh b/cortex-build/build.sh similarity index 91% rename from prism-build/build.sh rename to cortex-build/build.sh index d17fe8bc9b0..79fc19e458d 100755 --- a/prism-build/build.sh +++ b/cortex-build/build.sh @@ -2,7 +2,7 @@ set -eu -SRC_PATH=$GOPATH/src/github.com/weaveworks/prism +SRC_PATH=$GOPATH/src/github.com/weaveworks/cortex # If we run make directly, any files created on the bind mount # will have awkward ownership. So we switch to a user with the diff --git a/prism.pb.go b/cortex.pb.go similarity index 63% rename from prism.pb.go rename to cortex.pb.go index ef32bfb611f..731f380254d 100644 --- a/prism.pb.go +++ b/cortex.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-go. -// source: prism.proto +// source: cortex.proto // DO NOT EDIT! /* -Package prism is a generated protocol buffer package. +Package cortex is a generated protocol buffer package. It is generated from these files: - prism.proto + cortex.proto It has these top-level messages: Sample @@ -18,7 +18,7 @@ It has these top-level messages: LabelValuesRequest LabelValuesResponse */ -package prism +package cortex import proto "github.com/golang/protobuf/proto" import fmt "fmt" @@ -108,7 +108,7 @@ func (m *TimeSeries) GetSamples() []*Sample { } type LabelMatcher struct { - Type MatchType `protobuf:"varint,1,opt,name=type,enum=prism.MatchType" json:"type,omitempty"` + Type MatchType `protobuf:"varint,1,opt,name=type,enum=cortex.MatchType" json:"type,omitempty"` Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` Value string `protobuf:"bytes,3,opt,name=value" json:"value,omitempty"` } @@ -171,45 +171,45 @@ func (*LabelValuesResponse) ProtoMessage() {} func (*LabelValuesResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } func init() { - proto.RegisterType((*Sample)(nil), "prism.Sample") - proto.RegisterType((*LabelPair)(nil), "prism.LabelPair") - proto.RegisterType((*TimeSeries)(nil), "prism.TimeSeries") - proto.RegisterType((*LabelMatcher)(nil), "prism.LabelMatcher") - proto.RegisterType((*ReadRequest)(nil), "prism.ReadRequest") - proto.RegisterType((*ReadResponse)(nil), "prism.ReadResponse") - proto.RegisterType((*LabelValuesRequest)(nil), "prism.LabelValuesRequest") - proto.RegisterType((*LabelValuesResponse)(nil), "prism.LabelValuesResponse") - proto.RegisterEnum("prism.MatchType", MatchType_name, MatchType_value) + proto.RegisterType((*Sample)(nil), "cortex.Sample") + proto.RegisterType((*LabelPair)(nil), "cortex.LabelPair") + proto.RegisterType((*TimeSeries)(nil), "cortex.TimeSeries") + proto.RegisterType((*LabelMatcher)(nil), "cortex.LabelMatcher") + proto.RegisterType((*ReadRequest)(nil), "cortex.ReadRequest") + proto.RegisterType((*ReadResponse)(nil), "cortex.ReadResponse") + proto.RegisterType((*LabelValuesRequest)(nil), "cortex.LabelValuesRequest") + proto.RegisterType((*LabelValuesResponse)(nil), "cortex.LabelValuesResponse") + proto.RegisterEnum("cortex.MatchType", MatchType_name, MatchType_value) } -func init() { proto.RegisterFile("prism.proto", fileDescriptor0) } +func init() { proto.RegisterFile("cortex.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 410 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x52, 0x5d, 0x4b, 0xe3, 0x50, - 0x10, 0xdd, 0x24, 0x6d, 0x77, 0x33, 0x69, 0xbb, 0xd9, 0xdb, 0x7d, 0xe8, 0x8b, 0xa0, 0x41, 0xb0, - 0x88, 0x54, 0xb4, 0x08, 0xbe, 0x16, 0x29, 0x8a, 0xf4, 0x43, 0x6f, 0xa3, 0xf8, 0x64, 0x48, 0xed, - 0x05, 0x03, 0x49, 0x1b, 0x73, 0x53, 0xc1, 0x3f, 0xe2, 0xef, 0x75, 0x32, 0x37, 0x4d, 0x52, 0xe8, - 0x5b, 0xe6, 0xcc, 0xcc, 0xb9, 0xe7, 0x9c, 0x09, 0x58, 0x71, 0x12, 0xc8, 0xa8, 0x1f, 0x27, 0xeb, - 0x74, 0xcd, 0xea, 0x54, 0x38, 0x43, 0x68, 0xcc, 0xfd, 0x28, 0x0e, 0x05, 0xfb, 0x0f, 0xf5, 0x4f, - 0x3f, 0xdc, 0x88, 0xae, 0x76, 0xa8, 0xf5, 0x34, 0xae, 0x0a, 0x76, 0x04, 0xcd, 0x34, 0x88, 0x84, - 0x4c, 0x71, 0xc8, 0x8b, 0x64, 0x57, 0xc7, 0xa6, 0xc1, 0xad, 0x02, 0x9b, 0x48, 0xe7, 0x0a, 0xcc, - 0xb1, 0xbf, 0x10, 0xe1, 0x83, 0x1f, 0x24, 0x8c, 0x41, 0x6d, 0xe5, 0x47, 0x8a, 0xc4, 0xe4, 0xf4, - 0x5d, 0x32, 0xeb, 0x04, 0xaa, 0xc2, 0xf1, 0x00, 0x5c, 0x64, 0x99, 0x8b, 0x24, 0x10, 0x92, 0xf5, - 0xa0, 0x11, 0x66, 0x24, 0x12, 0x37, 0x8d, 0x9e, 0x75, 0x69, 0xf7, 0x95, 0xd8, 0x82, 0x99, 0xe7, - 0x7d, 0x76, 0x02, 0xbf, 0x25, 0x29, 0xce, 0xc4, 0x64, 0xa3, 0xad, 0x7c, 0x54, 0xf9, 0xe0, 0xdb, - 0xae, 0xf3, 0x0a, 0x4d, 0xda, 0x9e, 0xf8, 0xe9, 0xdb, 0xbb, 0x48, 0xd8, 0x31, 0xd4, 0xd2, 0xaf, - 0x58, 0x49, 0x6b, 0x17, 0x0f, 0x50, 0xd7, 0x45, 0x9c, 0x53, 0xb7, 0x30, 0xa0, 0xef, 0x33, 0x60, - 0x54, 0x0d, 0x7c, 0x6b, 0x60, 0x71, 0xe1, 0x2f, 0xb9, 0xf8, 0xd8, 0x60, 0x18, 0xec, 0x0c, 0x18, - 0x46, 0x92, 0xa4, 0xde, 0x4e, 0x60, 0x1a, 0x05, 0x66, 0x53, 0xc7, 0x2d, 0x53, 0x43, 0xc3, 0xb6, - 0x58, 0x2d, 0xbd, 0x3d, 0xe1, 0xb6, 0x11, 0xaf, 0x4e, 0x9e, 0xc3, 0x9f, 0x48, 0x59, 0x90, 0x28, - 0x20, 0x73, 0xdc, 0xa9, 0x86, 0x93, 0xdb, 0xe3, 0xc5, 0x10, 0xde, 0xb4, 0xa9, 0x74, 0xc9, 0x78, - 0xbd, 0x92, 0x82, 0x5d, 0x00, 0xd0, 0x33, 0x94, 0x74, 0x9e, 0xef, 0xbf, 0x9c, 0xa2, 0x3c, 0x01, - 0xaf, 0x0c, 0x39, 0x03, 0x60, 0x44, 0xfe, 0x9c, 0x39, 0x95, 0x5b, 0x87, 0x07, 0x00, 0x74, 0x04, - 0xaf, 0x72, 0x62, 0x93, 0x90, 0x29, 0x02, 0xce, 0x35, 0x74, 0x76, 0x96, 0xf2, 0xe7, 0xf1, 0x17, - 0x52, 0x5b, 0x14, 0x9b, 0x12, 0x60, 0x72, 0x2b, 0x2c, 0x47, 0x4f, 0xef, 0xc1, 0x2c, 0xee, 0xc0, - 0x4c, 0xa8, 0x8f, 0x1e, 0x9f, 0x86, 0x63, 0xfb, 0x17, 0x6b, 0x81, 0x39, 0x9d, 0xb9, 0x9e, 0x2a, - 0x35, 0xf6, 0x17, 0x03, 0x1f, 0xdd, 0x8e, 0x5e, 0xbc, 0xc9, 0xd0, 0xbd, 0xb9, 0xb3, 0x75, 0x3c, - 0x56, 0x5b, 0x01, 0xd3, 0x59, 0x8e, 0x19, 0x8b, 0x06, 0xfd, 0xdf, 0x83, 0x9f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x31, 0xd4, 0x4b, 0x4c, 0xee, 0x02, 0x00, 0x00, + // 415 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x52, 0xdf, 0x6b, 0xd4, 0x40, + 0x10, 0x76, 0x2f, 0xed, 0x69, 0x26, 0xf1, 0x3c, 0xc7, 0x3e, 0xdc, 0x8b, 0x70, 0x0d, 0x08, 0x51, + 0xa4, 0x48, 0x8b, 0xe0, 0xeb, 0x29, 0x87, 0x22, 0xbd, 0xab, 0x6e, 0xa3, 0xf8, 0x16, 0xb6, 0xbd, + 0x01, 0x03, 0xd9, 0x24, 0x66, 0xb7, 0x62, 0xff, 0x12, 0xff, 0xdd, 0x92, 0xd9, 0xfc, 0x3a, 0xb8, + 0xb7, 0xcc, 0xcc, 0xb7, 0xdf, 0x7c, 0xdf, 0x37, 0x81, 0xf0, 0xb6, 0xac, 0x2d, 0xfd, 0x3b, 0xab, + 0xea, 0xd2, 0x96, 0x38, 0x75, 0x55, 0xb4, 0x82, 0xe9, 0xb5, 0xd2, 0x55, 0x4e, 0x78, 0x02, 0xc7, + 0x7f, 0x55, 0x7e, 0x47, 0x0b, 0xb1, 0x14, 0xb1, 0x90, 0xae, 0xc0, 0x53, 0x08, 0x6d, 0xa6, 0xc9, + 0x58, 0xa5, 0xab, 0x54, 0x9b, 0xc5, 0x64, 0x29, 0x62, 0x4f, 0x06, 0x7d, 0x6f, 0x63, 0xa2, 0xf7, + 0xe0, 0x5f, 0xaa, 0x1b, 0xca, 0xbf, 0xa9, 0xac, 0x46, 0x84, 0xa3, 0x42, 0x69, 0x47, 0xe2, 0x4b, + 0xfe, 0x1e, 0x98, 0x27, 0xdc, 0x74, 0x45, 0xa4, 0x00, 0x92, 0x4c, 0xd3, 0x35, 0xd5, 0x19, 0x19, + 0x7c, 0x0d, 0xd3, 0xbc, 0x21, 0x31, 0x0b, 0xb1, 0xf4, 0xe2, 0xe0, 0xfc, 0xf9, 0x59, 0x2b, 0xb7, + 0xa7, 0x96, 0x2d, 0x00, 0x63, 0x78, 0x6c, 0x58, 0x72, 0xa3, 0xa6, 0xc1, 0xce, 0x3a, 0xac, 0x73, + 0x22, 0xbb, 0x71, 0x94, 0x42, 0xc8, 0xcf, 0x37, 0xca, 0xde, 0xfe, 0xa6, 0x1a, 0x5f, 0xc1, 0x91, + 0xbd, 0xaf, 0x9c, 0xb8, 0xd9, 0xb0, 0x82, 0xc7, 0xc9, 0x7d, 0x45, 0x92, 0xc7, 0xbd, 0x87, 0xc9, + 0x21, 0x0f, 0xde, 0xd8, 0xc3, 0x7f, 0x01, 0x81, 0x24, 0xb5, 0x93, 0xf4, 0xe7, 0x8e, 0x8c, 0xc5, + 0xb7, 0x80, 0xc6, 0xaa, 0xda, 0xa6, 0x7b, 0x99, 0x09, 0xce, 0x6c, 0xce, 0x93, 0x64, 0x08, 0x0e, + 0x63, 0x98, 0x53, 0xb1, 0x4b, 0x0f, 0xe4, 0x3b, 0xa3, 0x62, 0x37, 0x46, 0xbe, 0x83, 0x27, 0xda, + 0x79, 0x30, 0x0b, 0x8f, 0x3d, 0x9f, 0xec, 0xe5, 0xd3, 0x1a, 0x94, 0x3d, 0x2a, 0xfa, 0x08, 0xa1, + 0x13, 0x66, 0xaa, 0xb2, 0x30, 0x84, 0xe7, 0x00, 0xbc, 0x87, 0xd3, 0x6e, 0x33, 0xc6, 0x8e, 0x63, + 0xb8, 0x83, 0x1c, 0xa1, 0xa2, 0x0b, 0x40, 0x66, 0xff, 0xd9, 0x78, 0x35, 0x9d, 0xc7, 0x97, 0x00, + 0x7c, 0x88, 0x74, 0x74, 0x67, 0x9f, 0x3b, 0x5b, 0xa5, 0x29, 0xfa, 0x00, 0x2f, 0xf6, 0x1e, 0xb5, + 0xfb, 0x4f, 0x21, 0x74, 0xaf, 0x38, 0x38, 0xa7, 0xc0, 0x97, 0x41, 0x3e, 0x40, 0xdf, 0x7c, 0x05, + 0xbf, 0xbf, 0x04, 0xfa, 0x70, 0xbc, 0xfe, 0xfe, 0x63, 0x75, 0x39, 0x7f, 0x84, 0x4f, 0xc1, 0xdf, + 0x5e, 0x25, 0xa9, 0x2b, 0x05, 0x3e, 0x83, 0x40, 0xae, 0x3f, 0xaf, 0x7f, 0xa5, 0x9b, 0x55, 0xf2, + 0xe9, 0xcb, 0x7c, 0x82, 0x08, 0x33, 0xd7, 0xd8, 0x5e, 0xb5, 0x3d, 0xef, 0x66, 0xca, 0x7f, 0xf9, + 0xc5, 0x43, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaa, 0xf2, 0xff, 0x3d, 0xf5, 0x02, 0x00, 0x00, } diff --git a/prism.proto b/cortex.proto similarity index 97% rename from prism.proto rename to cortex.proto index 181193d0142..a65a93999cf 100644 --- a/prism.proto +++ b/cortex.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package prism; +package cortex; message Sample { double value = 1; diff --git a/distributor.go b/distributor.go index 2ad8ea48a75..313eeaf7ba4 100644 --- a/distributor.go +++ b/distributor.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package prism +package cortex import ( "fmt" @@ -25,19 +25,19 @@ import ( "github.com/weaveworks/scope/common/instrument" "golang.org/x/net/context" - "github.com/weaveworks/prism/ring" - "github.com/weaveworks/prism/user" + "github.com/weaveworks/cortex/ring" + "github.com/weaveworks/cortex/user" ) var ( numClientsDesc = prometheus.NewDesc( - "prism_distributor_ingester_clients", + "cortex_distributor_ingester_clients", "The current number of ingester clients.", nil, nil, ) ) -// Distributor is a storage.SampleAppender and a prism.Querier which +// Distributor is a storage.SampleAppender and a cortex.Querier which // forwards appends and queries to individual ingesters. type Distributor struct { cfg DistributorConfig @@ -92,44 +92,44 @@ func NewDistributor(cfg DistributorConfig) (*Distributor, error) { cfg: cfg, clients: map[string]*IngesterClient{}, queryDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "distributor_query_duration_seconds", Help: "Time spent executing expression queries.", Buckets: []float64{.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10, 20, 30}, }, []string{"method", "status_code"}), receivedSamples: prometheus.NewCounter(prometheus.CounterOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "distributor_received_samples_total", Help: "The total number of received samples.", }), sendDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "distributor_send_duration_seconds", Help: "Time spent sending a sample batch to multiple replicated ingesters.", Buckets: []float64{.001, .0025, .005, .01, .025, .05, .1, .25, .5, 1}, }, []string{"method", "status_code"}), ingesterAppends: prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "distributor_ingester_appends_total", Help: "The total number of batch appends sent to ingesters.", }, []string{"ingester"}), ingesterAppendFailures: prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "distributor_ingester_append_failures_total", Help: "The total number of failed batch appends sent to ingesters.", }, []string{"ingester"}), ingesterQueries: prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "distributor_ingester_queries_total", Help: "The total number of queries sent to ingesters.", }, []string{"ingester"}), ingesterQueryFailures: prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "prism", + Namespace: "cortex", Name: "distributor_ingester_query_failures_total", Help: "The total number of failed queries sent to ingesters.", }, []string{"ingester"}), ingestersAlive: prometheus.NewDesc( - "prism_distributor_ingesters_alive", + "cortex_distributor_ingesters_alive", "Number of ingesters in the ring that have heartbeats within timeout.", nil, nil, ), diff --git a/ingester/ingester.go b/ingester/ingester.go index bd30c8d0f24..3f14bee1a6f 100644 --- a/ingester/ingester.go +++ b/ingester/ingester.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/common/log" "github.com/prometheus/common/model" prom_chunk "github.com/prometheus/prometheus/storage/local/chunk" - prism "github.com/weaveworks/prism/chunk" - "github.com/weaveworks/prism/user" + cortex "github.com/weaveworks/cortex/chunk" + "github.com/weaveworks/cortex/user" "golang.org/x/net/context" "github.com/prometheus/prometheus/storage/metric" @@ -30,12 +30,12 @@ const ( var ( memorySeriesDesc = prometheus.NewDesc( - "prism_ingester_memory_series", + "cortex_ingester_memory_series", "The current number of series in memory.", nil, nil, ) memoryUsersDesc = prometheus.NewDesc( - "prism_ingester_memory_users", + "cortex_ingester_memory_users", "The current number of users in memory.", nil, nil, ) @@ -54,12 +54,12 @@ var ( // Its like MemorySeriesStorage, but simpler. type Ingester struct { cfg Config - chunkStore prism.Store + chunkStore cortex.Store stopLock sync.RWMutex stopped bool quit chan struct{} done chan struct{} - flushSeriesLimiter prism.Semaphore + flushSeriesLimiter cortex.Semaphore userStateLock sync.Mutex userState map[string]*userState @@ -88,7 +88,7 @@ type userState struct { } // New constructs a new Ingester. -func New(cfg Config, chunkStore prism.Store) (*Ingester, error) { +func New(cfg Config, chunkStore cortex.Store) (*Ingester, error) { if cfg.FlushCheckPeriod == 0 { cfg.FlushCheckPeriod = 1 * time.Minute } @@ -101,40 +101,40 @@ func New(cfg Config, chunkStore prism.Store) (*Ingester, error) { chunkStore: chunkStore, quit: make(chan struct{}), done: make(chan struct{}), - flushSeriesLimiter: prism.NewSemaphore(maxConcurrentFlushSeries), + flushSeriesLimiter: cortex.NewSemaphore(maxConcurrentFlushSeries), userState: map[string]*userState{}, ingestedSamples: prometheus.NewCounter(prometheus.CounterOpts{ - Name: "prism_ingester_ingested_samples_total", + Name: "cortex_ingester_ingested_samples_total", Help: "The total number of samples ingested.", }), discardedSamples: prometheus.NewCounterVec( prometheus.CounterOpts{ - Name: "prism_ingester_out_of_order_samples_total", + Name: "cortex_ingester_out_of_order_samples_total", Help: "The total number of samples that were discarded because their timestamps were at or before the last received sample for a series.", }, []string{discardReasonLabel}, ), chunkUtilization: prometheus.NewHistogram(prometheus.HistogramOpts{ - Name: "prism_ingester_chunk_utilization", + Name: "cortex_ingester_chunk_utilization", Help: "Distribution of stored chunk utilization.", Buckets: []float64{0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9}, }), memoryChunks: prometheus.NewGauge(prometheus.GaugeOpts{ - Name: "prism_ingester_memory_chunks", + Name: "cortex_ingester_memory_chunks", Help: "The total number of chunks in memory.", }), chunkStoreFailures: prometheus.NewCounter(prometheus.CounterOpts{ - Name: "prism_ingester_chunk_store_failures_total", + Name: "cortex_ingester_chunk_store_failures_total", Help: "The total number of errors while storing chunks to the chunk store.", }), queries: prometheus.NewCounter(prometheus.CounterOpts{ - Name: "prism_ingester_queries_total", + Name: "cortex_ingester_queries_total", Help: "The total number of queries the ingester has handled.", }), queriedSamples: prometheus.NewCounter(prometheus.CounterOpts{ - Name: "prism_ingester_queried_samples_total", + Name: "cortex_ingester_queried_samples_total", Help: "The total number of samples returned from queries.", }), } @@ -262,7 +262,7 @@ func (u *userState) getOrCreateSeries(metric model.Metric) (model.Fingerprint, * return fp, series, nil } -// Query implements prism.Querier. +// Query implements cortex.Querier. func (i *Ingester) Query(ctx context.Context, from, through model.Time, matchers ...*metric.LabelMatcher) (model.Matrix, error) { i.queries.Inc() @@ -485,7 +485,7 @@ func (i *Ingester) flushSeries(ctx context.Context, u *userState, fp model.Finge } func (i *Ingester) flushChunks(ctx context.Context, fp model.Fingerprint, metric model.Metric, chunks []*prom_chunk.Desc) error { - wireChunks := make([]prism.Chunk, 0, len(chunks)) + wireChunks := make([]cortex.Chunk, 0, len(chunks)) for _, chunk := range chunks { buf := make([]byte, prom_chunk.ChunkLen) if err := chunk.C.MarshalToBuf(buf); err != nil { @@ -494,7 +494,7 @@ func (i *Ingester) flushChunks(ctx context.Context, fp model.Fingerprint, metric i.chunkUtilization.Observe(chunk.C.Utilization()) - wireChunks = append(wireChunks, prism.Chunk{ + wireChunks = append(wireChunks, cortex.Chunk{ ID: fmt.Sprintf("%d:%d:%d", fp, chunk.ChunkFirstTime, chunk.ChunkLastTime), From: chunk.ChunkFirstTime, Through: chunk.ChunkLastTime, diff --git a/ingester_client.go b/ingester_client.go index 06a12e7242f..235d5c7bf74 100644 --- a/ingester_client.go +++ b/ingester_client.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package prism +package cortex import ( "bytes" @@ -28,7 +28,7 @@ import ( "github.com/prometheus/prometheus/storage/remote" "golang.org/x/net/context" - "github.com/weaveworks/prism/user" + "github.com/weaveworks/cortex/user" ) // IngesterClient is a client library for the ingester diff --git a/iterator.go b/iterator.go index 1ad38a1d632..55cdcd2b156 100644 --- a/iterator.go +++ b/iterator.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package prism +package cortex import ( "sort" diff --git a/querier.go b/querier.go index fa90b37278a..a4e38200fab 100644 --- a/querier.go +++ b/querier.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package prism +package cortex import ( "fmt" @@ -24,7 +24,7 @@ import ( "github.com/prometheus/prometheus/storage/metric" "golang.org/x/net/context" - "github.com/weaveworks/prism/chunk" + "github.com/weaveworks/cortex/chunk" ) // A Querier allows querying all samples in a given time range that match a set @@ -119,7 +119,7 @@ func (q *ChunkQuerier) LabelValuesForLabelName(ctx context.Context, ln model.Lab } // A MergeQuerier is a promql.Querier that merges the results of multiple -// prism.Queriers for the same query. +// cortex.Queriers for the same query. type MergeQuerier struct { Queriers []Querier } diff --git a/ring/ingester_lifecycle.go b/ring/ingester_lifecycle.go index c868fd7454f..7b74645c9cb 100644 --- a/ring/ingester_lifecycle.go +++ b/ring/ingester_lifecycle.go @@ -70,7 +70,7 @@ func RegisterIngester(consulClient ConsulClient, listenPort, numTokens int) (*In quit: make(chan struct{}), consulHeartbeats: prometheus.NewCounter(prometheus.CounterOpts{ - Name: "prism_ingester_consul_heartbeats_total", + Name: "cortex_ingester_consul_heartbeats_total", Help: "The total number of heartbeats sent to consul.", }), } diff --git a/ring/ring.go b/ring/ring.go index fe4d3b48e04..b5ff509cea7 100644 --- a/ring/ring.go +++ b/ring/ring.go @@ -61,17 +61,17 @@ func New(client CoordinationStateClient) *Ring { quit: make(chan struct{}), done: make(chan struct{}), ingesterOwnershipDesc: prometheus.NewDesc( - "prism_distributor_ingester_ownership_percent", + "cortex_distributor_ingester_ownership_percent", "The percent ownership of the ring by ingester", []string{"ingester"}, nil, ), numIngestersDesc: prometheus.NewDesc( - "prism_distributor_ingesters", + "cortex_distributor_ingesters", "Number of ingesters in the ring", nil, nil, ), numTokensDesc: prometheus.NewDesc( - "prism_distributor_tokens", + "cortex_distributor_tokens", "Number of tokens in the ring", nil, nil, ), diff --git a/server.go b/server.go index d94500ad406..272e5d5aea0 100644 --- a/server.go +++ b/server.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package prism +package cortex import ( "bytes" @@ -27,7 +27,7 @@ import ( "github.com/prometheus/prometheus/storage/remote" "golang.org/x/net/context" - "github.com/weaveworks/prism/user" + "github.com/weaveworks/cortex/user" ) // legacy from scope as a service. diff --git a/tools/lint b/tools/lint index dd97f841293..44c23213b7e 100755 --- a/tools/lint +++ b/tools/lint @@ -166,7 +166,7 @@ function lint_files { function list_files { if [ $# -gt 0 ]; then - git ls-files --exclude-standard | grep -vE '(^|/)(vendor/|prism.pb.go|ui/bindata.go)' + git ls-files --exclude-standard | grep -vE '(^|/)(vendor/|cortex.pb.go|ui/bindata.go)' else git diff --cached --name-only fi diff --git a/ui/bindata.go b/ui/bindata.go index e194d00bdb3..26672310b68 100644 --- a/ui/bindata.go +++ b/ui/bindata.go @@ -1,7 +1,7 @@ // Code generated by go-bindata. // sources: // ui/templates/_base.html -// ui/templates/_prism_base.html +// ui/templates/_cortex_base.html // ui/templates/alerts.html // ui/templates/config.html // ui/templates/flags.html @@ -119,27 +119,27 @@ func uiTemplates_baseHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/templates/_base.html", size: 2745, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/templates/_base.html", size: 2745, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _uiTemplates_prism_baseHtml = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xbc\x54\x4d\x8f\xd3\x30\x10\xbd\xef\xaf\x30\xe6\x9c\x5a\x68\x2f\x48\x9b\x44\x42\xfb\x01\x9c\xa8\x50\x0f\x70\x42\x6e\x32\x4d\xdc\x75\xed\xac\x3d\xa9\x5a\x55\xfd\xef\x8c\xd7\x49\x48\xc2\x16\x69\x25\xb4\xa7\xd8\x93\x37\xef\x3d\xcf\x8c\x9d\xbe\xbb\xfb\x76\xbb\xfa\xb9\xbc\x67\x35\xee\x74\x7e\x95\x86\x0f\xd3\xd2\x54\x19\x07\xc3\xf3\x2b\xc6\xd2\x1a\x64\x19\x16\xb4\xdc\x01\x4a\x42\x62\x93\xc0\x53\xab\xf6\x19\xbf\xb5\x06\xc1\x60\xb2\x3a\x36\xc0\x59\x11\x77\x19\x47\x38\xa0\x08\x54\x37\xac\xa8\xa5\xf3\x80\x59\x8b\x9b\xe4\x23\xef\x78\x50\xa1\x86\xfc\xc1\x49\xf3\x08\xc6\x23\x28\xc3\xee\x94\x47\xa7\xd6\x2d\x5a\x97\x8a\xf8\x3f\x62\x7d\xe1\x54\x83\xcc\xbb\x22\xe3\xa7\x13\x6b\x24\xd6\x4b\x07\x1b\x75\x60\xe7\xb3\xf0\x28\x51\x15\x62\x0f\xa6\xb4\x4e\x6c\xbd\xd8\x3e\xb5\xe0\x8e\x8b\x9d\x32\x8b\xad\xe7\x79\x2a\x62\xfa\xeb\xb9\xd6\xd6\x22\x39\x92\x4d\x72\xbd\xb8\x5e\x7c\x08\xdc\x43\xe8\x05\xfa\xc8\xaf\x95\x79\x64\x48\xb5\xe8\x4a\x50\x78\xcf\x99\x03\x9d\x71\x8f\x47\x0d\xbe\x06\x40\xce\x6a\x92\x7c\xb5\x3e\x51\xcd\x0c\x04\xf2\xfc\xff\xe9\x06\x81\xc6\x59\x6a\x71\x0d\xad\xef\xd8\xc7\x65\x8b\x5a\x8c\xed\xa5\x63\xcb\x4f\xab\x2f\xbf\x96\xdf\xef\x1f\xbe\xfe\x60\x19\xfb\x8b\x93\xdf\xc4\xc4\x69\x79\x4e\x27\x84\x5d\xa3\x25\x02\xe3\x61\xa8\x38\x5b\x9c\xcf\x61\xc2\x44\x1c\xb1\xb0\x5c\xdb\xf2\xd8\x1d\xca\xc8\x3d\x2b\xb4\xf4\x3e\xe3\xb4\x5c\x93\x6a\xfc\x24\xca\xec\x81\x66\xaa\xdf\x92\x24\x94\x09\xda\x86\xf7\x0e\xd3\x52\x0d\xa9\x61\x26\xa5\x32\x40\x38\xdd\xaa\x72\xc0\x4c\x51\x1d\x55\xf0\x01\x6e\x84\x09\x8e\x5a\x44\x6b\xba\xea\xc6\x0d\x9f\xa5\xa1\xad\x2a\x0d\x34\xfe\x5a\xcb\xc6\x03\x1d\xac\x94\x28\xbb\x70\xb0\x10\xe3\x7d\x58\xba\x8a\x2e\x04\x7f\x1f\xb3\x39\x93\x4e\xc9\x04\x0e\x8d\x34\x25\x94\x19\xdf\x48\x1d\xb0\xcf\xd1\xe0\xde\x59\x3d\x48\x4d\xac\x85\xce\x50\x52\x6f\xc6\xbb\xc4\x1a\x7d\xe4\xf9\x2a\xda\xa1\x0c\x55\x51\x6b\xad\xa1\x3e\x10\xee\x1f\xa9\x8a\x74\x92\x67\xfa\xb7\x82\xa6\x22\x96\x72\x12\x93\xb3\xba\xae\xe9\x81\x28\x2f\xce\x2d\x9f\x3c\x20\xa9\x90\xa3\xd6\x0a\xea\xed\xac\xd3\xaa\x1c\x8a\x38\x93\xe9\xfb\x33\x34\x70\x3a\x00\xad\x1e\xe1\xfb\xa1\x1b\x2d\x35\x6c\x70\xde\x17\xad\x72\x3a\xcd\x05\xe3\x15\xdd\xe0\x9a\xe7\x9f\xc3\x27\xd8\x4e\x05\xc1\x27\xb5\x69\xf5\x85\xb3\x8c\x36\xa9\x20\xfd\x17\x6e\x56\xf7\x08\xff\xb9\x5c\xf1\x4a\xa5\x22\xbe\xf0\xbf\x03\x00\x00\xff\xff\x0d\x65\xc0\xe5\xf2\x05\x00\x00") +var _uiTemplates_cortex_baseHtml = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xbc\x54\x4d\x8f\xd3\x30\x10\xbd\xef\xaf\x30\xe6\x9c\x5a\x68\x2f\x48\x9b\x44\x42\xfb\x01\x9c\xa8\x50\x0f\x70\x42\x6e\x32\x4d\xdc\x75\xed\xac\x3d\xa9\x5a\x55\xfd\xef\x8c\xd7\x49\x48\xc2\x16\x69\x25\xb4\xa7\xd8\x93\x37\xef\x3d\xcf\x8c\x9d\xbe\xbb\xfb\x76\xbb\xfa\xb9\xbc\x67\x35\xee\x74\x7e\x95\x86\x0f\xd3\xd2\x54\x19\x07\xc3\xf3\x2b\xc6\xd2\x1a\x64\x19\x16\xb4\xdc\x01\x4a\x42\x62\x93\xc0\x53\xab\xf6\x19\xbf\xb5\x06\xc1\x60\xb2\x3a\x36\xc0\x59\x11\x77\x19\x47\x38\xa0\x08\x54\x37\xac\xa8\xa5\xf3\x80\x59\x8b\x9b\xe4\x23\xef\x78\x50\xa1\x86\xfc\xc1\x49\xf3\x08\xc6\x23\x28\xc3\xee\x94\x47\xa7\xd6\x2d\x5a\x97\x8a\xf8\x3f\x62\x7d\xe1\x54\x83\xcc\xbb\x22\xe3\xa7\x13\x6b\x24\xd6\x4b\x07\x1b\x75\x60\xe7\xb3\xf0\x28\x51\x15\x62\x0f\xa6\xb4\x4e\x6c\xbd\xd8\x3e\xb5\xe0\x8e\x8b\x9d\x32\x8b\xad\xe7\x79\x2a\x62\xfa\xeb\xb9\xd6\xd6\x22\x39\x92\x4d\x72\xbd\xb8\x5e\x7c\x08\xdc\x43\xe8\x05\xfa\xc8\xaf\x95\x79\x64\x48\xb5\xe8\x4a\x50\x78\xcf\x99\x03\x9d\x71\x8f\x47\x0d\xbe\x06\x40\xce\x6a\x92\x7c\xb5\x3e\x51\xcd\x0c\x04\xf2\xfc\xff\xe9\x06\x81\xc6\x59\x6a\x71\x0d\xad\xef\xd8\xc7\x65\x8b\x5a\x8c\xed\xa5\x63\xcb\x4f\xab\x2f\xbf\x96\xdf\xef\x1f\xbe\xfe\x60\x19\xfb\x8b\x93\xdf\xc4\xc4\x69\x79\x4e\x27\x84\x5d\xa3\x25\x02\xe3\x61\xa8\x38\x5b\x9c\xcf\x61\xc2\x44\x1c\xb1\xb0\x5c\xdb\xf2\xd8\x1d\xca\xc8\x3d\x2b\xb4\xf4\x3e\xe3\xb4\x5c\x93\x6a\xfc\x24\xca\xec\x81\x66\xaa\xdf\x92\x24\x94\x09\xda\x86\xf7\x0e\xd3\x52\x0d\xa9\x61\x26\xa5\x32\x40\x38\xdd\xaa\x72\xc0\x4c\x51\x1d\x55\xf0\x01\x6e\x84\x09\x8e\x5a\x44\x6b\xba\xea\xc6\x0d\x9f\xa5\xa1\xad\x2a\x0d\x34\xfe\x5a\xcb\xc6\x03\x1d\xac\x94\x28\xbb\x70\xb0\x10\xe3\x7d\x58\xba\x8a\x2e\x04\x7f\x1f\xb3\x39\x93\x4e\xc9\x04\x0e\x8d\x34\x25\x94\x19\xdf\x48\x1d\xb0\xcf\xd1\xe0\xde\x59\x3d\x48\x4d\xac\x85\xce\x50\x52\x6f\xc6\xbb\xc4\x1a\x7d\xe4\xf9\x2a\xda\xa1\x0c\x55\x51\x6b\xad\xa1\x3e\x10\xee\x1f\xa9\x8a\x74\x92\x67\xfa\xb7\x82\xa6\x22\x96\x72\x12\x93\xb3\xba\xae\xe9\x81\x28\x2f\xce\x2d\x9f\x3c\x20\xa9\x90\xa3\xd6\x0a\xea\xed\xac\xd3\xaa\x1c\x8a\x38\x93\xe9\xfb\x33\x34\x70\x3a\x00\xad\x1e\xe1\xfb\xa1\x1b\x2d\x35\x6c\x70\xde\x17\xad\x72\x3a\xcd\x05\xe3\x15\xdd\xe0\x9a\xe7\x9f\xc3\x27\xd8\x4e\x05\xc1\x27\xb5\x69\xf5\x85\xb3\x8c\x36\xa9\x20\xfd\x17\x6e\x56\xf7\x08\xff\xb9\x5c\xf1\x4a\xa5\x22\xbe\xf0\xbf\x03\x00\x00\xff\xff\x0d\x65\xc0\xe5\xf2\x05\x00\x00") -func uiTemplates_prism_baseHtmlBytes() ([]byte, error) { +func uiTemplates_cortex_baseHtmlBytes() ([]byte, error) { return bindataRead( - _uiTemplates_prism_baseHtml, - "ui/templates/_prism_base.html", + _uiTemplates_cortex_baseHtml, + "ui/templates/_cortex_base.html", ) } -func uiTemplates_prism_baseHtml() (*asset, error) { - bytes, err := uiTemplates_prism_baseHtmlBytes() +func uiTemplates_cortex_baseHtml() (*asset, error) { + bytes, err := uiTemplates_cortex_baseHtmlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "ui/templates/_prism_base.html", size: 1522, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/templates/_cortex_base.html", size: 1522, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -159,7 +159,7 @@ func uiTemplatesAlertsHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/templates/alerts.html", size: 1795, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/templates/alerts.html", size: 1795, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -179,7 +179,7 @@ func uiTemplatesConfigHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/templates/config.html", size: 175, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/templates/config.html", size: 175, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -199,7 +199,7 @@ func uiTemplatesFlagsHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/templates/flags.html", size: 433, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/templates/flags.html", size: 433, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -219,7 +219,7 @@ func uiTemplatesGraphHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/templates/graph.html", size: 1467, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/templates/graph.html", size: 1467, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -239,7 +239,7 @@ func uiTemplatesRulesHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/templates/rules.html", size: 209, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/templates/rules.html", size: 209, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -259,7 +259,7 @@ func uiTemplatesStatusHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/templates/status.html", size: 1193, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/templates/status.html", size: 1193, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -279,7 +279,7 @@ func uiTemplatesTargetsHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/templates/targets.html", size: 2269, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/templates/targets.html", size: 2269, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -299,7 +299,7 @@ func uiStaticCssAlertsCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/css/alerts.css", size: 74, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/css/alerts.css", size: 74, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -319,7 +319,7 @@ func uiStaticCssGraphCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/css/graph.css", size: 2668, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/css/graph.css", size: 2668, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -339,7 +339,7 @@ func uiStaticCssProm_consoleCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/css/prom_console.css", size: 2883, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/css/prom_console.css", size: 2883, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -359,7 +359,7 @@ func uiStaticCssPrometheusCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/css/prometheus.css", size: 405, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/css/prometheus.css", size: 405, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -379,7 +379,7 @@ func uiStaticImgAjaxLoaderGif() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/img/ajax-loader.gif", size: 847, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/img/ajax-loader.gif", size: 847, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -399,7 +399,7 @@ func uiStaticJsAlertsJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/js/alerts.js", size: 445, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/js/alerts.js", size: 445, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -419,7 +419,7 @@ func uiStaticJsGraphJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/js/graph.js", size: 23121, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/js/graph.js", size: 23121, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -439,7 +439,7 @@ func uiStaticJsGraph_templateHandlebar() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/js/graph_template.handlebar", size: 6316, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/js/graph_template.handlebar", size: 6316, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -459,7 +459,7 @@ func uiStaticJsProm_consoleJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/js/prom_console.js", size: 21219, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/js/prom_console.js", size: 21219, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -479,7 +479,7 @@ func uiStaticVendorBootstrap331CssBootstrapThemeMinCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/css/bootstrap-theme.min.css", size: 19835, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/css/bootstrap-theme.min.css", size: 19835, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -499,7 +499,7 @@ func uiStaticVendorBootstrap331CssBootstrapMinCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/css/bootstrap.min.css", size: 113498, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/css/bootstrap.min.css", size: 113498, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -519,7 +519,7 @@ func uiStaticVendorBootstrap331FontsGlyphiconsHalflingsRegularEot() (*asset, err return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.eot", size: 20335, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.eot", size: 20335, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -539,7 +539,7 @@ func uiStaticVendorBootstrap331FontsGlyphiconsHalflingsRegularSvg() (*asset, err return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.svg", size: 62926, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.svg", size: 62926, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -559,7 +559,7 @@ func uiStaticVendorBootstrap331FontsGlyphiconsHalflingsRegularTtf() (*asset, err return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.ttf", size: 41280, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.ttf", size: 41280, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -579,7 +579,7 @@ func uiStaticVendorBootstrap331FontsGlyphiconsHalflingsRegularWoff() (*asset, er return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.woff", size: 23320, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/fonts/glyphicons-halflings-regular.woff", size: 23320, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -599,7 +599,7 @@ func uiStaticVendorBootstrap331JsBootstrapMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/js/bootstrap.min.js", size: 35601, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/js/bootstrap.min.js", size: 35601, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -619,7 +619,7 @@ func uiStaticVendorBootstrap331JsNpmJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/js/npm.js", size: 484, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-3.3.1/js/npm.js", size: 484, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -639,7 +639,7 @@ func uiStaticVendorBootstrapDatetimepickerBootstrapDatetimepickerJs() (*asset, e return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.js", size: 53185, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.js", size: 53185, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -659,7 +659,7 @@ func uiStaticVendorBootstrapDatetimepickerBootstrapDatetimepickerMinCss() (*asse return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css", size: 5059, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css", size: 5059, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -679,7 +679,7 @@ func uiStaticVendorBootstrap3TypeaheadBootstrap3TypeaheadMinJs() (*asset, error) return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js", size: 7856, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/bootstrap3-typeahead/bootstrap3-typeahead.min.js", size: 7856, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -699,7 +699,7 @@ func uiStaticVendorJsHandlebarsJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/js/handlebars.js", size: 65639, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/js/handlebars.js", size: 65639, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -719,7 +719,7 @@ func uiStaticVendorJsJqueryHotkeysJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/js/jquery.hotkeys.js", size: 3283, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/js/jquery.hotkeys.js", size: 3283, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -739,7 +739,7 @@ func uiStaticVendorJsJqueryMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/js/jquery.min.js", size: 95935, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/js/jquery.min.js", size: 95935, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -759,7 +759,7 @@ func uiStaticVendorJsJquerySelectionJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/js/jquery.selection.js", size: 13320, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/js/jquery.selection.js", size: 13320, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -779,7 +779,7 @@ func uiStaticVendorRickshawRickshawMinCss() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/rickshaw/rickshaw.min.css", size: 6102, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/rickshaw/rickshaw.min.css", size: 6102, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -799,7 +799,7 @@ func uiStaticVendorRickshawRickshawMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/rickshaw/rickshaw.min.js", size: 76322, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/rickshaw/rickshaw.min.js", size: 76322, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -819,7 +819,7 @@ func uiStaticVendorRickshawVendorD3LayoutMinJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/rickshaw/vendor/d3.layout.min.js", size: 17514, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/rickshaw/vendor/d3.layout.min.js", size: 17514, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -839,7 +839,7 @@ func uiStaticVendorRickshawVendorD3V3Js() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/static/vendor/rickshaw/vendor/d3.v3.js", size: 144718, mode: os.FileMode(436), modTime: time.Unix(1475533391, 0)} + info := bindataFileInfo{name: "ui/static/vendor/rickshaw/vendor/d3.v3.js", size: 144718, mode: os.FileMode(420), modTime: time.Unix(1475596611, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -897,7 +897,7 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ "ui/templates/_base.html": uiTemplates_baseHtml, - "ui/templates/_prism_base.html": uiTemplates_prism_baseHtml, + "ui/templates/_cortex_base.html": uiTemplates_cortex_baseHtml, "ui/templates/alerts.html": uiTemplatesAlertsHtml, "ui/templates/config.html": uiTemplatesConfigHtml, "ui/templates/flags.html": uiTemplatesFlagsHtml, @@ -1034,7 +1034,7 @@ var _bintree = &bintree{nil, map[string]*bintree{ }}, "templates": &bintree{nil, map[string]*bintree{ "_base.html": &bintree{uiTemplates_baseHtml, map[string]*bintree{}}, - "_prism_base.html": &bintree{uiTemplates_prism_baseHtml, map[string]*bintree{}}, + "_cortex_base.html": &bintree{uiTemplates_cortex_baseHtml, map[string]*bintree{}}, "alerts.html": &bintree{uiTemplatesAlertsHtml, map[string]*bintree{}}, "config.html": &bintree{uiTemplatesConfigHtml, map[string]*bintree{}}, "flags.html": &bintree{uiTemplatesFlagsHtml, map[string]*bintree{}}, diff --git a/ui/templates/_prism_base.html b/ui/templates/_cortex_base.html similarity index 100% rename from ui/templates/_prism_base.html rename to ui/templates/_cortex_base.html diff --git a/ui/ui.go b/ui/ui.go index 84d2be7d60b..3bd17856bf3 100644 --- a/ui/ui.go +++ b/ui/ui.go @@ -27,7 +27,7 @@ import ( ) func getTemplate(name string) (string, error) { - baseTmpl, err := Asset("ui/templates/_prism_base.html") + baseTmpl, err := Asset("ui/templates/_cortex_base.html") if err != nil { return "", fmt.Errorf("error reading base template: %s", err) } diff --git a/user/id.go b/user/id.go index 48762775ddc..44e2ec1c118 100644 --- a/user/id.go +++ b/user/id.go @@ -7,7 +7,7 @@ import ( ) // UserIDContextKey is the key used in contexts to find the userid -const userIDContextKey = "PrismUserID" // TODO dedupe with storage/local +const userIDContextKey = "CortexUserID" // TODO dedupe with storage/local // GetID returns the user func GetID(ctx context.Context) (string, error) {