CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

addons: Update from Grafana v4.6.3 to v5.0.4 

This reverts commit c59a9c66b1.
This commit is contained in:
Dalton Hubble 2018-03-28 19:12:39 -07:00
parent de4d90750e
commit b1e41dcb99
5 changed files with 146 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -18,6 +18,11 @@ Notable changes between versions.
* Add `worker_type` variable for setting machine type for workers * Add `worker_type` variable for setting machine type for workers
* Remove optional variable `machine_type`. Use `controller_type` and `worker_type`. * Remove optional variable `machine_type`. Use `controller_type` and `worker_type`.
#### Addons
* Update Grafana from v4.6.3 to v5.0.4 ([#153](https://github.com/poseidon/typhoon/pull/153), [#174](https://github.com/poseidon/typhoon/pull/174))
* Restrict dashboard organization role to Viewer
## v1.9.6 ## v1.9.6
* Kubernetes [v1.9.6](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.9.md#v196) * Kubernetes [v1.9.6](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.9.md#v196)

15
addons/grafana/dashboard-providers.yaml Normal file
View File

@ -0,0 +1,15 @@
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

330
addons/grafana/config.yaml → addons/grafana/dashboards.yaml
View File

@ -5,14 +5,12 @@ metadata:
namespace: monitoring namespace: monitoring
data: data:
deployment-dashboard.json: |+ deployment-dashboard.json: |+
{
"dashboard":
{ {
"__inputs": [ "__inputs": [
{ {
"description": "", "description": "",
"label": "prometheus", "label": "prometheus",
"name": "DS_PROMETHEUS", "name": "prometheus",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -39,7 +37,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -110,7 +108,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -181,7 +179,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "Bps", "format": "Bps",
"gauge": { "gauge": {
@ -262,7 +260,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -333,7 +331,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -403,7 +401,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -473,7 +471,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -550,7 +548,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -665,7 +663,7 @@ data:
{ {
"allValue": ".*", "allValue": ".*",
"current": {}, "current": {},
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Namespace", "label": "Namespace",
@ -685,7 +683,7 @@ data:
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Deployment", "label": "Deployment",
@ -737,24 +735,11 @@ 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": "DS_PROMETHEUS", "name": "prometheus",
"label": "prometheus", "label": "prometheus",
"description": "", "description": "",
"type": "datasource", "type": "datasource",
@ -813,7 +798,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"format": "none", "format": "none",
@ -889,7 +874,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -978,7 +963,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1079,7 +1064,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"decimals": null, "decimals": null,
"editable": false, "editable": false,
"error": false, "error": false,
@ -1161,7 +1146,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1250,7 +1235,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1342,7 +1327,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 5, "fill": 5,
@ -1422,7 +1407,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 5, "fill": 5,
@ -1502,7 +1487,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1582,7 +1567,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"decimals": null, "decimals": null,
"editable": false, "editable": false,
"error": false, "error": false,
@ -1676,7 +1661,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 0, "fill": 0,
@ -1782,7 +1767,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"decimals": 0, "decimals": 0,
"editable": false, "editable": false,
"error": false, "error": false,
@ -1909,26 +1894,13 @@ 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": "DS_PROMETHEUS", "name": "prometheus",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -1954,7 +1926,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2032,7 +2004,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2134,7 +2106,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2250,7 +2222,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -2333,7 +2305,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2440,7 +2412,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percentunit", "format": "percentunit",
"gauge": { "gauge": {
@ -2522,7 +2494,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2604,7 +2576,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2695,7 +2667,7 @@ data:
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -2782,7 +2754,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -2897,26 +2869,13 @@ 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": "DS_PROMETHEUS", "name": "prometheus",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -2944,7 +2903,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3025,7 +2984,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3101,7 +3060,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3177,7 +3136,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3263,7 +3222,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3339,7 +3298,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3415,7 +3374,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3491,7 +3450,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3605,26 +3564,13 @@ 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": "DS_PROMETHEUS", "name": "prometheus",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -3651,7 +3597,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3723,7 +3669,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -3805,7 +3751,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -3877,7 +3823,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -3949,7 +3895,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4021,7 +3967,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -4103,7 +4049,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4175,7 +4121,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4247,7 +4193,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4319,7 +4265,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4429,26 +4375,13 @@ 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": "DS_PROMETHEUS", "name": "prometheus",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -4475,7 +4408,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4550,7 +4483,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4625,7 +4558,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4700,7 +4633,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -4783,7 +4716,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -4869,7 +4802,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -4944,7 +4877,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -5069,26 +5002,13 @@ 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": "DS_PROMETHEUS", "name": "prometheus",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -5113,7 +5033,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "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,
@ -5202,7 +5122,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -5284,7 +5204,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "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,
@ -5373,7 +5293,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -5486,26 +5406,13 @@ 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": "DS_PROMETHEUS", "name": "prometheus",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -5532,7 +5439,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -5611,7 +5518,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -5713,7 +5620,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -5825,7 +5732,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percent", "format": "percent",
"gauge": { "gauge": {
@ -5907,7 +5814,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6014,7 +5921,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "percentunit", "format": "percentunit",
"gauge": { "gauge": {
@ -6096,7 +6003,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6178,7 +6085,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6270,7 +6177,7 @@ data:
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": null, "label": null,
@ -6322,26 +6229,13 @@ 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": "DS_PROMETHEUS", "name": "prometheus",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -6366,7 +6260,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6472,7 +6366,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6576,7 +6470,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -6662,7 +6556,7 @@ data:
{ {
"allValue": ".*", "allValue": ".*",
"current": {}, "current": {},
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Namespace", "label": "Namespace",
@ -6682,7 +6576,7 @@ data:
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Pod", "label": "Pod",
@ -6702,7 +6596,7 @@ data:
{ {
"allValue": ".*", "allValue": ".*",
"current": {}, "current": {},
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"hide": 0, "hide": 0,
"includeAll": true, "includeAll": true,
"label": "Container", "label": "Container",
@ -6754,26 +6648,13 @@ 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": "DS_PROMETHEUS", "name": "prometheus",
"pluginId": "prometheus", "pluginId": "prometheus",
"pluginName": "Prometheus", "pluginName": "Prometheus",
"type": "datasource" "type": "datasource"
@ -6800,7 +6681,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -6871,7 +6752,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -6942,7 +6823,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "Bps", "format": "Bps",
"gauge": { "gauge": {
@ -7023,7 +6904,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -7094,7 +6975,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -7164,7 +7045,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -7234,7 +7115,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": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"format": "none", "format": "none",
"gauge": { "gauge": {
@ -7311,7 +7192,7 @@ data:
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"editable": false, "editable": false,
"error": false, "error": false,
"fill": 1, "fill": 1,
@ -7405,7 +7286,7 @@ data:
{ {
"allValue": ".*", "allValue": ".*",
"current": {}, "current": {},
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Namespace", "label": "Namespace",
@ -7425,7 +7306,7 @@ data:
{ {
"allValue": null, "allValue": null,
"current": {}, "current": {},
"datasource": "${DS_PROMETHEUS}", "datasource": "prometheus",
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "StatefulSet", "label": "StatefulSet",
@ -7477,23 +7358,4 @@ 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"
}
--- ---

16
addons/grafana/datasources.yaml Normal file
View File

@ -0,0 +1,16 @@
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

28
addons/grafana/deployment.yaml
View File

@ -21,7 +21,7 @@ spec:
spec: spec:
containers: containers:
- name: grafana - name: grafana
image: grafana/grafana:4.6.3 image: grafana/grafana:5.0.4
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: Admin value: Viewer
ports: ports:
- name: http - name: http
containerPort: 8080 containerPort: 8080
@ -41,22 +41,20 @@ 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
mountPath: /etc/grafana/provisioning/datasources
- name: dashboard-providers
mountPath: /etc/grafana/provisioning/dashboards
- name: dashboards - name: dashboards
mountPath: /etc/grafana/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