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

Commit a808ff6

Browse files
author
Aidan
authored
Merge pull request #21 from SirNexus/grafana-7.5.3
Update grafana examples to 7.5.3
2 parents ae8e7d8 + 371da47 commit a808ff6

File tree

3 files changed

+99
-92
lines changed

3 files changed

+99
-92
lines changed

examples/grafana/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Both Grafana dashboards provide a high-level picture of the request volume and s
99
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.
1010

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

1515
**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).

examples/grafana/nginx-mesh-top.json

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@
6565
],
6666
"datasource": "${DS_PROMETHEUS}",
6767
"fieldConfig": {
68-
"defaults": {
69-
"custom": {}
70-
},
68+
"defaults": {},
7169
"overrides": []
7270
},
7371
"format": "percentunit",
@@ -152,9 +150,7 @@
152150
],
153151
"datasource": "${DS_PROMETHEUS}",
154152
"fieldConfig": {
155-
"defaults": {
156-
"custom": {}
157-
},
153+
"defaults": {},
158154
"overrides": []
159155
},
160156
"format": "reqps",
@@ -239,9 +235,7 @@
239235
],
240236
"datasource": "${DS_PROMETHEUS}",
241237
"fieldConfig": {
242-
"defaults": {
243-
"custom": {}
244-
},
238+
"defaults": {},
245239
"overrides": []
246240
},
247241
"format": "none",
@@ -322,9 +316,7 @@
322316
"dashes": false,
323317
"datasource": "${DS_PROMETHEUS}",
324318
"fieldConfig": {
325-
"defaults": {
326-
"custom": {}
327-
},
319+
"defaults": {},
328320
"overrides": []
329321
},
330322
"fill": 1,
@@ -350,8 +342,11 @@
350342
"linewidth": 1,
351343
"links": [],
352344
"nullPointMode": "null",
345+
"options": {
346+
"alertThreshold": true
347+
},
353348
"percentage": false,
354-
"pluginVersion": "7.1.5",
349+
"pluginVersion": "7.5.3",
355350
"pointradius": 5,
356351
"points": false,
357352
"renderer": "flot",
@@ -416,9 +411,7 @@
416411
"dashes": false,
417412
"datasource": "${DS_PROMETHEUS}",
418413
"fieldConfig": {
419-
"defaults": {
420-
"custom": {}
421-
},
414+
"defaults": {},
422415
"overrides": []
423416
},
424417
"fill": 1,
@@ -444,8 +437,11 @@
444437
"linewidth": 1,
445438
"links": [],
446439
"nullPointMode": "null",
440+
"options": {
441+
"alertThreshold": true
442+
},
447443
"percentage": false,
448-
"pluginVersion": "7.1.5",
444+
"pluginVersion": "7.5.3",
449445
"pointradius": 5,
450446
"points": false,
451447
"renderer": "flot",
@@ -513,9 +509,7 @@
513509
"datasource": null,
514510
"description": "RSS used by NGINX Service Mesh sidecars",
515511
"fieldConfig": {
516-
"defaults": {
517-
"custom": {}
518-
},
512+
"defaults": {},
519513
"overrides": []
520514
},
521515
"fill": 1,
@@ -540,8 +534,11 @@
540534
"lines": true,
541535
"linewidth": 1,
542536
"nullPointMode": "null",
537+
"options": {
538+
"alertThreshold": true
539+
},
543540
"percentage": false,
544-
"pluginVersion": "7.1.5",
541+
"pluginVersion": "7.5.3",
545542
"pointradius": 2,
546543
"points": false,
547544
"renderer": "flot",
@@ -606,9 +603,7 @@
606603
"datasource": null,
607604
"description": "Private memory used by NGINX Service Mesh sidecars",
608605
"fieldConfig": {
609-
"defaults": {
610-
"custom": {}
611-
},
606+
"defaults": {},
612607
"overrides": []
613608
},
614609
"fill": 1,
@@ -633,8 +628,11 @@
633628
"lines": true,
634629
"linewidth": 1,
635630
"nullPointMode": "null",
631+
"options": {
632+
"alertThreshold": true
633+
},
636634
"percentage": false,
637-
"pluginVersion": "7.1.5",
635+
"pluginVersion": "7.5.3",
638636
"pointradius": 2,
639637
"points": false,
640638
"renderer": "flot",
@@ -693,7 +691,7 @@
693691
}
694692
],
695693
"refresh": "5s",
696-
"schemaVersion": 26,
694+
"schemaVersion": 27,
697695
"style": "dark",
698696
"tags": [
699697
"nginx-service-mesh"
@@ -733,5 +731,5 @@
733731
"timezone": "",
734732
"title": "NGINX Mesh Top",
735733
"uid": "N3zQ72OWk",
736-
"version": 1
734+
"version": 2
737735
}

0 commit comments

Comments
 (0)