Skip to content

Easy to use Cortex: Single binary, single process #1262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
May 16, 2019
Merged

Easy to use Cortex: Single binary, single process #1262

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e6a3e96
Single binary, single process Cortex.
tomwilkie Mar 6, 2019
8a019d3
Unify the config client between the alertmanager and the ruler.
tomwilkie Mar 25, 2019
5238d2c
Prefix frontend memcache flags with 'frontend.'
tomwilkie Mar 25, 2019
4fa102b
Don't register the config DB flags twice.
tomwilkie Mar 25, 2019
ea98df4
Remove the FromStr parsing hack in schema config, do it with a custom…
tomwilkie Mar 25, 2019
a3a7538
Add yaml struct tags to more config fields; Manage lifecycle of overi…
tomwilkie Mar 25, 2019
067009e
Add -print.config flag, which causes Cortex to print config and exit.
tomwilkie Apr 7, 2019
a5dee71
Add getting started guide and example config for running as a single …
tomwilkie Apr 7, 2019
f8c9ac1
Review feedback & minor fixups.
tomwilkie Apr 7, 2019
453443e
Update modules.txt
tomwilkie May 9, 2019
f43d891
Fixes from testing as microservices.
tomwilkie May 9, 2019
310897b
Review feedback.
tomwilkie May 13, 2019
7cb7de9
Update CI for moved migrations.
tomwilkie May 13, 2019
cee654f
Review feedback
tomwilkie May 13, 2019
491fb2a
Register alertmanager config.
tomwilkie May 14, 2019
4ac3bf5
Allow alertmanager to start speaking directly to the DB.
tomwilkie May 14, 2019
ccd9362
Add /user_stats handler
tomwilkie May 15, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Review feedback. 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
  • Loading branch information
@tomwilkie
tomwilkie committed May 13, 2019
commit 310897b607631eea6d14993bfdae61e2b3126608
4 changes: 2 additions & 2 deletions cmd/cortex/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
)

func init() {
prometheus.MustRegister(version.NewCollector("loki"))
prometheus.MustRegister(version.NewCollector("cortex"))
}

func main() {
Expand Down Expand Up @@ -48,7 +48,7 @@ func main() {
util.InitEvents(eventSampleRate)

// Setting the environment variable JAEGER_AGENT_HOST enables tracing
trace := tracing.NewFromEnv(cfg.Target.String())
trace := tracing.NewFromEnv("cortex-" + cfg.Target.String())
defer trace.Close()

t, err := cortex.New(cfg)
Expand Down
1 change: 1 addition & 0 deletions pkg/configs/db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ type Config struct {
MigrationsDir string
PasswordFile string

// Allow injection of mock DBs for unit testing.
Mock DB
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/cortex/cortex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ type Config struct {
Worker frontend.WorkerConfig `yaml:"frontend_worker,omitempty"`
Frontend frontend.Config `yaml:"frontend,omitempty"`
TableManager chunk.TableManagerConfig `yaml:"table_manager,omitempty"`
Encoding encoding.Config // No yaml for this, it only works with flags.
Encoding encoding.Config `yaml:"-"` // No yaml for this, it only works with flags.

Ruler ruler.Config `yaml:"ruler,omitempty"`
ConfigStore config_client.Config `yaml:"config_store,omitempty"`
Expand Down