Sync with upstream (#1)

* Update dependencies

* Release 0.3.0

* Change namespace.

Author: stafot

.gitignore

@@ -6,4 +6,6 @@
 .vscode
 
 # the binary
-nginx-prometheus-exporter
+nginx-prometheus-exporter
+
+.idea

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+### 0.3.0
+
+FEATURES:
+* [32](https://github.com/nginxinc/nginx-prometheus-exporter/pull/32): Add nginxexporter_build_info metric.
+* [31](https://github.com/nginxinc/nginx-prometheus-exporter/pull/31): Implement nginx_up and nginxplus_up metrics. Add -nginx.timeout cli argument for setting a timeout for scrapping metrics from NGINX or NGINX Plus.
+
+UPGRADE:
+* Use the 0.3.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.3.0`
+* Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.3.0).
+
+COMPATIBILITY:
+* NGINX 0.1.18 or newer.
+* NGINX Plus R14 or newer.
+
 ## 0.2.0
 
 FEATURES:
@@ -9,7 +23,7 @@ FEATURES:
 
 UPGRADE:
 * Use the 0.2.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.2.0`
-* Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/tree/v0.2.0).
+* Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.2.0).
 
 COMPATIBILITY:
 * NGINX 0.1.18 or newer.

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "github.com/prometheus/client_golang"
-  version = "0.9.1"
+  version = "0.9.2"
 
 [[constraint]]
   name = "github.com/nginxinc/nginx-plus-go-sdk"

Gopkg.toml

@@ -1,5 +1,5 @@
-VERSION = 0.2.0
-PREFIX = nginx/nginx-prometheus-exporter
+VERSION = 0.3.0
+PREFIX = stafot/nginx-prometheus-exporter
 TAG = $(VERSION)
 GIT_COMMIT = $(shell git rev-parse --short HEAD)
 

Makefile

@@ -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.2.0 -nginx.scrape-uri http://<nginx>:8080/stub_status
+    $ docker run -p 9113:9113 nginx/nginx-prometheus-exporter:0.3.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.2.0 -nginx.plus -nginx.scrape-uri http://<nginx-plus>:8080/api
+    $ docker run -p 9113:9113 nginx/nginx-prometheus-exporter:0.3.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.
 

README.md

@@ -70,6 +70,8 @@ func main() {
 
 	registry := prometheus.NewRegistry()
 
+	app := os.Getenv("SERVICE")
+
 	buildInfoMetric := prometheus.NewGauge(
 		prometheus.GaugeOpts{
 			Name: "nginxexporter_build_info",
@@ -104,7 +106,7 @@ func main() {
 			log.Fatalf("Could not create Nginx Client: %v", err)
 		}
 
-		registry.MustRegister(collector.NewNginxCollector(client, "nginx"))
+		registry.MustRegister(collector.NewNginxCollector(client, app+"_nginx"))
 	}
 
 	http.Handle(*metricsPath, promhttp.HandlerFor(registry, promhttp.HandlerOpts{}))