From c3dd65ccd402189382f5759a50176ae9853acfbe Mon Sep 17 00:00:00 2001 From: Dean Coakley Date: Fri, 6 Dec 2019 11:50:37 -0800 Subject: [PATCH] Release 0.5.0 --- CHANGELOG.md | 22 +++++++++++++++++++++- Makefile | 4 ++-- README.md | 6 +++--- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d9fac4c..b3c88684 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +### 0.5.0 + +FEATURES: +* [70](https://github.com/nginxinc/nginx-prometheus-exporter/pull/70): Set user agent on scrape requests to nginx. +* [68](https://github.com/nginxinc/nginx-prometheus-exporter/pull/68): Add ability to scrape and listen on unix domain sockets. +* [64](https://github.com/nginxinc/nginx-prometheus-exporter/pull/64): Add location zone and resolver metric support. + +BUGFIXES: +* [73](https://github.com/nginxinc/nginx-prometheus-exporter/pull/73): Fix typo in stream_zone_sync_status_nodes_online metric description. +* [71](https://github.com/nginxinc/nginx-prometheus-exporter/pull/71): Do not assume default datasource in Grafana panels. +* [62](https://github.com/nginxinc/nginx-prometheus-exporter/pull/62): Set correct nginx_up query and instance variable expression. + +UPGRADE: +* Use the 0.5.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.5.0` +* Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.5.0). + +COMPATIBILITY: +* NGINX 0.1.18 or newer. +* NGINX Plus R19 or newer. + ### 0.4.2 BUGFIXES: @@ -69,6 +89,6 @@ COMPATIBILITY: * NGINX 0.1.18 or newer. * NGINX Plus R14 or newer. -## 0.1.0 +## 0.1.0 * Initial release. \ No newline at end of file diff --git a/Makefile b/Makefile index 86c4b9ac..466c8cfb 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 0.4.2 +VERSION = 0.5.0 PREFIX = nginx/nginx-prometheus-exporter TAG = $(VERSION) GIT_COMMIT = $(shell git rev-parse --short HEAD) @@ -15,7 +15,7 @@ test: GO111MODULE=on go test -mod=vendor ./... container: - docker build --build-arg VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) -t $(PREFIX):$(TAG) . + docker build --build-arg VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) -t $(PREFIX):$(TAG) . push: container docker push $(PREFIX):$(TAG) diff --git a/README.md b/README.md index 4ab64d98..b834d9ca 100644 --- a/README.md +++ b/README.md @@ -30,13 +30,13 @@ To start the exporter we use the [docker run](https://docs.docker.com/engine/ref * To export NGINX metrics, run: ``` - $ docker run -p 9113:9113 nginx/nginx-prometheus-exporter:0.4.2 -nginx.scrape-uri http://:8080/stub_status + $ docker run -p 9113:9113 nginx/nginx-prometheus-exporter:0.5.0 -nginx.scrape-uri http://:8080/stub_status ``` where `` is the IP address/DNS name, through which NGINX is available. * To export NGINX Plus metrics, run: ``` - $ docker run -p 9113:9113 nginx/nginx-prometheus-exporter:0.4.2 -nginx.plus -nginx.scrape-uri http://:8080/api + $ docker run -p 9113:9113 nginx/nginx-prometheus-exporter:0.5.0 -nginx.plus -nginx.scrape-uri http://:8080/api ``` where `` is the IP address/DNS name, through which NGINX Plus is available. @@ -75,7 +75,7 @@ Usage of ./nginx-prometheus-exporter: -nginx.retry-interval duration An interval between retries to connect to the NGINX stub_status page/NGINX Plus API on start. The default value can be overwritten by NGINX_RETRY_INTERVAL environment variable. (default 5s) -nginx.scrape-uri string - A URI or unix domain socket path for scraping NGINX or NGINX Plus metrics. + A URI or unix domain socket path for scraping NGINX or NGINX Plus metrics. For NGINX, the stub_status page must be available through the URI. For NGINX Plus -- the API. The default value can be overwritten by SCRAPE_URI environment variable. (default "http://127.0.0.1:8080/stub_status") -nginx.ssl-verify Perform SSL certificate verification. The default value can be overwritten by SSL_VERIFY environment variable. (default true)