Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update dashboards

Browse Source
This commit is contained in:
Alexander Zobnin
2017-06-18 17:18:36 +03:00
parent eda45e53a1
commit ed69b44222
5 changed files with 97 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Template query format. New format is `{group}{host}{app}{item}`. It allows to use names with dot. Updated - Template query format. New format is `{group}{host}{app}{item}`. It allows to use names with dot. Updated
[templating docs](http://docs.grafana-zabbix.org/guides/templating/#query-format), [templating docs](http://docs.grafana-zabbix.org/guides/templating/#query-format),
[#254](https://github.com/alexanderzobnin/grafana-zabbix/issues/254) [#254](https://github.com/alexanderzobnin/grafana-zabbix/issues/254)
- Update included dashboards. Add templated zabbix datasource and use it for all metrics.
## [3.4.0] - 2017-05-17 ## [3.4.0] - 2017-05-17
### Added ### Added

111
dist/dashboards/template_linux_server.json vendored
View File

@@ -24,7 +24,7 @@
"CPU user time": "#EAB839" "CPU user time": "#EAB839"
}, },
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 3, "fill": 3,
@@ -109,7 +109,7 @@
"Processor load (1 min average per core)": "#1F78C1" "Processor load (1 min average per core)": "#1F78C1"
}, },
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 1, "fill": 1,
@@ -201,7 +201,7 @@
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 3, "fill": 3,
@@ -300,7 +300,7 @@
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 3, "fill": 3,
@@ -434,56 +434,28 @@
}, },
"templating": { "templating": {
"list": [ "list": [
{
"current": {},
"hide": 0,
"label": "Zabbix Data Source",
"name": "datasource",
"options": [],
"query": "alexanderzobnin-zabbix-datasource",
"refresh": 1,
"regex": "",
"type": "datasource"
},
{ {
"allFormat": "regex values", "allFormat": "regex values",
"current": { "current": {},
"text": "Frontend", "datasource": "$datasource",
"value": "Frontend"
},
"datasource": null,
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Group", "label": "Group",
"multi": false, "multi": false,
"multiFormat": "glob", "multiFormat": "glob",
"name": "group", "name": "group",
"options": [ "options": [],
{
"text": "Backend",
"value": "Backend",
"selected": false
},
{
"text": "Database servers",
"value": "Database servers",
"selected": false
},
{
"text": "Frontend",
"value": "Frontend",
"selected": true
},
{
"text": "Linux servers",
"value": "Linux servers",
"selected": false
},
{
"text": "Network",
"value": "Network",
"selected": false
},
{
"text": "Workstations",
"value": "Workstations",
"selected": false
},
{
"text": "Zabbix servers",
"value": "Zabbix servers",
"selected": false
}
],
"query": "*", "query": "*",
"refresh": 1, "refresh": 1,
"refresh_on_load": false, "refresh_on_load": false,
@@ -492,29 +464,15 @@
}, },
{ {
"allFormat": "glob", "allFormat": "glob",
"current": { "current": {},
"text": "frontend01", "datasource": "$datasource",
"value": "frontend01"
},
"datasource": null,
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Host", "label": "Host",
"multi": false, "multi": false,
"multiFormat": "glob", "multiFormat": "glob",
"name": "host", "name": "host",
"options": [ "options": [],
{
"text": "frontend01",
"value": "frontend01",
"selected": true
},
{
"text": "frontend02",
"value": "frontend02",
"selected": false
}
],
"query": "$group.*", "query": "$group.*",
"refresh": 1, "refresh": 1,
"refresh_on_load": false, "refresh_on_load": false,
@@ -523,11 +481,8 @@
}, },
{ {
"allFormat": "regex values", "allFormat": "regex values",
"current": { "current": {},
"text": "All", "datasource": "$datasource",
"value": "$__all"
},
"datasource": null,
"hide": 0, "hide": 0,
"hideLabel": false, "hideLabel": false,
"includeAll": true, "includeAll": true,
@@ -535,23 +490,7 @@
"multi": true, "multi": true,
"multiFormat": "regex values", "multiFormat": "regex values",
"name": "netif", "name": "netif",
"options": [ "options": [],
{
"text": "All",
"value": "$__all",
"selected": true
},
{
"text": "eth0",
"value": "eth0",
"selected": false
},
{
"text": "eth1",
"value": "eth1",
"selected": false
}
],
"query": "*.$host.Network interfaces.*", "query": "*.$host.Network interfaces.*",
"refresh": 1, "refresh": 1,
"refresh_on_load": false, "refresh_on_load": false,
@@ -564,6 +503,6 @@
"list": [] "list": []
}, },
"schemaVersion": 12, "schemaVersion": 12,
"version": 8, "version": 9,
"links": [] "links": []
} }

33
dist/dashboards/zabbix_server_dashboard.json vendored
View File

@@ -26,7 +26,7 @@
"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": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"format": "none", "format": "none",
@@ -89,7 +89,7 @@
"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": null, "datasource": "$datasource",
"decimals": 0, "decimals": 0,
"editable": true, "editable": true,
"error": false, "error": false,
@@ -153,7 +153,7 @@
"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": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"format": "none", "format": "none",
@@ -218,7 +218,7 @@
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 1, "fill": 1,
@@ -327,6 +327,7 @@
"value": "avg" "value": "avg"
} }
], ],
"datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fontSize": "100%", "fontSize": "100%",
@@ -423,7 +424,7 @@
"functions": [] "functions": []
} }
], ],
"datasource": null, "datasource": "$datasource",
"renderer": "flot", "renderer": "flot",
"yaxes": [ "yaxes": [
{ {
@@ -530,7 +531,7 @@
"functions": [] "functions": []
} }
], ],
"datasource": null, "datasource": "$datasource",
"renderer": "flot", "renderer": "flot",
"yaxes": [ "yaxes": [
{ {
@@ -592,6 +593,21 @@
] ]
} }
], ],
"templating": {
"list": [
{
"current": {},
"hide": 0,
"label": "Zabbix Data Source",
"name": "datasource",
"options": [],
"query": "alexanderzobnin-zabbix-datasource",
"refresh": 1,
"regex": "",
"type": "datasource"
}
]
},
"time": { "time": {
"from": "now-6h", "from": "now-6h",
"to": "now" "to": "now"
@@ -621,13 +637,10 @@
"30d" "30d"
] ]
}, },
"templating": {
"list": []
},
"annotations": { "annotations": {
"list": [] "list": []
}, },
"schemaVersion": 12, "schemaVersion": 12,
"version": 6, "version": 7,
"links": [] "links": []
} }

