Merge pull request #1262 from grafana/single-binary

Easy to use Cortex: Single binary, single process

Author: tomwilkie

.circleci/config.yml

@@ -56,7 +56,7 @@ jobs:
     - checkout
     - run:
         name: Integration Test
-        command: MIGRATIONS_DIR=$(pwd)/pkg/configs/db/migrations make BUILD_IN_CONTAINER=false configs-integration-test
+        command: MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IN_CONTAINER=false configs-integration-test
 
   build:
     <<: *defaults

.gitignore

@@ -1,14 +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/*/.migrations
+cmd/cortex/cortex
 .uptodate
 .pkg
 .cache

Makefile

@@ -34,9 +34,6 @@ images:
 PROTO_DEFS := $(shell find . $(DONT_FIND) -type f -name '*.proto' -print)
 PROTO_GOS := $(patsubst %.proto,%.pb.go,$(PROTO_DEFS))
 
-# Ensure a target for each image that needs a migration directory
-MIGRATION_DIRS := cmd/alertmanager/.migrations cmd/configs/.migrations cmd/ruler/.migrations cmd/lite/.migrations
-
 # Building binaries is now automated.  The convention is to build a binary
 # for every directory with main.go in it, in the ./cmd directory.
 MAIN_GO := $(shell find . $(DONT_FIND) -type f -name 'main.go' -print)
@@ -86,7 +83,7 @@ NETGO_CHECK = @strings $@ | grep cgo_stub\\\.go >/dev/null || { \
 
 ifeq ($(BUILD_IN_CONTAINER),true)
 
-exes $(EXES) generated $(MIGRATION_DIRS) $(PROTO_GOS) lint test shell mod-check: build-image/$(UPTODATE)
+exes $(EXES) generated $(PROTO_GOS) lint test shell mod-check: build-image/$(UPTODATE)
 	@mkdir -p $(shell pwd)/.pkg
 	@mkdir -p $(shell pwd)/.cache
 	$(SUDO) time docker run $(RM) $(TTY) -i \
@@ -103,10 +100,10 @@ configs-integration-test: build-image/$(UPTODATE)
 		-v $(shell pwd)/.cache:/go/cache \
 		-v $(shell pwd)/.pkg:/go/pkg \
 		-v $(shell pwd):/go/src/github.com/cortexproject/cortex \
-		-v $(shell pwd)/pkg/configs/db/migrations:/migrations \
-		-e MIGRATIONS_DIR=/migrations \
+		-v $(shell pwd)/cmd/cortex/migrations:/migrations \
 		--workdir /go/src/github.com/cortexproject/cortex \
 		--link "$$DB_CONTAINER":configs-db.cortex.local \
+		-e DB_ADDR=configs-db.cortex.local \
 		$(IMAGE_PREFIX)build-image $@; \
 	status=$$?; \
 	test -n "$(CIRCLECI)" || docker rm -f "$$DB_CONTAINER"; \
@@ -139,7 +136,7 @@ shell:
 	bash
 
 configs-integration-test:
-	/bin/bash -c "go test -tags 'netgo integration' -timeout 30s ./pkg/configs/... ./pkg/ruler/..."
+	/bin/bash -c "go test -v -tags 'netgo integration' -timeout 30s ./pkg/configs/... ./pkg/ruler/..."
 
 mod-check:
 	GO111MODULE=on go mod download
@@ -148,15 +145,10 @@ mod-check:
 	GO111MODULE=on go mod vendor
 	@git diff --exit-code -- go.sum go.mod vendor/
 
-%/.migrations:
-	# Ensure a each image that requires a migration dir has one in the build context
-	cp -r pkg/configs/db/migrations $@
-
 endif
 
 clean:
 	$(SUDO) docker rmi $(IMAGE_NAMES) >/dev/null 2>&1 || true
-	rm -rf $(MIGRATION_DIRS)
 	rm -rf $(UPTODATE_FILES) $(EXES) $(PROTO_GOS) .cache
 	go clean ./...
 
@@ -175,7 +167,7 @@ load-images:
 		fi \
 	done
 
-# Loads the built Docker images into the minikube environmen, and tags them with
+# Loads the built Docker images into the minikube environment, and tags them with
 # "latest" so the k8s manifests shipped with this code work.
 prime-minikube: save-images
 	eval $$(minikube docker-env) ; \

cmd/alertmanager/Dockerfile

@@ -1,11 +1,12 @@
 FROM       alpine:3.8
 RUN        apk add --no-cache ca-certificates
-COPY       lite /bin/cortex
-COPY       .migrations /migrations/
+COPY       migrations /migrations/
+COPY       cortex /bin/cortex
+COPY       single-process-config.yaml /etc
 EXPOSE     80
 ENTRYPOINT [ "/bin/cortex" ]
 
 ARG revision
-LABEL org.opencontainers.image.title="lite" \
-      org.opencontainers.image.source="https://github.com/cortexproject/cortex/tree/master/cmd/lite" \
+LABEL org.opencontainers.image.title="cortex" \
+      org.opencontainers.image.source="https://github.com/cortexproject/cortex/tree/master/cmd/cortex" \
       org.opencontainers.image.revision="${revision}"

cmd/alertmanager/main.go

@@ -0,0 +1,75 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+
+	"github.com/go-kit/kit/log/level"
+	"github.com/pkg/errors"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/version"
+	"github.com/weaveworks/common/tracing"
+	"gopkg.in/yaml.v2"
+
+	"github.com/cortexproject/cortex/pkg/cortex"
+	"github.com/cortexproject/cortex/pkg/util"
+	"github.com/cortexproject/cortex/pkg/util/flagext"
+)
+
+func init() {
+	prometheus.MustRegister(version.NewCollector("cortex"))
+}
+
+func main() {
+	var (
+		cfg             cortex.Config
+		configFile      = ""
+		eventSampleRate int
+	)
+	flag.StringVar(&configFile, "config.file", "", "Configuration file to load.")
+	flag.IntVar(&eventSampleRate, "event.sample-rate", 0, "How often to sample observability events (0 = never).")
+
+	flagext.RegisterFlags(&cfg)
+	flag.Parse()
+
+	if configFile != "" {
+		if err := LoadConfig(configFile, &cfg); err != nil {
+			fmt.Printf("error loading config from %s: %v\n", configFile, err)
+			os.Exit(1)
+		}
+	}
+
+	// Parse a second time, as command line flags should take precedent over the config file.
+	flag.Parse()
+
+	util.InitLogger(&cfg.Server)
+	util.InitEvents(eventSampleRate)
+
+	// Setting the environment variable JAEGER_AGENT_HOST enables tracing
+	trace := tracing.NewFromEnv("cortex-" + cfg.Target.String())
+	defer trace.Close()
+
+	t, err := cortex.New(cfg)
+	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 Cortex", "err", err)
+	}
+
+	err = t.Stop()
+	util.CheckFatal("initializing cortex", err)
+}
+
+// LoadConfig read YAML-formatted config from filename into cfg.
+func LoadConfig(filename string, cfg interface{}) error {
+	buf, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return errors.Wrap(err, "Error reading config file")
+	}
+
+	return yaml.UnmarshalStrict(buf, cfg)
+}