Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix grafana datasources #2888

Merged
merged 3 commits into from
Aug 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion deploy/grafana/dashboards/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ This folder contains a dashboard that you can import:
- Network IO pressure, memory and CPU use
- Ingress P50, P95 and P99 percentile response times with IN/OUT throughput
- SSL certificate expiry
- Annotational overlays to show when config reloads happened
- Annotational overlays to show when config reloads happened

## Requirements

- **Grafana v5.2.0** (or newer)
28 changes: 14 additions & 14 deletions deploy/grafana/dashboards/nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"type": "dashboard"
},
{
"datasource": "Prometheus",
"datasource": "prometheus",
"enable": true,
"expr": "sum(changes(nginx_ingress_controller_config_last_reload_successful_timestamp_seconds{instance!=\"unknown\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[30s])) by (controller_class)",
"hide": false,
Expand Down Expand Up @@ -72,7 +72,7 @@
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"datasource": null,
"datasource": "prometheus",
"format": "ops",
"gauge": {
"maxValue": 100,
Expand Down Expand Up @@ -154,7 +154,7 @@
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"datasource": null,
"datasource": "prometheus",
"format": "none",
"gauge": {
"maxValue": 100,
Expand Down Expand Up @@ -237,7 +237,7 @@
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"datasource": null,
"datasource": "prometheus",
"format": "percentunit",
"gauge": {
"maxValue": 100,
Expand Down Expand Up @@ -319,7 +319,7 @@
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"datasource": null,
"datasource": "prometheus",
"decimals": 0,
"format": "none",
"gauge": {
Expand Down Expand Up @@ -403,7 +403,7 @@
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"datasource": null,
"datasource": "prometheus",
"decimals": 0,
"format": "none",
"gauge": {
Expand Down Expand Up @@ -483,7 +483,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"datasource": "prometheus",
"decimals": 2,
"editable": true,
"error": false,
Expand Down Expand Up @@ -599,7 +599,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"datasource": "prometheus",
"decimals": 2,
"editable": false,
"error": false,
Expand Down Expand Up @@ -701,7 +701,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"datasource": "prometheus",
"decimals": 3,
"editable": false,
"error": false,
Expand Down Expand Up @@ -804,7 +804,7 @@
},
{
"columns": [],
"datasource": null,
"datasource": "prometheus",
"fontSize": "100%",
"gridPos": {
"h": 8,
Expand Down Expand Up @@ -1029,7 +1029,7 @@
"value": "current"
}
],
"datasource": null,
"datasource": "prometheus",
"fontSize": "100%",
"gridPos": {
"h": 8,
Expand Down Expand Up @@ -1117,7 +1117,7 @@
"text": "All",
"value": "$__all"
},
"datasource": "Prometheus",
"datasource": "prometheus",
"hide": 0,
"includeAll": true,
"label": "Namespace",
Expand All @@ -1140,7 +1140,7 @@
"text": "All",
"value": "$__all"
},
"datasource": "Prometheus",
"datasource": "prometheus",
"hide": 0,
"includeAll": true,
"label": "Controller Class",
Expand All @@ -1163,7 +1163,7 @@
"text": "All",
"value": "$__all"
},
"datasource": "Prometheus",
"datasource": "prometheus",
"hide": 0,
"includeAll": true,
"label": "Controller",
Expand Down