111
src/dashboards/template_linux_server.json
View File

@@ -24,7 +24,7 @@
"CPU user time": "#EAB839" "CPU user time": "#EAB839"
}, },
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 3, "fill": 3,
@@ -109,7 +109,7 @@
"Processor load (1 min average per core)": "#1F78C1" "Processor load (1 min average per core)": "#1F78C1"
}, },
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 1, "fill": 1,
@@ -201,7 +201,7 @@
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 3, "fill": 3,
@@ -300,7 +300,7 @@
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 3, "fill": 3,
@@ -434,56 +434,28 @@
}, },
"templating": { "templating": {
"list": [ "list": [
{
"current": {},
"hide": 0,
"label": "Zabbix Data Source",
"name": "datasource",
"options": [],
"query": "alexanderzobnin-zabbix-datasource",
"refresh": 1,
"regex": "",
"type": "datasource"
},
{ {
"allFormat": "regex values", "allFormat": "regex values",
"current": { "current": {},
"text": "Frontend", "datasource": "$datasource",
"value": "Frontend"
},
"datasource": null,
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Group", "label": "Group",
"multi": false, "multi": false,
"multiFormat": "glob", "multiFormat": "glob",
"name": "group", "name": "group",
"options": [ "options": [],
{
"text": "Backend",
"value": "Backend",
"selected": false
},
{
"text": "Database servers",
"value": "Database servers",
"selected": false
},
{
"text": "Frontend",
"value": "Frontend",
"selected": true
},
{
"text": "Linux servers",
"value": "Linux servers",
"selected": false
},
{
"text": "Network",
"value": "Network",
"selected": false
},
{
"text": "Workstations",
"value": "Workstations",
"selected": false
},
{
"text": "Zabbix servers",
"value": "Zabbix servers",
"selected": false
}
],
"query": "*", "query": "*",
"refresh": 1, "refresh": 1,
"refresh_on_load": false, "refresh_on_load": false,
@@ -492,29 +464,15 @@
}, },
{ {
"allFormat": "glob", "allFormat": "glob",
"current": { "current": {},
"text": "frontend01", "datasource": "$datasource",
"value": "frontend01"
},
"datasource": null,
"hide": 0, "hide": 0,
"includeAll": false, "includeAll": false,
"label": "Host", "label": "Host",
"multi": false, "multi": false,
"multiFormat": "glob", "multiFormat": "glob",
"name": "host", "name": "host",
"options": [ "options": [],
{
"text": "frontend01",
"value": "frontend01",
"selected": true
},
{
"text": "frontend02",
"value": "frontend02",
"selected": false
}
],
"query": "$group.*", "query": "$group.*",
"refresh": 1, "refresh": 1,
"refresh_on_load": false, "refresh_on_load": false,
@@ -523,11 +481,8 @@
}, },
{ {
"allFormat": "regex values", "allFormat": "regex values",
"current": { "current": {},
"text": "All", "datasource": "$datasource",
"value": "$__all"
},
"datasource": null,
"hide": 0, "hide": 0,
"hideLabel": false, "hideLabel": false,
"includeAll": true, "includeAll": true,
@@ -535,23 +490,7 @@
"multi": true, "multi": true,
"multiFormat": "regex values", "multiFormat": "regex values",
"name": "netif", "name": "netif",
"options": [ "options": [],
{
"text": "All",
"value": "$__all",
"selected": true
},
{
"text": "eth0",
"value": "eth0",
"selected": false
},
{
"text": "eth1",
"value": "eth1",
"selected": false
}
],
"query": "*.$host.Network interfaces.*", "query": "*.$host.Network interfaces.*",
"refresh": 1, "refresh": 1,
"refresh_on_load": false, "refresh_on_load": false,
@@ -564,6 +503,6 @@
"list": [] "list": []
}, },
"schemaVersion": 12, "schemaVersion": 12,
"version": 8, "version": 9,
"links": [] "links": []
} }

33
src/dashboards/zabbix_server_dashboard.json
View File

@@ -26,7 +26,7 @@
"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": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"format": "none", "format": "none",
@@ -89,7 +89,7 @@
"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": null, "datasource": "$datasource",
"decimals": 0, "decimals": 0,
"editable": true, "editable": true,
"error": false, "error": false,
@@ -153,7 +153,7 @@
"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": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"format": "none", "format": "none",
@@ -218,7 +218,7 @@
{ {
"aliasColors": {}, "aliasColors": {},
"bars": false, "bars": false,
"datasource": null, "datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fill": 1, "fill": 1,
@@ -327,6 +327,7 @@
"value": "avg" "value": "avg"
} }
], ],
"datasource": "$datasource",
"editable": true, "editable": true,
"error": false, "error": false,
"fontSize": "100%", "fontSize": "100%",
@@ -423,7 +424,7 @@
"functions": [] "functions": []
} }
], ],
"datasource": null, "datasource": "$datasource",
"renderer": "flot", "renderer": "flot",
"yaxes": [ "yaxes": [
{ {
@@ -530,7 +531,7 @@
"functions": [] "functions": []
} }
], ],
"datasource": null, "datasource": "$datasource",
"renderer": "flot", "renderer": "flot",
"yaxes": [ "yaxes": [
{ {
@@ -592,6 +593,21 @@
] ]
} }
], ],
"templating": {
"list": [
{
"current": {},
"hide": 0,
"label": "Zabbix Data Source",
"name": "datasource",
"options": [],
"query": "alexanderzobnin-zabbix-datasource",
"refresh": 1,
"regex": "",
"type": "datasource"
}
]
},
"time": { "time": {
"from": "now-6h", "from": "now-6h",
"to": "now" "to": "now"
@@ -621,13 +637,10 @@
"30d" "30d"
] ]
}, },
"templating": {
"list": []
},
"annotations": { "annotations": {
"list": [] "list": []
}, },
"schemaVersion": 12, "schemaVersion": 12,
"version": 6, "version": 7,
"links": [] "links": []
} }