Merge branch 'master' into v0.0.2

PatrLind · Dec 24, 2016 · ccddad6 · ccddad6
2 parents 7a75c78 + 6adf610
commit ccddad6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,6 @@ ENV METRICS_ENDPOINT "/metrics"
 ENV METRICS_ADDR ":9913"
 ENV DEFAULT_METRICS_NS "nginx"
 
-EXPOSE 9113
+EXPOSE 9913
 
 ENTRYPOINT ["/app/docker-entrypoint.sh"]
diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ To Dockerize this application yo need to pass two steps the build then the conta
 
 ## Environment variables
 This image is configurable using different env variables
+
 Variable name | Default     | Description
 ------------- | ----------- | --------------
 NGINX_STATUS |  http://localhost/status/format/json | Nginx JSON format status page

diff --git a/nginx_vts_exporter.go b/nginx_vts_exporter.go
@@ -340,7 +340,7 @@ func fetchHTTP(uri string, timeout time.Duration) func() (io.ReadCloser, error)
 }
 
 var (
-	listenAddress   = flag.String("telemetry.address", ":9113", "Address on which to expose metrics.")
+	listenAddress   = flag.String("telemetry.address", ":9913", "Address on which to expose metrics.")
 	metricsEndpoint = flag.String("telemetry.endpoint", "/metrics", "Path under which to expose metrics.")
 	metricsNamespace = flag.String("metrics.namespace", "nginx", "Prometheus metrics namespace.")
 	nginxScrapeURI  = flag.String("nginx.scrape_uri", "http://localhost/status", "URI to nginx stub status page")