Revert "addons: Update from Grafana v4.6.3 to v5.0.0"

* Revert commit 9dcc255f8e.
* Grafana v5.0 is not compatible with Kubernetes v1.9.4. See
https://github.com/poseidon/typhoon/pull/162
This commit is contained in:
Dalton Hubble 2018-03-12 20:59:02 -07:00
parent 21f2cef12f
commit c59a9c66b1
5 changed files with 250 additions and 143 deletions

View File

@ -48,8 +48,6 @@ Notable changes between versions.
* Update Prometheus from 2.1.0 to 2.2.0 ([#153](https://github.com/poseidon/typhoon/pull/153)) * Update Prometheus from 2.1.0 to 2.2.0 ([#153](https://github.com/poseidon/typhoon/pull/153))
* Scrape Prometheus itself to enable alerts about Prometheus itself * Scrape Prometheus itself to enable alerts about Prometheus itself
* Adjust KubeletDown rule to fire when 10% of kubelets are down * Adjust KubeletDown rule to fire when 10% of kubelets are down
* Update Grafana from v4.6.3 to v5.0.1 ([#153](https://github.com/poseidon/typhoon/pull/153))
* Restrict dashboard organization role to Viewer
* Update heapster from v1.5.0 to v1.5.1 ([#131](https://github.com/poseidon/typhoon/pull/131)) * Update heapster from v1.5.0 to v1.5.1 ([#131](https://github.com/poseidon/typhoon/pull/131))
* Use separate service account * Use separate service account
* Update nginx-ingress from 0.10.2 to 0.11.0 * Update nginx-ingress from 0.10.2 to 0.11.0

View File

@ -5,12 +5,14 @@ metadata:
namespace: monitoring namespace: monitoring
data: data:
deployment-dashboard.json: |+ deployment-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "prometheus", "name": "DS_PROMETHEUS",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -37,7 +39,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -108,7 +110,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -179,7 +181,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "Bps", "format": "Bps",
"gauge": { "gauge": {
@ -260,7 +262,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -331,7 +333,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -401,7 +403,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -471,7 +473,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -548,7 +550,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -663,7 +665,7 @@ data:
{ {
"allValue": ".*", "allValue": ".*",
"current": {}, "current": {},
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Namespace", "label": "Namespace",
@ -683,7 +685,7 @@ data:
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Deployment", "label": "Deployment",
@ -735,11 +737,24 @@ data:
"title": "Deployment", "title": "Deployment",
"version": 1 "version": 1
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
etcd-dashboard.json: |+ etcd-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"name": "prometheus", "name": "DS_PROMETHEUS",
"label": "prometheus", "label": "prometheus",
"description": "", "description": "",
"type": "datasource", "type": "datasource",
@ -798,7 +813,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"format": "none", "format": "none",
@ -874,7 +889,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -963,7 +978,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1064,7 +1079,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"decimals": null, "decimals": null,
"editable": false, "editable": false,
"error": false, "error": false,
@ -1146,7 +1161,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1235,7 +1250,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1327,7 +1342,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 5, "fill": 5,
@ -1407,7 +1422,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 5, "fill": 5,
@ -1487,7 +1502,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1567,7 +1582,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"decimals": null, "decimals": null,
"editable": false, "editable": false,
"error": false, "error": false,
@ -1661,7 +1676,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1767,7 +1782,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"decimals": 0, "decimals": 0,
"editable": false, "editable": false,
"error": false, "error": false,
@ -1894,13 +1909,26 @@ data:
"title": "etcd", "title": "etcd",
"version": 4 "version": 4
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
kubernetes-capacity-planning-dashboard.json: |+ kubernetes-capacity-planning-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "prometheus", "name": "DS_PROMETHEUS",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -1926,7 +1954,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2004,7 +2032,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2106,7 +2134,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2222,7 +2250,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -2305,7 +2333,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2412,7 +2440,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percentunit", "format": "percentunit",
"gauge": { "gauge": {
@ -2494,7 +2522,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2576,7 +2604,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2667,7 +2695,7 @@ data:
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2754,7 +2782,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -2869,13 +2897,26 @@ data:
"title": "Kubernetes Capacity Planning", "title": "Kubernetes Capacity Planning",
"version": 4 "version": 4
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
kubernetes-cluster-health-dashboard.json: |+ kubernetes-cluster-health-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "prometheus", "name": "DS_PROMETHEUS",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -2903,7 +2944,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -2984,7 +3025,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3060,7 +3101,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3136,7 +3177,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3222,7 +3263,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3298,7 +3339,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3374,7 +3415,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3450,7 +3491,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3564,13 +3605,26 @@ data:
"title": "Kubernetes Cluster Health", "title": "Kubernetes Cluster Health",
"version": 9 "version": 9
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
kubernetes-cluster-status-dashboard.json: |+ kubernetes-cluster-status-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "prometheus", "name": "DS_PROMETHEUS",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -3597,7 +3651,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3669,7 +3723,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3751,7 +3805,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -3823,7 +3877,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -3895,7 +3949,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -3967,7 +4021,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -4049,7 +4103,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4121,7 +4175,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4193,7 +4247,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4265,7 +4319,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4375,13 +4429,26 @@ data:
"title": "Kubernetes Cluster Status", "title": "Kubernetes Cluster Status",
"version": 3 "version": 3
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
kubernetes-control-plane-status-dashboard.json: |+ kubernetes-control-plane-status-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "prometheus", "name": "DS_PROMETHEUS",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -4408,7 +4475,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4483,7 +4550,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4558,7 +4625,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4633,7 +4700,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4716,7 +4783,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -4802,7 +4869,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -4877,7 +4944,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -5002,13 +5069,26 @@ data:
"title": "Kubernetes Control Plane Status", "title": "Kubernetes Control Plane Status",
"version": 3 "version": 3
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
kubernetes-resource-requests-dashboard.json: |+ kubernetes-resource-requests-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "prometheus", "name": "DS_PROMETHEUS",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -5033,7 +5113,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"description": "This represents the total [CPU resource requests](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu) in the cluster.\nFor comparison the total [allocatable CPU cores](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/node-allocatable.md) is also shown.", "description": "This represents the total [CPU resource requests](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu) in the cluster.\nFor comparison the total [allocatable CPU cores](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/node-allocatable.md) is also shown.",
"editable": false, "editable": false,
"error": false, "error": false,
@ -5122,7 +5202,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -5204,7 +5284,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"description": "This represents the total [memory resource requests](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory) in the cluster.\nFor comparison the total [allocatable memory](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/node-allocatable.md) is also shown.", "description": "This represents the total [memory resource requests](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory) in the cluster.\nFor comparison the total [allocatable memory](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/node-allocatable.md) is also shown.",
"editable": false, "editable": false,
"error": false, "error": false,
@ -5293,7 +5373,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -5406,13 +5486,26 @@ data:
"title": "Kubernetes Resource Requests", "title": "Kubernetes Resource Requests",
"version": 2 "version": 2
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
nodes-dashboard.json: |+ nodes-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "prometheus", "name": "DS_PROMETHEUS",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -5439,7 +5532,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -5518,7 +5611,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -5620,7 +5713,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -5732,7 +5825,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -5814,7 +5907,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -5921,7 +6014,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(245, 54, 54, 0.9)" "rgba(245, 54, 54, 0.9)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "percentunit", "format": "percentunit",
"gauge": { "gauge": {
@ -6003,7 +6096,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6085,7 +6178,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6177,7 +6270,7 @@ data:
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": null, "label": null,
@ -6229,13 +6322,26 @@ data:
"title": "Nodes", "title": "Nodes",
"version": 2 "version": 2
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
pods-dashboard.json: |+ pods-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "prometheus", "name": "DS_PROMETHEUS",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -6260,7 +6366,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6366,7 +6472,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6470,7 +6576,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6556,7 +6662,7 @@ data:
{ {
"allValue": ".*", "allValue": ".*",
"current": {}, "current": {},
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Namespace", "label": "Namespace",
@ -6576,7 +6682,7 @@ data:
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Pod", "label": "Pod",
@ -6596,7 +6702,7 @@ data:
{ {
"allValue": ".*", "allValue": ".*",
"current": {}, "current": {},
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Container", "label": "Container",
@ -6648,13 +6754,26 @@ data:
"title": "Pods", "title": "Pods",
"version": 1 "version": 1
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
statefulset-dashboard.json: |+ statefulset-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "prometheus", "name": "DS_PROMETHEUS",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -6681,7 +6800,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -6752,7 +6871,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -6823,7 +6942,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "Bps", "format": "Bps",
"gauge": { "gauge": {
@ -6904,7 +7023,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -6975,7 +7094,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -7045,7 +7164,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -7115,7 +7234,7 @@ data:
"rgba(237, 129, 40, 0.89)", "rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)" "rgba(50, 172, 45, 0.97)"
], ],
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -7192,7 +7311,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -7286,7 +7405,7 @@ data:
{ {
"allValue": ".*", "allValue": ".*",
"current": {}, "current": {},
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Namespace", "label": "Namespace",
@ -7306,7 +7425,7 @@ data:
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "prometheus", "datasource": "${DS_PROMETHEUS}",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "StatefulSet", "label": "StatefulSet",
@ -7358,4 +7477,23 @@ data:
"title": "StatefulSet", "title": "StatefulSet",
"version": 1 "version": 1
} }
,
"inputs": [
{
"name": "DS_PROMETHEUS",
"pluginId": "prometheus",
"type": "datasource",
"value": "prometheus"
}
],
"overwrite": true
}
prometheus-datasource.json: |+
{
"access": "proxy",
"basicAuth": false,
"name": "prometheus",
"type": "prometheus",
"url": "http://prometheus.monitoring.svc"
}
--- ---

View File

@ -1,15 +0,0 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: grafana-dashboard-providers
namespace: monitoring
data:
dashboard-providers.yaml: |+
apiVersion: 1
providers:
- name: 'default'
ordId: 1
folder: ''
type: file
options:
path: /var/lib/grafana/dashboards

View File

@ -1,16 +0,0 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: grafana-datasources
namespace: monitoring
data:
prometheus.yaml: |+
apiVersion: 1
datasources:
- name: prometheus
type: prometheus
access: proxy
orgId: 1
url: http://prometheus.monitoring.svc.cluster.local
version: 1
editable: false

View File

@ -21,7 +21,7 @@ spec:
spec: spec:
containers: containers:
- name: grafana - name: grafana
image: grafana/grafana:5.0.1 image: grafana/grafana:4.6.3
env: env:
- name: GF_SERVER_HTTP_PORT - name: GF_SERVER_HTTP_PORT
value: "8080" value: "8080"
@ -30,7 +30,7 @@ spec:
- name: GF_AUTH_ANONYMOUS_ENABLED - name: GF_AUTH_ANONYMOUS_ENABLED
value: "true" value: "true"
- name: GF_AUTH_ANONYMOUS_ORG_ROLE - name: GF_AUTH_ANONYMOUS_ORG_ROLE
value: Viewer value: Admin
ports: ports:
- name: http - name: http
containerPort: 8080 containerPort: 8080
@ -41,20 +41,22 @@ spec:
limits: limits:
memory: 200Mi memory: 200Mi
cpu: 200m cpu: 200m
- name: grafana-watcher
image: quay.io/coreos/grafana-watcher:v0.0.8
args:
- '--watch-dir=/etc/grafana/dashboards'
- '--grafana-url=http://localhost:8080'
resources:
requests:
memory: "16Mi"
cpu: "50m"
limits:
memory: "32Mi"
cpu: "100m"
volumeMounts: volumeMounts:
- name: datasources - name: dashboards
mountPath: /etc/grafana/provisioning/datasources mountPath: /etc/grafana/dashboards
- name: dashboard-providers
mountPath: /etc/grafana/provisioning/dashboards
- name: dashboards
mountPath: /var/lib/grafana/dashboards
volumes: volumes:
- name: datasources
configMap:
name: grafana-datasources
- name: dashboard-providers
configMap:
name: grafana-dashboard-providers
- name: dashboards - name: dashboards
configMap: configMap:
name: grafana-dashboards name: grafana-dashboards