Skip to content

Commit

Permalink
Release 0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Dean-Coakley committed Dec 6, 2019
1 parent 23e6c62 commit c3dd65c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 6 deletions.
22 changes: 21 additions & 1 deletion 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:
Expand Down Expand Up @@ -69,6 +89,6 @@ COMPATIBILITY:
* NGINX 0.1.18 or newer.
* NGINX Plus R14 or newer.

## 0.1.0
## 0.1.0

* Initial release.
4 changes: 2 additions & 2 deletions 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)
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -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://<nginx>:8080/stub_status
$ docker run -p 9113:9113 nginx/nginx-prometheus-exporter:0.5.0 -nginx.scrape-uri http://<nginx>:8080/stub_status
```
where `<nginx>` 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://<nginx-plus>:8080/api
$ docker run -p 9113:9113 nginx/nginx-prometheus-exporter:0.5.0 -nginx.plus -nginx.scrape-uri http://<nginx-plus>:8080/api
```
where `<nginx-plus>` is the IP address/DNS name, through which NGINX Plus is available.

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit c3dd65c

Please sign in to comment.