Merge pull request #65 from martin-helmich/feature/configurable-buckets

Make histogram buckets configurable

Author: martin-helmich

README.adoc

@@ -100,6 +100,8 @@ namespace "app1" {
     environment = "production"
     foo = "bar"
   }
+
+  histogram_buckets = [.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10]
 }
 
 namespace "app2" {
@@ -138,6 +140,7 @@ namespaces:
       app: "application-one"
       environment: "production"
       foo: "bar"
+    histogram_buckets: [.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10]
   - name: app2
     format: "$remote_addr - $remote_user [$time_local] \"$request\" $status $body_bytes_sent \"$http_referer\" \"$http_user_agent\" \"$http_x_forwarded_for\" $upstream_response_time"
     source_files:

config/struct_namespace.go

@@ -7,11 +7,12 @@ import (
 
 // NamespaceConfig is a struct describing single metric namespaces
 type NamespaceConfig struct {
-	Name           string            `hcl:",key"`
-	SourceFiles    []string          `hcl:"source_files" yaml:"source_files"`
-	Format         string            `hcl:"format"`
-	Labels         map[string]string `hcl:"labels"`
-	RelabelConfigs []RelabelConfig   `hcl:"relabel" yaml:"relabel_configs"`
+	Name             string            `hcl:",key"`
+	SourceFiles      []string          `hcl:"source_files" yaml:"source_files"`
+	Format           string            `hcl:"format"`
+	Labels           map[string]string `hcl:"labels"`
+	RelabelConfigs   []RelabelConfig   `hcl:"relabel" yaml:"relabel_configs"`
+	HistogramBuckets []float64         `hcl:"histogram_buckets" yaml:"histogram_buckets"`
 
 	OrderedLabelNames  []string
 	OrderedLabelValues []string

example-config.hcl

@@ -27,6 +27,8 @@ namespace "nginx" {
     foo = "bar"
   }
 
+  histogram_buckets = [.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10]
+
   relabel "user" {
     from = "remote_user"
     // whitelist = ["-", "user1", "user2"]

features/test-configuration.hcl

@@ -3,6 +3,8 @@ port = 4040
 namespace "nginx" {
   source_files = [".behave-sandbox/access-1.log"]
   format = "$remote_addr - $remote_user [$time_local] \"$request\" $status $body_bytes_sent \"$http_referer\" \"$http_user_agent\" \"$http_x_forwarded_for\""
+  
+  histogram_buckets = [.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10]
 }
 
 namespace "apache" {

features/test-configuration.yaml

@@ -6,6 +6,7 @@ namespaces:
     source_files:
       - .behave-sandbox/access-1.log
     format: "$remote_addr - $remote_user [$time_local] \"$request\" $status $body_bytes_sent \"$http_referer\" \"$http_user_agent\" \"$http_x_forwarded_for\""
+    histogram_buckets: [.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10]
   - name: apache
     source_files:
       - .behave-sandbox/access-2.log

main.go

@@ -83,6 +83,7 @@ func (m *Metrics) Init(cfg *config.NamespaceConfig) {
 		Namespace: cfg.Name,
 		Name:      "http_upstream_time_seconds_hist",
 		Help:      "Time needed by upstream servers to handle requests",
+		Buckets:   cfg.HistogramBuckets,
 	}, labels)
 
 	m.responseSeconds = prometheus.NewSummaryVec(prometheus.SummaryOpts{
@@ -95,6 +96,7 @@ func (m *Metrics) Init(cfg *config.NamespaceConfig) {
 		Namespace: cfg.Name,
 		Name:      "http_response_time_seconds_hist",
 		Help:      "Time needed by NGINX to handle requests",
+		Buckets:   cfg.HistogramBuckets,
 	}, labels)
 
 	m.parseErrorsTotal = prometheus.NewCounter(prometheus.CounterOpts{