Review feedback & minor fixups.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

Author: tomwilkie

.gitignore

@@ -1,15 +1,5 @@
-cmd/alertmanager/alertmanager
-cmd/configs/configs
-cmd/distributor/distributor
-cmd/ingester/ingester
-cmd/querier/querier
-cmd/query-frontend/query-frontend
-cmd/ruler/ruler
-cmd/table-manager/table-manager
-cmd/lite/lite
 cmd/test-exporter/test-exporter
 cmd/cortex/cortex
-cmd/*/.migrations
 .uptodate
 .pkg
 .cache

cmd/cortex/main.go

@@ -52,21 +52,16 @@ func main() {
 	defer trace.Close()
 
 	t, err := cortex.New(cfg)
-	if err != nil {
-		level.Error(util.Logger).Log("msg", "error initialising cortex", "err", err)
-		os.Exit(1)
-	}
+	util.CheckFatal("initializing cortex", err)
 
 	level.Info(util.Logger).Log("msg", "Starting Cortex", "version", version.Info())
 
 	if err := t.Run(); err != nil {
-		level.Error(util.Logger).Log("msg", "error running loki", "err", err)
+		level.Error(util.Logger).Log("msg", "error running Cortex", "err", err)
 	}
 
-	if err := t.Stop(); err != nil {
-		level.Error(util.Logger).Log("msg", "error stopping loki", "err", err)
-		os.Exit(1)
-	}
+	err = t.Stop()
+	util.CheckFatal("initializing cortex", err)
 }
 
 // LoadConfig read YAML-formatted config from filename into cfg.

docs/getting_started.md

@@ -8,7 +8,7 @@ See [the architecture doc](architecture.md) For more information about the micro
 
 Separately from single process vs microservices decision, Cortex can be configured to use local storage or cloud storage (DynamoDB, Bigtable, Cassandra, S3, GCS etc).
 This document will focus on using local storage.
-Local storage is explicity not production ready at this time.
+Local storage is explicitly not production ready at this time.
 Cortex can also make use of external memcacheds for caching and although these are not mandatory, they should be used in production.
 
 ## Single instance, single process.

pkg/chunk/aws/dynamodb_table_client_test.go

@@ -154,7 +154,7 @@ func TestTableManagerAutoScaling(t *testing.T) {
 			},
 			{
 				IndexType:   "aws-dynamo",
-				From:        chunk.DayTime{model.TimeFromUnix(0)},
+				From:        chunk.DayTime{Time: model.TimeFromUnix(0)},
 				IndexTables: fixturePeriodicTableConfig(tablePrefix),
 				ChunkTables: fixturePeriodicTableConfig(chunkTablePrefix),
 			}},

pkg/chunk/local/fixtures.go

@@ -51,7 +51,7 @@ func (f *fixture) Clients() (
 	schemaConfig = chunk.SchemaConfig{
 		Configs: []chunk.PeriodConfig{{
 			IndexType: "boltdb",
-			From:      chunk.DayTime{model.Now()},
+			From:      chunk.DayTime{Time: model.Now()},
 			ChunkTables: chunk.PeriodicTableConfig{
 				Prefix: "chunks",
 				Period: 10 * time.Minute,

pkg/chunk/storage/factory_test.go

@@ -21,11 +21,11 @@ func TestFactoryStop(t *testing.T) {
 	flagext.DefaultValues(&cfg, &storeConfig, &schemaConfig, &defaults)
 	schemaConfig.Configs = []chunk.PeriodConfig{
 		{
-			From:      chunk.DayTime{model.Time(0)},
+			From:      chunk.DayTime{Time: model.Time(0)},
 			IndexType: "inmemory",
 		},
 		{
-			From:      chunk.DayTime{model.Time(1)},
+			From:      chunk.DayTime{Time: model.Time(1)},
 			IndexType: "inmemory",
 		},
 	}

pkg/cortex/cortex.go

@@ -50,7 +50,7 @@ import (
 // - First argument for a components constructor should be its matching config
 //   object.
 
-// Config is the root config for Loki.
+// Config is the root config for Cortex.
 type Config struct {
 	Target      moduleName `yaml:"target,omitempty"`
 	AuthEnabled bool       `yaml:"auth_enabled,omitempty"`
@@ -127,7 +127,7 @@ type Cortex struct {
 	alertmanager *alertmanager.MultitenantAlertmanager
 }
 
-// New makes a new Loki.
+// New makes a new Cortex.
 func New(cfg Config) (*Cortex, error) {
 	if cfg.PrintConfig {
 		if err := yaml.NewEncoder(os.Stdout).Encode(&cfg); err != nil {
@@ -155,7 +155,7 @@ func New(cfg Config) (*Cortex, error) {
 		return nil, err
 	}
 
-	return &cortex, nil
+	return cortex, nil
 }
 
 func (t *Cortex) setupAuthMiddleware(cfg *Config) {
@@ -207,12 +207,12 @@ func (t *Cortex) initModule(cfg *Config, m moduleName) error {
 	return nil
 }
 
-// Run starts Loki running, and blocks until a signal is received.
+// Run starts Cortex running, and blocks until a signal is received.
 func (t *Cortex) Run() error {
 	return t.server.Run()
 }
 
-// Stop gracefully stops a Loki.
+// Stop gracefully stops a Cortex.
 func (t *Cortex) Stop() error {
 	t.server.Shutdown()
 	t.stop(t.target)

pkg/cortex/modules.go

@@ -369,6 +369,9 @@ func (t *Cortex) initAlertmanager(cfg *Config) (err error) {
 	go t.alertmanager.Run()
 
 	t.server.HTTP.PathPrefix("/status").Handler(t.alertmanager.GetStatusHandler())
+
+	// TODO this clashed with the queirer and the distributor, so we cannot
+	// run them in the same process.
 	t.server.HTTP.PathPrefix("/api/prom").Handler(middleware.AuthenticateUser.Wrap(t.alertmanager))
 	return
 }