Skip to content

Expose log messages as Prometheus metrics. #572

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
marccarre merged 1 commit into from
Oct 5, 2017
Merged

Expose log messages as Prometheus metrics. #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
name = "github.com/weaveworks/common"
branch = "master"

[[constraint]]
name = "github.com/weaveworks/promrus"
version = "v1.0.0-legacy"

[[override]]
name = "github.com/Azure/azure-sdk-for-go"
revision = "bd73d950fa4440dae889bd9917bff7cef539f86e"
Expand Down
8 changes: 7 additions & 1 deletion cmd/alertmanager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ package main

import (
"flag"
"log"

"google.golang.org/grpc"

"github.com/prometheus/common/log"
"github.com/weaveworks/common/middleware"
"github.com/weaveworks/common/server"
"github.com/weaveworks/cortex/pkg/alertmanager"
"github.com/weaveworks/cortex/pkg/util"
"github.com/weaveworks/promrus"
)

func main() {
Expand All @@ -37,6 +38,11 @@ func main() {
)
util.RegisterFlags(&serverConfig, &alertmanagerConfig)
flag.Parse()
hook, err := promrus.NewPrometheusHook()
if err != nil {
log.Fatalf("Error initializing promrus: %v", err)
}
log.AddHook(hook)

multiAM, err := alertmanager.NewMultitenantAlertmanager(&alertmanagerConfig)
if err != nil {
Expand Down
7 changes: 7 additions & 0 deletions cmd/configs/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/weaveworks/cortex/pkg/configs/api"
"github.com/weaveworks/cortex/pkg/configs/db"
"github.com/weaveworks/cortex/pkg/util"
"github.com/weaveworks/promrus"
)

func main() {
Expand All @@ -28,6 +29,12 @@ func main() {
util.RegisterFlags(&serverConfig, &dbConfig)
flag.Parse()

hook, err := promrus.NewPrometheusHook()
if err != nil {
log.Fatalf("Error initializing promrus: %v", err)
}
log.AddHook(hook)

db, err := db.New(dbConfig)
if err != nil {
log.Fatalf("Error initializing database: %v", err)
Expand Down
6 changes: 6 additions & 0 deletions cmd/distributor/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/weaveworks/cortex/pkg/distributor"
"github.com/weaveworks/cortex/pkg/ring"
"github.com/weaveworks/cortex/pkg/util"
"github.com/weaveworks/promrus"
)

func main() {
Expand Down Expand Up @@ -45,6 +46,11 @@ func main() {
)
util.RegisterFlags(&serverConfig, &ringConfig, &distributorConfig)
flag.Parse()
hook, err := promrus.NewPrometheusHook()
if err != nil {
log.Fatalf("Error initializing promrus: %v", err)
}
log.AddHook(hook)

r, err := ring.New(ringConfig)
if err != nil {
Expand Down
7 changes: 7 additions & 0 deletions cmd/ingester/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/weaveworks/cortex/pkg/ingester"
"github.com/weaveworks/cortex/pkg/ingester/client"
"github.com/weaveworks/cortex/pkg/util"
"github.com/weaveworks/promrus"
)

func main() {
Expand All @@ -36,6 +37,12 @@ func main() {
&schemaConfig, &ingesterConfig)
flag.Parse()

hook, err := promrus.NewPrometheusHook()
if err != nil {
log.Fatalf("Error initializing promrus: %v", err)
}
Copy link
Contributor

@jml jml Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a MustNewPrometheusHook variant later?

Copy link
Contributor Author

@marccarre marccarre Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea. Let's keep it DRY. I didn't know that MustNew* was actually so idiomatic, thanks for pointing it out.

Copy link
Contributor Author

@marccarre marccarre Oct 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in #573.

log.AddHook(hook)

server, err := server.New(serverConfig)
if err != nil {
log.Fatalf("Error initializing server: %v", err)
Expand Down
7 changes: 7 additions & 0 deletions cmd/lite/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/weaveworks/cortex/pkg/ring"
"github.com/weaveworks/cortex/pkg/ruler"
"github.com/weaveworks/cortex/pkg/util"
"github.com/weaveworks/promrus"
)

func main() {
Expand Down Expand Up @@ -51,6 +52,12 @@ func main() {
flag.BoolVar(&unauthenticated, "unauthenticated", false, "Set to true to disable multitenancy.")
flag.Parse()

hook, err := promrus.NewPrometheusHook()
if err != nil {
log.Fatalf("Error initializing promrus: %v", err)
}
log.AddHook(hook)

server, err := server.New(serverConfig)
if err != nil {
log.Fatalf("Error initializing server: %v", err)
Expand Down
7 changes: 7 additions & 0 deletions cmd/querier/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/weaveworks/cortex/pkg/querier"
"github.com/weaveworks/cortex/pkg/ring"
"github.com/weaveworks/cortex/pkg/util"
"github.com/weaveworks/promrus"
)

func main() {
Expand All @@ -41,6 +42,12 @@ func main() {
&chunkStoreConfig, &schemaConfig, &storageConfig)
flag.Parse()

hook, err := promrus.NewPrometheusHook()
if err != nil {
log.Fatalf("Error initializing promrus: %v", err)
}
log.AddHook(hook)

r, err := ring.New(ringConfig)
if err != nil {
log.Fatalf("Error initializing ring: %v", err)
Expand Down
7 changes: 7 additions & 0 deletions cmd/ruler/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/weaveworks/cortex/pkg/ring"
"github.com/weaveworks/cortex/pkg/ruler"
"github.com/weaveworks/cortex/pkg/util"
"github.com/weaveworks/promrus"
)

func main() {
Expand All @@ -36,6 +37,12 @@ func main() {
&rulerConfig, &chunkStoreConfig, &storageConfig, &schemaConfig)
flag.Parse()

hook, err := promrus.NewPrometheusHook()
if err != nil {
log.Fatalf("Error initializing promrus: %v", err)
}
log.AddHook(hook)

storageClient, err := storage.NewStorageClient(storageConfig, schemaConfig)
if err != nil {
log.Fatalf("Error initializing storage client: %v", err)
Expand Down
6 changes: 6 additions & 0 deletions cmd/table-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/weaveworks/cortex/pkg/chunk"
"github.com/weaveworks/cortex/pkg/chunk/storage"
"github.com/weaveworks/cortex/pkg/util"
"github.com/weaveworks/promrus"
)

func main() {
Expand All @@ -27,6 +28,11 @@ func main() {
)
util.RegisterFlags(&serverConfig, &storageConfig, &schemaConfig)
flag.Parse()
hook, err := promrus.NewPrometheusHook()
if err != nil {
log.Fatalf("Error initializing promrus: %v", err)
}
log.AddHook(hook)

if (schemaConfig.ChunkTables.WriteScale.Enabled ||
schemaConfig.IndexTables.WriteScale.Enabled ||
Expand Down
0 ....com/mwitkow/go-grpc-middleware/README.MD → ....com/mwitkow/go-grpc-middleware/README.md
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions vendor/github.com/prometheus/common/log/log.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/weaveworks/promrus/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions vendor/github.com/weaveworks/promrus/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

87 changes: 87 additions & 0 deletions vendor/github.com/weaveworks/promrus/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/github.com/weaveworks/promrus/Gopkg.toml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading