From 7255e05a3a82c41c29f9ffc90ae66e950883bacb Mon Sep 17 00:00:00 2001 From: Michael Pleshakov Date: Thu, 28 Jun 2018 15:45:25 +0100 Subject: [PATCH] Update prometheus exporter image for Plus --- docs/installation.md | 4 +--- docs/nginx-ingress-controllers.md | 2 +- .../nginx-plus-ingress-with-prometheus.yaml | 17 ++++++++++------- .../nginx-plus-ingress-with-prometheus.yaml | 17 ++++++++++------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index ebbbdfb341..0b40e6c3df 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -151,7 +151,7 @@ For NGINX Plus, you can access the live activity monitoring dashboard: ## Support For Prometheus Monitoring -If you are using [Prometheus](https://prometheus.io/), you can deploy the NGINX Plus Ingress controller with the prometheus exporter for NGINX Plus. The exporter will export NGINX Plus metrics into your Prometheus. To deploy the Ingress controller with the exporter, use the modified manifests: +If you are using [Prometheus](https://prometheus.io/), you can deploy the NGINX Plus Ingress controller with the Prometheus exporter for NGINX Plus. The exporter will export NGINX Plus metrics into your Prometheus. To deploy the Ingress controller with the exporter, use the modified manifests: * For a deployment, run: ``` $ kubectl apply -f deployment/nginx-plus-ingress-with-prometheus.yaml @@ -161,8 +161,6 @@ If you are using [Prometheus](https://prometheus.io/), you can deploy the NGINX $ kubectl apply -f daemon-set/nginx-plus-ingress-with-prometheus.yaml ``` -**Note**: this is a preview version of the prometheus exporter for NGINX Plus. It is not suitable for using in production environments. - ## Uninstall the Ingress Controller Delete the `nginx-ingress` namespace to uninstall the Ingress controller along with all the auxiliary resources that were created: diff --git a/docs/nginx-ingress-controllers.md b/docs/nginx-ingress-controllers.md index a7e74c1f50..8212ff69db 100644 --- a/docs/nginx-ingress-controllers.md +++ b/docs/nginx-ingress-controllers.md @@ -33,7 +33,7 @@ The table below summarizes the key difference between nginxinc/kubernetes-ingres | **Operational** | | Reporting the IP address(es) of the Ingress controller into Ingress resources | Supported | Coming soon | Coming soon | | Extended Status | Supported via a third-party module | Not supported | Supported | -| Prometheus Integration | Supported | Not supported | Supported (in beta) | +| Prometheus Integration | Supported | Not supported | Supported | | Dynamic reconfiguration of endpoints (no configuration reloading) | Supported with a third-party Lua module | Not supported | Supported | Notes: diff --git a/install/daemon-set/nginx-plus-ingress-with-prometheus.yaml b/install/daemon-set/nginx-plus-ingress-with-prometheus.yaml index db7fd75e28..4152e3d440 100644 --- a/install/daemon-set/nginx-plus-ingress-with-prometheus.yaml +++ b/install/daemon-set/nginx-plus-ingress-with-prometheus.yaml @@ -13,7 +13,7 @@ spec: app: nginx-ingress annotations: prometheus.io/scrape: "true" - prometheus.io/port: "8090" + prometheus.io/port: "9113" spec: serviceAccountName: nginx-ingress containers: @@ -36,11 +36,14 @@ spec: - -nginx-configmaps=$(POD_NAMESPACE)/nginx-config - -default-server-tls-secret=$(POD_NAMESPACE)/default-server-secret #- -v=3 # Enables extensive logging. Useful for trooublshooting. - - image: nginxdemos/nginxplus-prometheus-exporter:0.1.0 - name: nginxplus-prometheus-exporter + - image: nginx/nginx-prometheus-exporter:0.1.0 + name: nginx-prometheus-exporter + ports: + - name: prometheus + containerPort: 9113 args: - - -listen-address - - :8090 - - -plus - - -metric-endpoint + - -web.listen-address + - :9113 + - -nginx.plus + - -nginx.scrape-uri - http://127.0.0.1:8080/api diff --git a/install/deployment/nginx-plus-ingress-with-prometheus.yaml b/install/deployment/nginx-plus-ingress-with-prometheus.yaml index afc68438c3..11be868c5e 100644 --- a/install/deployment/nginx-plus-ingress-with-prometheus.yaml +++ b/install/deployment/nginx-plus-ingress-with-prometheus.yaml @@ -14,7 +14,7 @@ spec: app: nginx-ingress annotations: prometheus.io/scrape: "true" - prometheus.io/port: "8090" + prometheus.io/port: "9113" spec: serviceAccountName: nginx-ingress containers: @@ -35,11 +35,14 @@ spec: - -nginx-configmaps=$(POD_NAMESPACE)/nginx-config - -default-server-tls-secret=$(POD_NAMESPACE)/default-server-secret #- -v=3 # Enables extensive logging. Useful for trooublshooting. - - image: nginxdemos/nginxplus-prometheus-exporter:0.1.0 - name: nginxplus-prometheus-exporter + - image: nginx/nginx-prometheus-exporter:0.1.0 + name: nginx-prometheus-exporter + ports: + - name: prometheus + containerPort: 9113 args: - - -listen-address - - :8090 - - -plus - - -metric-endpoint + - -web.listen-address + - :9113 + - -nginx.plus + - -nginx.scrape-uri - http://127.0.0.1:8080/api