From 41f0e74cdf7c53c1c54e43f10028867c62270b7e Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Mon, 24 Oct 2016 10:56:38 +0100 Subject: [PATCH] Consistently use "prism" namespace Fixes #57 Even if we rename it, having everything already be consistently renamed will make that rename easier. --- chunk/chunk_store.go | 10 +++++----- distributor.go | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/chunk/chunk_store.go b/chunk/chunk_store.go index a360869388..a39e4f70d4 100644 --- a/chunk/chunk_store.go +++ b/chunk/chunk_store.go @@ -51,29 +51,29 @@ const ( var ( dynamoRequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prometheus", + Namespace: "prism", 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: "prometheus", + Namespace: "prism", Name: "dynamo_request_pages", Help: "Number of pages by DynamoDB request", Buckets: prometheus.ExponentialBuckets(1, 2.0, 5), }) dynamoConsumedCapacity = prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "prometheus", + Namespace: "prism", Name: "dynamo_consumed_capacity_total", Help: "The capacity units consumed by operation.", }, []string{"operation"}) droppedMatches = prometheus.NewCounter(prometheus.CounterOpts{ - Namespace: "prometheus", + Namespace: "prism", Name: "dropped_matches_total", Help: "The number of chunks fetched but later dropped for not matching.", }) s3RequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prometheus", + Namespace: "prism", Name: "s3_request_duration_seconds", Help: "Time spent doing S3 requests.", Buckets: []float64{.025, .05, .1, .25, .5, 1, 2}, diff --git a/distributor.go b/distributor.go index cb072ae3a3..4e4dee2d16 100644 --- a/distributor.go +++ b/distributor.go @@ -91,39 +91,39 @@ func NewDistributor(cfg DistributorConfig) (*Distributor, error) { cfg: cfg, clients: map[string]*IngesterClient{}, queryDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prometheus", + Namespace: "prism", 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: "prometheus", + Namespace: "prism", Name: "distributor_received_samples_total", Help: "The total number of received samples.", }), sendDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: "prometheus", + Namespace: "prism", 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: "prometheus", + Namespace: "prism", Name: "distributor_ingester_appends_total", Help: "The total number of batch appends sent to ingesters.", }, []string{"ingester"}), ingesterAppendFailures: prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "prometheus", + Namespace: "prism", Name: "distributor_ingester_appends_total", Help: "The total number of failed batch appends sent to ingesters.", }, []string{"ingester"}), ingesterQueries: prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "prometheus", + Namespace: "prism", Name: "distributor_ingester_queries_total", Help: "The total number of queries sent to ingesters.", }, []string{"ingester"}), ingesterQueryFailures: prometheus.NewCounterVec(prometheus.CounterOpts{ - Namespace: "prometheus", + Namespace: "prism", Name: "distributor_ingester_appends_total", Help: "The total number of failed queries sent to ingesters.", }, []string{"ingester"}),