Skip to content
This repository was archived by the owner on Mar 14, 2024. It is now read-only.

Commit 9ca372e

Browse files
authored
Merge pull request #71 from nginxinc/grafana-example-update
Update Grafana/Prometheus language
2 parents c605618 + 925910d commit 9ca372e

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

examples/grafana/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@ Two Grafana dashboards have been included as examples for use in your environmen
66

77
Both Grafana dashboards provide a high-level picture of the request volume and success rate of all your applications in the mesh, and each have been included to provide two different references for consuming and rendering NGINX Service Mesh metrics data.
88

9-
NGINX Service Mesh deploys Grafana and adds `NGINX Mesh Top` as the default dashboard. If you prefer to use an existing Grafana deployment, you can import either or both example dashboards included in this directory.
9+
You can import either or both example dashboards included in this directory into your Grafana deployment.
1010

1111
## Prerequisites
1212
- Grafana version >= 6.6.0
1313
- Prometheus datasource must be [configured](https://prometheus.io/docs/visualization/grafana/#creating-a-prometheus-data-source).
1414

15-
**Note:** If you are using the Prometheus server deployed by NGINX Service Mesh you can find the address by running [`nginx-meshctl config`](https://docs.nginx.com/nginx-service-mesh/reference/nginx-meshctl/#usage).
16-
If you are using your own Prometheus server, make sure to add the NGINX Service Mesh [scrape config](../prometheus/README.md) to your Prometheus configuration.
15+
**Note:** Make sure to add the NGINX Service Mesh [scrape config](../prometheus/README.md) to your Prometheus configuration.
1716

1817
## Installing Example Dashboards
1918

2019
To install an example dashboard using the Grafana UI follow these steps:
21-
- Select the New Dashboard button and click Import.
20+
- Click on Import under the Dashboards icon in the side menu.
2221
- Upload the dashboard JSON, ex: [nginx-mesh-top.json](nginx-mesh-top.json), file or copy and paste the contents of the file in the textbox and click Load.
2322
- Select the Prometheus data source you configured previously from the dropdown menu and click Import.
2423

examples/grafana/nginx-mesh-top.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@
346346
"alertThreshold": true
347347
},
348348
"percentage": false,
349-
"pluginVersion": "8.3.4",
350349
"pointradius": 5,
351350
"points": false,
352351
"renderer": "flot",
@@ -441,7 +440,6 @@
441440
"alertThreshold": true
442441
},
443442
"percentage": false,
444-
"pluginVersion": "8.3.4",
445443
"pointradius": 5,
446444
"points": false,
447445
"renderer": "flot",
@@ -538,7 +536,6 @@
538536
"alertThreshold": true
539537
},
540538
"percentage": false,
541-
"pluginVersion": "8.3.4",
542539
"pointradius": 2,
543540
"points": false,
544541
"renderer": "flot",
@@ -632,7 +629,6 @@
632629
"alertThreshold": true
633630
},
634631
"percentage": false,
635-
"pluginVersion": "8.3.4",
636632
"pointradius": 2,
637633
"points": false,
638634
"renderer": "flot",

examples/prometheus/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Prometheus Configuration
22

3-
NGINX Service Mesh deploys a Prometheus server that is configured to scrape metrics
3+
NGINX Service Mesh can integrate with a Prometheus deployment to scrape metrics
44
from NGINX Service Mesh sidecars and NGINX Plus Ingress Controller Pods. If you
5-
prefer to use an existing Prometheus deployment, you can add the following
5+
have an existing Prometheus deployment, you can add the following
66
scrape configs to your Prometheus configuration file.
77

88
## NGINX Mesh Sidecar Scrape Config

0 commit comments

Comments
 (0)