From a3adaaf25e9c9ae1484e955a76e02df38c5ab5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= Date: Thu, 17 Oct 2024 11:30:11 +0200 Subject: [PATCH 1/2] Migrate example dashboards to more recent version --- devenv/dashboards/template_linux_server.json | 667 ++++--- .../zabbix_datasource_features.json | 281 ++- .../dashboards/template_linux_server.json | 971 ++++++---- .../dashboards/zabbix_server_dashboard.json | 1632 +++++++++++------ .../dashboards/zabbix_system_status.json | 870 +++++---- 5 files changed, 2851 insertions(+), 1570 deletions(-) diff --git a/devenv/dashboards/template_linux_server.json b/devenv/dashboards/template_linux_server.json index 310831819..a964a288c 100644 --- a/devenv/dashboards/template_linux_server.json +++ b/devenv/dashboards/template_linux_server.json @@ -3,7 +3,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -21,12 +24,15 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "iteration": 1651660898062, "links": [], "liveNow": false, "panels": [ { "collapsed": false, + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, "gridPos": { "h": 1, "w": 24, @@ -35,66 +41,158 @@ }, "id": 4, "panels": [], + "targets": [ + { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, + "refId": "A" + } + ], "title": "CPU", "type": "row" }, { - "aliasColors": { - "CPU iowait time": "#B7DBAB", - "CPU system time": "#BF1B00", - "CPU user time": "#EAB839" - }, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, - "editable": true, - "error": false, - "fill": 3, - "fillGradient": 0, - "grid": {}, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 30, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "normal" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "max": 100, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "percent" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "CPU iowait time" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#B7DBAB", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU system time" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#BF1B00", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU user time" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#EAB839", + "mode": "fixed" + } + } + ] + } + ] + }, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 1 }, - "hiddenSeries": false, "id": 1, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, "links": [], - "nullPointMode": "connected", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "8.4.7", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, + "pluginVersion": "10.1.2", "targets": [ { "application": { "filter": "CPU" }, "countTriggers": true, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, + "evaltype": "0", "functions": [], "group": { "filter": "$group" @@ -105,102 +203,153 @@ "item": { "filter": "/CPU/" }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, "minSeverity": 3, "mode": 0, "options": { - "showDisabledItems": false + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false }, - "refId": "A" + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } } ], - "thresholds": [], - "timeRegions": [], "title": "CPU", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "logBase": 1, - "max": 100, - "min": 0, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": { - "Processor load (1 min average per core)": "#1F78C1" - }, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, - "editable": true, - "error": false, - "fill": 1, - "fillGradient": 0, - "grid": {}, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Processor load (1 min average per core)" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#1F78C1", + "mode": "fixed" + } + } + ] + } + ] + }, "gridPos": { "h": 7, "w": 12, "x": 12, "y": 1 }, - "hiddenSeries": false, "id": 2, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, "links": [], - "nullPointMode": "connected", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "8.4.7", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.1.2", "targets": [ { "application": { "filter": "CPU" }, "countTriggers": true, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, + "evaltype": "0", "functions": [], "group": { "filter": "$group" @@ -211,48 +360,50 @@ "item": { "filter": "Processor load (15 min average per core)" }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, "minSeverity": 3, "mode": 0, "options": { - "showDisabledItems": false + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false }, - "refId": "A" + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } } ], - "thresholds": [], - "timeRegions": [], "title": "System load", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "logBase": 1, - "min": 0, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { "collapsed": false, + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, "gridPos": { "h": 1, "w": 24, @@ -261,71 +412,124 @@ }, "id": 5, "panels": [], + "targets": [ + { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, + "refId": "A" + } + ], "title": "Network", "type": "row" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, - "editable": true, - "error": false, - "fill": 3, - "fillGradient": 0, - "grid": {}, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 30, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bps" + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Incoming/" + }, + "properties": [ + { + "id": "custom.transform", + "value": "negative-Y" + } + ] + } + ] + }, "gridPos": { "h": 7, "w": 24, "x": 0, "y": 9 }, - "hiddenSeries": false, "id": 3, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, "links": [], - "maxPerRow": 3, - "nullPointMode": "connected", "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "8.4.7", - "pointradius": 5, - "points": false, - "renderer": "flot", + "pluginVersion": "10.1.2", "repeat": "netif", - "seriesOverrides": [ - { - "alias": "/Incoming/", - "transform": "negative-Y" - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "application": { "filter": "" }, "countTriggers": true, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, + "evaltype": "0", "functions": [], "group": { "filter": "$group" @@ -336,61 +540,58 @@ "item": { "filter": "/$netif/" }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, "minSeverity": 3, "mode": 0, "options": { - "showDisabledItems": false + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false }, - "refId": "A" + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } } ], - "thresholds": [], - "timeRegions": [], "title": "Network traffic on $netif", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bps", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" } ], + "refresh": "", "revision": 1, - "schemaVersion": 35, + "schemaVersion": 38, "style": "dark", - "tags": [ - "zabbix", - "example" - ], + "tags": ["zabbix", "example"], "templating": { "list": [ { "allFormat": "regex values", "current": { "selected": true, - "text": "Backend", - "value": "Backend" + "text": "Frontend", + "value": "Frontend" }, "datasource": { "type": "alexanderzobnin-zabbix-datasource", @@ -424,9 +625,9 @@ { "allFormat": "glob", "current": { - "selected": true, - "text": "backend01", - "value": "backend01" + "selected": false, + "text": "frontend01", + "value": "frontend01" }, "datasource": { "type": "alexanderzobnin-zabbix-datasource", @@ -460,9 +661,9 @@ { "allFormat": "regex values", "current": { - "selected": false, - "text": "All", - "value": "$__all" + "selected": true, + "text": ["All"], + "value": ["$__all"] }, "datasource": { "type": "alexanderzobnin-zabbix-datasource", @@ -502,28 +703,8 @@ }, "timepicker": { "now": true, - "refresh_intervals": [ - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "3h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] + "refresh_intervals": ["30s", "1m", "5m", "15m", "30m", "1h", "3h", "2h", "1d"], + "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"] }, "timezone": "browser", "title": "Template Linux Server", diff --git a/devenv/dashboards/zabbix_datasource_features.json b/devenv/dashboards/zabbix_datasource_features.json index 2d227340a..3b243d7d0 100644 --- a/devenv/dashboards/zabbix_datasource_features.json +++ b/devenv/dashboards/zabbix_datasource_features.json @@ -3,7 +3,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -21,7 +24,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 3, "links": [], "liveNow": false, "panels": [ @@ -30,6 +32,10 @@ "ackField": true, "ageField": false, "customLastChangeFormat": false, + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, "descriptionAtNewLine": false, "descriptionField": true, "fontSize": "100%", @@ -51,7 +57,82 @@ "layout": "table", "markAckEvents": false, "okEventColor": "rgb(56, 189, 113)", + "options": { + "ackEventColor": "rgb(56, 219, 156)", + "ackField": true, + "ageField": false, + "allowDangerousHTML": false, + "customLastChangeFormat": false, + "descriptionAtNewLine": false, + "descriptionField": true, + "fontSize": "100%", + "highlightBackground": false, + "highlightNewEvents": false, + "highlightNewerThan": "1h", + "hostField": true, + "hostGroups": false, + "hostProxy": false, + "hostTechNameField": false, + "lastChangeFormat": "", + "layout": "table", + "markAckEvents": false, + "okEventColor": "rgb(56, 189, 113)", + "opdataField": false, + "pageSize": 10, + "problemTimeline": true, + "resizedColumns": [], + "severityField": true, + "showTags": true, + "sortProblems": "lastchange", + "statusField": true, + "statusIcon": false, + "triggerSeverity": [ + { + "$$hashKey": "object:127", + "color": "rgb(108, 108, 108)", + "priority": 0, + "severity": "Not classified", + "show": true + }, + { + "$$hashKey": "object:128", + "color": "rgb(120, 158, 183)", + "priority": 1, + "severity": "Information", + "show": true + }, + { + "$$hashKey": "object:129", + "color": "rgb(175, 180, 36)", + "priority": 2, + "severity": "Warning", + "show": true + }, + { + "$$hashKey": "object:130", + "color": "rgb(255, 137, 30)", + "priority": 3, + "severity": "Average", + "show": true + }, + { + "$$hashKey": "object:131", + "color": "rgb(255, 101, 72)", + "priority": 4, + "severity": "High", + "show": true + }, + { + "$$hashKey": "object:132", + "color": "rgb(215, 0, 0)", + "priority": 5, + "severity": "Disaster", + "show": true + } + ] + }, "pageSize": 10, + "pluginVersion": "10.1.2", "problemTimeline": true, "resizedColumns": [], "schemaVersion": 8, @@ -65,10 +146,12 @@ "application": { "filter": "" }, + "countTriggersBy": "", "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, + "evaltype": "0", "functions": [], "group": { "filter": "" @@ -82,16 +165,22 @@ "itemTag": { "filter": "" }, + "macro": { + "filter": "" + }, "options": { "acknowledged": 2, + "count": true, "disableDataAlignment": false, "hostProxy": false, "hostsInMaintenance": false, "limit": 1001, - "minSeverity": 0, + "minSeverity": 3, "showDisabledItems": false, "skipEmptyValues": false, "sortProblems": "default", + "useTimeRange": false, + "useTrends": "default", "useZabbixValueMapping": false }, "proxy": { @@ -100,6 +189,7 @@ "queryType": "5", "refId": "A", "resultFormat": "time_series", + "schema": 12, "showProblems": "problems", "table": { "skipEmptyValues": false @@ -107,13 +197,12 @@ "tags": { "filter": "" }, + "textFilter": "", "trigger": { "filter": "" }, "triggers": { - "acknowledged": 2, - "count": true, - "minSeverity": 3 + "acknowledged": 2 } } ], @@ -165,6 +254,10 @@ "type": "alexanderzobnin-zabbix-triggers-panel" }, { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, "fieldConfig": { "defaults": { "color": { @@ -200,24 +293,24 @@ "justifyMode": "auto", "orientation": "auto", "reduceOptions": { - "calcs": [ - "lastNotNull" - ], + "calcs": ["lastNotNull"], "fields": "/^Host$/", "values": false }, "textMode": "value" }, - "pluginVersion": "8.4.7", + "pluginVersion": "10.1.2", "targets": [ { "application": { "filter": "" }, + "countTriggersBy": "", "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, + "evaltype": "0", "functions": [], "group": { "filter": "Linux servers" @@ -231,10 +324,16 @@ "itemTag": { "filter": "" }, + "macro": { + "filter": "" + }, "options": { + "count": true, "disableDataAlignment": false, + "minSeverity": 3, "showDisabledItems": false, "skipEmptyValues": false, + "useTrends": "default", "useZabbixValueMapping": false }, "proxy": { @@ -243,19 +342,19 @@ "queryType": "2", "refId": "A", "resultFormat": "table", + "schema": 12, "table": { "skipEmptyValues": false }, "tags": { "filter": "" }, + "textFilter": "", "trigger": { "filter": "" }, "triggers": { - "acknowledged": 2, - "count": true, - "minSeverity": 3 + "acknowledged": 2 } } ], @@ -263,6 +362,10 @@ "type": "stat" }, { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, "fieldConfig": { "defaults": { "color": { @@ -298,24 +401,24 @@ "justifyMode": "auto", "orientation": "auto", "reduceOptions": { - "calcs": [ - "lastNotNull" - ], + "calcs": ["lastNotNull"], "fields": "", "values": false }, "textMode": "auto" }, - "pluginVersion": "8.4.7", + "pluginVersion": "10.1.2", "targets": [ { "application": { "filter": "" }, + "countTriggersBy": "", "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, + "evaltype": "0", "functions": [], "group": { "filter": "Zabbix servers" @@ -329,10 +432,16 @@ "itemTag": { "filter": "component: cpu" }, + "macro": { + "filter": "" + }, "options": { + "count": true, "disableDataAlignment": false, + "minSeverity": 3, "showDisabledItems": false, "skipEmptyValues": false, + "useTrends": "default", "useZabbixValueMapping": false }, "proxy": { @@ -341,19 +450,19 @@ "queryType": "0", "refId": "A", "resultFormat": "time_series", + "schema": 12, "table": { "skipEmptyValues": false }, "tags": { "filter": "" }, + "textFilter": "", "trigger": { "filter": "" }, "triggers": { - "acknowledged": 2, - "count": true, - "minSeverity": 3 + "acknowledged": 2 } } ], @@ -361,12 +470,18 @@ "type": "stat" }, { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -378,6 +493,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -422,7 +538,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "single", @@ -434,10 +551,12 @@ "application": { "filter": "" }, + "countTriggersBy": "", "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, + "evaltype": "0", "functions": [], "group": { "filter": "Linux servers" @@ -451,10 +570,16 @@ "itemTag": { "filter": "" }, + "macro": { + "filter": "" + }, "options": { + "count": true, "disableDataAlignment": false, + "minSeverity": 3, "showDisabledItems": false, "skipEmptyValues": false, + "useTrends": "default", "useZabbixValueMapping": false }, "proxy": { @@ -463,19 +588,19 @@ "queryType": "0", "refId": "A", "resultFormat": "time_series", + "schema": 12, "table": { "skipEmptyValues": false }, "tags": { "filter": "" }, + "textFilter": "", "trigger": { "filter": "" }, "triggers": { - "acknowledged": 2, - "count": true, - "minSeverity": 3 + "acknowledged": 2 } } ], @@ -483,12 +608,18 @@ "type": "timeseries" }, { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -500,6 +631,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -579,7 +711,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "single", @@ -630,28 +763,25 @@ "filter": "" }, "triggers": { - "acknowledged": 2, - "count": true, - "minSeverity": 3 + "acknowledged": 2 } }, { "application": { "filter": "" }, + "countTriggersBy": "", "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, + "evaltype": "0", "functions": [ { "$$hashKey": "object:577", "def": { "category": "Aggregate", - "defaultParams": [ - "1m", - "avg" - ], + "defaultParams": ["1m", "avg"], "name": "aggregateBy", "params": [ { @@ -660,24 +790,12 @@ }, { "name": "function", - "options": [ - "avg", - "min", - "max", - "sum", - "count", - "median", - "first", - "last" - ], + "options": ["avg", "min", "max", "sum", "count", "median", "first", "last"], "type": "string" } ] }, - "params": [ - "5m", - "median" - ], + "params": ["5m", "median"], "text": "aggregateBy(5m, median)" }, { @@ -693,9 +811,7 @@ } ] }, - "params": [ - "median" - ], + "params": ["median"], "text": "setAlias(median)" } ], @@ -712,10 +828,16 @@ "itemTag": { "filter": "" }, + "macro": { + "filter": "" + }, "options": { + "count": true, "disableDataAlignment": false, + "minSeverity": 3, "showDisabledItems": false, "skipEmptyValues": false, + "useTrends": "default", "useZabbixValueMapping": false }, "proxy": { @@ -724,19 +846,19 @@ "queryType": "0", "refId": "B", "resultFormat": "time_series", + "schema": 12, "table": { "skipEmptyValues": false }, "tags": { "filter": "" }, + "textFilter": "", "trigger": { "filter": "" }, "triggers": { - "acknowledged": 2, - "count": true, - "minSeverity": 3 + "acknowledged": 2 } } ], @@ -744,6 +866,10 @@ "type": "timeseries" }, { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, "fieldConfig": { "defaults": { "color": { @@ -751,6 +877,8 @@ "seriesBy": "last" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -763,6 +891,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -807,7 +936,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "single", @@ -819,10 +949,12 @@ "application": { "filter": "" }, + "countTriggersBy": "", "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, + "evaltype": "0", "functions": [], "group": { "filter": "Zabbix servers" @@ -836,10 +968,16 @@ "itemTag": { "filter": "component: cpu" }, + "macro": { + "filter": "" + }, "options": { + "count": true, "disableDataAlignment": false, + "minSeverity": 3, "showDisabledItems": false, "skipEmptyValues": false, + "useTrends": "default", "useZabbixValueMapping": false }, "proxy": { @@ -848,19 +986,19 @@ "queryType": "0", "refId": "A", "resultFormat": "time_series", + "schema": 12, "table": { "skipEmptyValues": false }, "tags": { "filter": "" }, + "textFilter": "", "trigger": { "filter": "" }, "triggers": { - "acknowledged": 2, - "count": true, - "minSeverity": 3 + "acknowledged": 2 } } ], @@ -868,6 +1006,10 @@ "type": "timeseries" }, { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "PCAF1C06DCF802728" + }, "fieldConfig": { "defaults": { "color": { @@ -875,6 +1017,8 @@ "seriesBy": "last" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "axisSoftMin": 0, @@ -887,6 +1031,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 1, "pointSize": 5, @@ -947,8 +1092,9 @@ "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { "mode": "single", @@ -960,10 +1106,12 @@ "application": { "filter": "" }, + "countTriggersBy": "", "datasource": { "type": "alexanderzobnin-zabbix-datasource", "uid": "PCAF1C06DCF802728" }, + "evaltype": "0", "functions": [], "group": { "filter": "Linux servers" @@ -977,10 +1125,16 @@ "itemTag": { "filter": "" }, + "macro": { + "filter": "" + }, "options": { + "count": true, "disableDataAlignment": false, + "minSeverity": 3, "showDisabledItems": false, "skipEmptyValues": false, + "useTrends": "default", "useZabbixValueMapping": false }, "proxy": { @@ -989,19 +1143,19 @@ "queryType": "0", "refId": "A", "resultFormat": "time_series", + "schema": 12, "table": { "skipEmptyValues": false }, "tags": { "filter": "" }, + "textFilter": "", "trigger": { "filter": "" }, "triggers": { - "acknowledged": 2, - "count": true, - "minSeverity": 3 + "acknowledged": 2 } } ], @@ -1009,7 +1163,8 @@ "type": "timeseries" } ], - "schemaVersion": 35, + "refresh": "", + "schemaVersion": 38, "style": "dark", "tags": [], "templating": { @@ -1023,6 +1178,6 @@ "timezone": "", "title": "Zabbix data source features", "uid": "u9mWZdlnk", - "version": 6, + "version": 1, "weekStart": "" } diff --git a/src/datasource/dashboards/template_linux_server.json b/src/datasource/dashboards/template_linux_server.json index 453f84392..c7351b795 100644 --- a/src/datasource/dashboards/template_linux_server.json +++ b/src/datasource/dashboards/template_linux_server.json @@ -1,416 +1,655 @@ { "__inputs": [ { - "name": "DS_NAME", + "name": "DS_ZABBIX", + "label": "Zabbix", + "description": "", "type": "datasource", - "pluginId": "alexanderzobnin-zabbix-datasource" + "pluginId": "alexanderzobnin-zabbix-datasource", + "pluginName": "Zabbix" + } + ], + "__elements": {}, + "__requires": [ + { + "type": "datasource", + "id": "alexanderzobnin-zabbix-datasource", + "name": "Zabbix", + "version": "4.5.5" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" } ], - "title": "Zabbix Template Linux Server", - "revision": 1, "annotations": { - "list": [] + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] }, "editable": true, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, - "hideControls": false, "id": null, "links": [], - "rows": [ + "panels": [ { - "collapse": false, - "height": "250px", - "panels": [ - { - "aliasColors": { - "CPU iowait time": "#B7DBAB", - "CPU system time": "#BF1B00", - "CPU user time": "#EAB839" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_NAME}", - "editable": true, - "error": false, - "fill": 3, - "grid": {}, - "id": 1, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "span": 6, - "stack": true, - "steppedLine": false, - "targets": [ - { - "application": { - "filter": "CPU" - }, - "countTriggers": true, - "functions": [], - "group": { - "filter": "$group" - }, - "host": { - "filter": "$host" - }, - "item": { - "filter": "/CPU/" - }, - "minSeverity": 3, - "mode": 0, - "options": { - "showDisabledItems": false - }, - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "CPU", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "logBase": 1, - "max": 100, - "min": 0, - "show": true + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 4, + "panels": [], + "title": "CPU", + "type": "row" + }, + { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 30, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "normal" + }, + "thresholdsStyle": { + "mode": "off" } - ] - }, - { - "aliasColors": { - "Processor load (1 min average per core)": "#1F78C1" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_NAME}", - "editable": true, - "error": false, - "fill": 1, - "grid": {}, - "id": 2, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "application": { - "filter": "CPU" - }, - "countTriggers": true, - "functions": [], - "group": { - "filter": "$group" - }, - "host": { - "filter": "$host" - }, - "item": { - "filter": "Processor load (15 min average per core)" - }, - "minSeverity": 3, - "mode": 0, - "options": { - "showDisabledItems": false + }, + "mappings": [], + "max": 100, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null }, - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "System load", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "logBase": 1, - "max": null, - "min": 0, - "show": true + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "percent" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "CPU iowait time" }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#B7DBAB", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU system time" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#BF1B00", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU user time" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#EAB839", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 1 + }, + "id": 1, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.4.0-pre", + "targets": [ + { + "application": { + "filter": "CPU" + }, + "countTriggers": true, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "$group" + }, + "host": { + "filter": "$host" + }, + "item": { + "filter": "/CPU/" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "minSeverity": 3, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } } ], - "repeat": null, - "repeatIteration": null, - "repeatRowId": null, - "showTitle": true, "title": "CPU", - "titleSize": "h6" + "type": "timeseries" }, { - "collapse": false, - "height": "250px", - "panels": [ - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_NAME}", - "editable": true, - "error": false, - "fill": 3, - "grid": {}, - "id": 3, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "minSpan": 4, - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": "netif", - "seriesOverrides": [ - { - "alias": "/Incoming/", - "transform": "negative-Y" + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" } - ], - "spaceLength": 10, - "span": 12, - "stack": false, - "steppedLine": false, - "targets": [ - { - "application": { - "filter": "" - }, - "countTriggers": true, - "functions": [], - "group": { - "filter": "$group" - }, - "host": { - "filter": "$host" - }, - "item": { - "filter": "/$netif/" - }, - "minSeverity": 3, - "mode": 0, - "options": { - "showDisabledItems": false + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null }, - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Network traffic on $netif", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bps", - "logBase": 1, - "max": null, - "min": null, - "show": true + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Processor load (1 min average per core)" }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#1F78C1", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 1 + }, + "id": 2, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.4.0-pre", + "targets": [ + { + "application": { + "filter": "CPU" + }, + "countTriggers": true, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "$group" + }, + "host": { + "filter": "$host" + }, + "item": { + "filter": "Processor load (15 min average per core)" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "minSeverity": 3, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } } ], - "repeat": null, - "repeatIteration": null, - "repeatRowId": null, - "showTitle": true, + "title": "System load", + "type": "timeseries" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 8 + }, + "id": 5, + "panels": [], "title": "Network", - "titleSize": "h6" + "type": "row" + }, + { + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 30, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bps" + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Incoming/" + }, + "properties": [ + { + "id": "custom.transform", + "value": "negative-Y" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/Incoming/" + }, + "properties": [ + { + "id": "custom.transform", + "value": "negative-Y" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/Incoming/" + }, + "properties": [ + { + "id": "custom.transform", + "value": "negative-Y" + } + ] + } + ] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 9 + }, + "id": 3, + "maxPerRow": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.4.0-pre", + "repeat": "netif", + "repeatDirection": "v", + "targets": [ + { + "application": { + "filter": "" + }, + "countTriggers": true, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "$group" + }, + "host": { + "filter": "$host" + }, + "item": { + "filter": "/$netif/" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "minSeverity": 3, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } + } + ], + "title": "Network traffic on $netif", + "type": "timeseries" } ], - "schemaVersion": 14, - "style": "dark", - "tags": [ - "zabbix", - "example" - ], + "schemaVersion": 40, + "tags": [], "templating": { "list": [ { - "allFormat": "regex values", - "allValue": null, "current": {}, - "datasource": "${DS_NAME}", - "hide": 0, + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, "includeAll": false, "label": "Group", - "multi": false, - "multiFormat": "glob", "name": "group", "options": [], "query": "*", "refresh": 1, - "refresh_on_load": false, "regex": "", - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" }, { - "allFormat": "glob", - "allValue": null, "current": {}, - "datasource": "${DS_NAME}", - "hide": 0, + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, "includeAll": false, "label": "Host", - "multi": false, - "multiFormat": "glob", "name": "host", "options": [], "query": "$group.*", "refresh": 1, - "refresh_on_load": false, "regex": "", - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" }, { - "allFormat": "regex values", - "allValue": null, "current": {}, - "datasource": "${DS_NAME}", - "hide": 0, - "hideLabel": false, + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, "includeAll": true, "label": "Network interface", "multi": true, - "multiFormat": "regex values", "name": "netif", "options": [], "query": "*.$host.Network interfaces.*", "refresh": 1, - "refresh_on_load": false, "regex": "/(?:Incoming|Outgoing) network traffic on (.*)/", - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" } ] }, @@ -419,29 +658,11 @@ "to": "now" }, "timepicker": { - "now": true, - "refresh_intervals": [ - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "3h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] + "refresh_intervals": ["30s", "1m", "5m", "15m", "30m", "1h", "3h", "2h", "1d"] }, - "timezone": "browser" + "timezone": "browser", + "title": "Zabbix Template Linux Server", + "uid": "be0yks0sqf7y8e", + "version": 1, + "weekStart": "" } diff --git a/src/datasource/dashboards/zabbix_server_dashboard.json b/src/datasource/dashboards/zabbix_server_dashboard.json index 9f92024e6..9b4815fd8 100644 --- a/src/datasource/dashboards/zabbix_server_dashboard.json +++ b/src/datasource/dashboards/zabbix_server_dashboard.json @@ -1,603 +1,1106 @@ { - "id": null, - "title": "Zabbix Server Dashboard", - "originalTitle": "Zabbix Server Dashboard", - "tags": [ - "zabbix", - "example" + "__inputs": [ + { + "name": "DS_ZABBIX", + "label": "Zabbix", + "description": "", + "type": "datasource", + "pluginId": "alexanderzobnin-zabbix-datasource", + "pluginName": "Zabbix" + } ], - "style": "dark", - "timezone": "browser", + "__elements": {}, + "__requires": [ + { + "type": "datasource", + "id": "alexanderzobnin-zabbix-datasource", + "name": "Zabbix", + "version": "4.5.5" + }, + { + "type": "panel", + "id": "stat", + "name": "Stat", + "version": "" + }, + { + "type": "panel", + "id": "table", + "name": "Table", + "version": "" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" + } + ], + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, "editable": true, - "hideControls": false, - "sharedCrosshair": false, - "rows": [ + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "id": null, + "links": [], + "panels": [ { - "collapse": false, - "editable": true, - "height": "100px", - "panels": [ - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "$datasource", - "editable": true, - "error": false, - "format": "none", - "id": 3, - "interval": null, - "isNew": true, - "links": [], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "span": 4, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "targets": [ + "datasource": { + "uid": "$datasource" + }, + "fieldConfig": { + "defaults": { + "mappings": [ { - "application": { - "filter": "General" - }, - "functions": [], - "group": { - "filter": "Zabbix servers" + "options": { + "match": "null", + "result": { + "text": "N/A" + } }, - "host": { - "filter": "Zabbix server" - }, - "item": { - "filter": "Host name" - }, - "mode": 2, - "refId": "A" - } - ], - "thresholds": "", - "title": "Host name", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" + "type": "special" } ], - "valueName": "avg" + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 8, + "x": 0, + "y": 0 + }, + "id": 3, + "maxDataPoints": 100, + "options": { + "colorMode": "none", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": ["mean"], + "fields": "", + "values": false }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.4.0-pre", + "targets": [ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "$datasource", + "application": { + "filter": "" + }, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "Zabbix servers" + }, + "host": { + "filter": "Zabbix server" + }, + "itServiceFilter": "Backend service", + "item": { + "filter": "System name" + }, + "itemTag": { + "filter": "component: system" + }, + "macro": { + "filter": "" + }, + "mode": 2, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "2", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "slaFilter": "Backend SLA 2", + "slaInterval": "none", + "slaProperty": "sla", + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } + } + ], + "title": "Host name", + "type": "stat" + }, + { + "datasource": { + "uid": "$datasource" + }, + "fieldConfig": { + "defaults": { "decimals": 0, - "editable": true, - "error": false, - "format": "s", - "id": 4, - "interval": null, - "isNew": true, - "links": [], - "maxDataPoints": "", - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "span": 4, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "targets": [ + "mappings": [ { - "application": { - "filter": "General" + "options": { + "match": "null", + "result": { + "text": "N/A" + } }, - "functions": [], - "group": { - "filter": "Zabbix servers" - }, - "host": { - "filter": "Zabbix server" - }, - "item": { - "filter": "System uptime" - }, - "mode": 0, - "refId": "A" - } - ], - "thresholds": "", - "title": "Uptime", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" + "type": "special" } ], - "valueName": "current" + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "s" }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 8, + "x": 8, + "y": 0 + }, + "id": 4, + "maxDataPoints": "", + "options": { + "colorMode": "none", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.4.0-pre", + "targets": [ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "$datasource", - "editable": true, - "error": false, - "format": "none", - "id": 5, - "interval": null, - "isNew": true, - "links": [], - "maxDataPoints": "", - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "span": 4, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "targets": [ + "application": { + "filter": "General" + }, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "Zabbix servers" + }, + "host": { + "filter": "Zabbix server" + }, + "item": { + "filter": "System uptime" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } + } + ], + "title": "Uptime", + "type": "stat" + }, + { + "datasource": { + "uid": "$datasource" + }, + "fieldConfig": { + "defaults": { + "mappings": [ { - "application": { - "filter": "Zabbix server" - }, - "functions": [], - "group": { - "filter": "Zabbix servers" - }, - "host": { - "filter": "Zabbix server" - }, - "item": { - "filter": "/Required performance of Zabbix server/" + "options": { + "match": "null", + "result": { + "text": "N/A" + } }, - "mode": 0, - "refId": "A" + "type": "special" } ], - "thresholds": "", - "title": "Required performance, NVPS", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 8, + "x": 16, + "y": 0 + }, + "id": 5, + "maxDataPoints": "", + "options": { + "colorMode": "none", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.4.0-pre", + "targets": [ + { + "application": { + "filter": "Zabbix server" + }, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "Zabbix servers" + }, + "host": { + "filter": "Zabbix server" + }, + "item": { + "filter": "Zabbix server: Number of processed values per second" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } } ], - "title": "General" + "title": "Required performance, NVPS", + "type": "stat" }, { - "collapse": false, - "editable": true, - "height": "300px", - "panels": [ - { - "aliasColors": {}, - "bars": false, - "datasource": "$datasource", - "editable": true, - "error": false, - "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 1, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/user/", - "color": "#1F78C1" + "datasource": { + "uid": "$datasource" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false }, - { - "alias": "/system/", - "color": "#BF1B00" + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" }, - { - "alias": "/iowait/", - "color": "#E5AC0E" + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "normal" + }, + "thresholdsStyle": { + "mode": "off" } - ], - "span": 7, - "stack": true, - "steppedLine": false, - "targets": [ - { - "application": { - "filter": "CPU" - }, - "functions": [], - "group": { - "filter": "Zabbix servers" - }, - "host": { - "filter": "Zabbix server" - }, - "item": { - "filter": "/CPU (?!idle)/" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null }, - "mode": 0, - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "CPU", - "tooltip": { - "msResolution": false, - "shared": true, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "show": true - }, - "yaxes": [ - { - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "percent" + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/user/" }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#1F78C1", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/system/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#BF1B00", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/iowait/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#E5AC0E", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 14, + "x": 0, + "y": 3 + }, + "id": 1, + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "right", + "showLegend": true }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.4.0-pre", + "targets": [ { - "columns": [ - { - "text": "Current", - "value": "current" - }, - { - "text": "Avg", - "value": "avg" - } - ], - "datasource": "$datasource", - "editable": true, - "error": false, - "fontSize": "100%", - "id": 2, - "isNew": true, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": 2, - "desc": true - }, - "span": 5, - "styles": [ - { - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "Time", - "type": "date" + "application": { + "filter": "CPU" + }, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "Zabbix servers" + }, + "host": { + "filter": "Zabbix server" + }, + "item": { + "filter": "CPU idle time" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } + } + ], + "title": "CPU", + "type": "timeseries" + }, + { + "datasource": { + "uid": "$datasource" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "color-background" }, - { - "colorMode": "cell", - "colors": [ - "rgb(41, 170, 106)", - "rgba(239, 148, 21, 0.89)", - "rgba(239, 10, 10, 0.9)" - ], - "decimals": 1, - "pattern": "/.*/", - "thresholds": [ - "50", - "80" - ], - "type": "number", - "unit": "percent" - } - ], - "targets": [ - { - "application": { - "filter": "Zabbix server" - }, - "functions": [], - "group": { - "filter": "Zabbix servers" + "inspect": false + }, + "decimals": 1, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgb(41, 170, 106)", + "value": null }, - "host": { - "filter": "Zabbix server" + { + "color": "rgba(239, 148, 21, 0.89)", + "value": 50 }, - "item": { - "filter": "/Zabbix busy/" + { + "color": "rgba(239, 10, 10, 0.9)", + "value": 80 + } + ] + }, + "unit": "percent" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Time" + }, + "properties": [ + { + "id": "unit", + "value": "time: YYYY-MM-DD HH:mm:ss" }, - "mode": 0, - "refId": "A" - } - ], - "title": "Zabbix processes", - "transform": "timeseries_aggregations", - "type": "table" + { + "id": "custom.align" + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 10, + "x": 14, + "y": 3 + }, + "id": 2, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": ["sum"], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "11.4.0-pre", + "targets": [ + { + "application": { + "filter": "Zabbix server" + }, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "Zabbix servers" + }, + "host": { + "filter": "Zabbix server" + }, + "item": { + "filter": "/.* process/" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } } ], - "title": "Row" + "title": "Zabbix processes", + "type": "table" }, { - "title": "New row", - "height": "380", - "editable": true, - "collapse": false, - "panels": [ - { - "title": "Zabbix busy processes", - "error": false, - "span": 7.069277691711851, - "editable": true, - "type": "graph", - "isNew": true, - "id": 6, - "targets": [ - { - "refId": "A", - "mode": 0, - "group": { - "filter": "Zabbix servers" - }, - "host": { - "filter": "Zabbix server" - }, - "application": { - "filter": "Zabbix server" - }, - "item": { - "filter": "/Zabbix busy/" - }, - "functions": [] - } - ], - "datasource": "$datasource", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "percent" + "datasource": { + "uid": "$datasource" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short" + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" } - ], - "xaxis": { - "show": true - }, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "lines": true, - "fill": 0, - "linewidth": 2, - "points": false, - "pointradius": 5, - "bars": false, - "stack": false, - "percentage": false, - "legend": { - "show": true, - "values": false, - "min": false, - "max": false, - "current": false, - "total": false, - "avg": false, - "hideEmpty": true, - "hideZero": true, - "alignAsTable": true, - "rightSide": true - }, - "nullPointMode": "connected", - "steppedLine": false, - "tooltip": { - "value_type": "cumulative", - "shared": true, - "msResolution": false - }, - "timeFrom": null, - "timeShift": null, - "aliasColors": {}, - "seriesOverrides": [], - "links": [] + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "percent" + }, + "overrides": [ + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsZero", + "value": 0 + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + }, + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsNull", + "value": 0 + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + } + ] + }, + "gridPos": { + "h": 10, + "w": 14, + "x": 0, + "y": 11 + }, + "id": 6, + "options": { + "legend": { + "calcs": [], + "displayMode": "table", + "placement": "right", + "showLegend": true }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.4.0-pre", + "targets": [ { - "title": "Zabbix Queue", - "error": false, - "span": 4.930722308288148, - "editable": true, - "type": "graph", - "isNew": true, - "id": 7, - "targets": [ - { - "refId": "A", - "mode": 0, - "group": { - "filter": "Zabbix servers" - }, - "host": { - "filter": "Zabbix server" - }, - "application": { - "filter": "Zabbix server" - }, - "item": { - "filter": "Zabbix queue" - }, - "functions": [] + "application": { + "filter": "Zabbix server" + }, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "Zabbix servers" + }, + "host": { + "filter": "Zabbix server" + }, + "item": { + "filter": "Zabbix server: Utilization of task manager internal processes, in %" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } + } + ], + "title": "Zabbix busy processes", + "type": "timeseries" + }, + { + "datasource": { + "uid": "$datasource" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false }, - { - "refId": "B", - "mode": 0, - "group": { - "filter": "Zabbix servers" - }, - "host": { - "filter": "Zabbix server" - }, - "application": { - "filter": "Zabbix server" - }, - "item": { - "filter": "/Values processed/" - }, - "functions": [] - } - ], - "datasource": "$datasource", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short" + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short" + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" } - ], - "xaxis": { - "show": true - }, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "lines": true, - "fill": 0, - "linewidth": 2, - "points": false, - "pointradius": 5, - "bars": false, - "stack": false, - "percentage": false, - "legend": { - "show": true, - "values": false, - "min": false, - "max": false, - "current": false, - "total": false, - "avg": false - }, - "nullPointMode": "connected", - "steppedLine": false, - "tooltip": { - "value_type": "cumulative", - "shared": true, - "msResolution": false - }, - "timeFrom": null, - "timeShift": null, - "aliasColors": {}, - "seriesOverrides": [], - "links": [] + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 10, + "w": 8, + "x": 14, + "y": 11 + }, + "id": 7, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.4.0-pre", + "targets": [ + { + "application": { + "filter": "Zabbix server" + }, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "Zabbix servers" + }, + "host": { + "filter": "Zabbix server" + }, + "item": { + "filter": "Zabbix server: Queue" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "A", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } + }, + { + "application": { + "filter": "Zabbix server" + }, + "countTriggersBy": "", + "datasource": { + "uid": "$datasource" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "Zabbix servers" + }, + "host": { + "filter": "Zabbix server" + }, + "item": { + "filter": "Number of running processes" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "mode": 0, + "options": { + "count": false, + "disableDataAlignment": false, + "showDisabledItems": false, + "skipEmptyValues": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "0", + "refId": "B", + "resultFormat": "time_series", + "schema": 12, + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "textFilter": "", + "trigger": { + "filter": "" + } } - ] + ], + "title": "Zabbix Queue", + "type": "timeseries" } ], + "schemaVersion": 40, + "tags": [], "templating": { "list": [ { "current": {}, - "hide": 0, "label": "Zabbix Data Source", "name": "datasource", "options": [], @@ -612,35 +1115,10 @@ "from": "now-6h", "to": "now" }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "annotations": { - "list": [] - }, - "schemaVersion": 12, - "version": 7, - "links": [] + "timepicker": {}, + "timezone": "browser", + "title": "Zabbix Server Dashboard", + "uid": "fe0ylyg4cdd6oc", + "version": 2, + "weekStart": "" } diff --git a/src/datasource/dashboards/zabbix_system_status.json b/src/datasource/dashboards/zabbix_system_status.json index 1fa7c0387..266969dca 100644 --- a/src/datasource/dashboards/zabbix_system_status.json +++ b/src/datasource/dashboards/zabbix_system_status.json @@ -1,339 +1,605 @@ { "__inputs": [ { - "name": "DS_NAME", + "name": "DS_ZABBIX", + "label": "Zabbix", + "description": "", "type": "datasource", - "pluginId": "alexanderzobnin-zabbix-datasource" + "pluginId": "alexanderzobnin-zabbix-datasource", + "pluginName": "Zabbix" + } + ], + "__elements": {}, + "__requires": [ + { + "type": "datasource", + "id": "alexanderzobnin-zabbix-datasource", + "name": "Zabbix", + "version": "4.5.5" + }, + { + "type": "panel", + "id": "stat", + "name": "Stat", + "version": "" + }, + { + "type": "panel", + "id": "table", + "name": "Table", + "version": "" } ], - "title": "Zabbix System Status", - "revision": "1.0", "annotations": { - "list": [] + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] }, "editable": true, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, - "hideControls": false, "id": null, "links": [], - "rows": [ + "panels": [ { - "collapse": false, - "height": 250, - "panels": [ - { - "columns": [], - "datasource": "${DS_NAME}", - "fontSize": "100%", - "id": 9, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": 0, - "desc": true - }, - "span": 12, - "styles": [ - { - "alias": "Time", - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "Time", - "type": "date" + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" }, - { - "alias": "", - "colorMode": "cell", - "colors": [ - "rgba(45, 172, 121, 0.97)", - "rgba(45, 172, 121, 0.97)", - "#58140c" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "pattern": "Disaster", - "thresholds": [ - "0", - "1" - ], - "type": "number", - "unit": "none" + "inspect": false + }, + "decimals": 0, + "displayName": "", + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Time" }, - { - "alias": "", - "colorMode": "cell", - "colors": [ - "#99440a", - "rgba(45, 172, 121, 0.97)", - "#99440a" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "pattern": "High", - "thresholds": [ - "0", - "1" - ], - "type": "number", - "unit": "short" + "properties": [ + { + "id": "displayName", + "value": "Time" + }, + { + "id": "unit", + "value": "time: YYYY-MM-DD HH:mm:ss" + }, + { + "id": "custom.align" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Disaster" }, - { - "alias": "", - "colorMode": "cell", - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(45, 172, 121, 0.97)", - "#c15c17" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "pattern": "Average", - "thresholds": [ - "0", - "1" - ], - "type": "number", - "unit": "short" + "properties": [ + { + "id": "unit", + "value": "none" + }, + { + "id": "custom.cellOptions", + "value": { + "type": "color-background" + } + }, + { + "id": "custom.align" + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(45, 172, 121, 0.97)", + "value": null + }, + { + "color": "rgba(45, 172, 121, 0.97)", + "value": 0 + }, + { + "color": "#58140c", + "value": 1 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "High" }, - { - "alias": "", - "colorMode": "cell", - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(45, 172, 121, 0.97)", - "#cca300" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "pattern": "Warning", - "thresholds": [ - "0", - "1" - ], - "type": "number", - "unit": "short" + "properties": [ + { + "id": "unit", + "value": "short" + }, + { + "id": "custom.cellOptions", + "value": { + "type": "color-background" + } + }, + { + "id": "custom.align" + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "#99440a", + "value": null + }, + { + "color": "rgba(45, 172, 121, 0.97)", + "value": 0 + }, + { + "color": "#99440a", + "value": 1 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Average" }, - { - "alias": "", - "colorMode": "cell", - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(45, 172, 121, 0.97)", - "#64b0c8" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "pattern": "Information", - "thresholds": [ - "0", - "1" - ], - "type": "number", - "unit": "short" + "properties": [ + { + "id": "unit", + "value": "short" + }, + { + "id": "custom.cellOptions", + "value": { + "type": "color-background" + } + }, + { + "id": "custom.align" + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(45, 172, 121, 0.97)", + "value": 0 + }, + { + "color": "#c15c17", + "value": 1 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Warning" }, - { - "alias": "", - "colorMode": "cell", - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(45, 172, 121, 0.97)", - "rgb(176, 176, 176)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "pattern": "Not classified", - "thresholds": [ - "0", - "1" - ], - "type": "number", - "unit": "short" + "properties": [ + { + "id": "unit", + "value": "short" + }, + { + "id": "custom.cellOptions", + "value": { + "type": "color-background" + } + }, + { + "id": "custom.align" + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(45, 172, 121, 0.97)", + "value": 0 + }, + { + "color": "#cca300", + "value": 1 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Information" }, - { - "alias": "", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 0, - "pattern": "/.*/", - "thresholds": [], - "type": "number", - "unit": "none" - } - ], - "targets": [ - { - "application": { - "filter": "" + "properties": [ + { + "id": "unit", + "value": "short" + }, + { + "id": "custom.cellOptions", + "value": { + "type": "color-background" + } }, - "functions": [], - "group": { - "filter": "/.*/" + { + "id": "custom.align" }, - "host": { - "filter": "/.*/" + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(45, 172, 121, 0.97)", + "value": 0 + }, + { + "color": "#64b0c8", + "value": 1 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Not classified" + }, + "properties": [ + { + "id": "unit", + "value": "short" }, - "item": { - "filter": "" + { + "id": "custom.cellOptions", + "value": { + "type": "color-background" + } }, - "mode": 4, - "triggers": { - "count": false, - "minSeverity": 0, - "acknowledged": 2 + { + "id": "custom.align" }, - "refId": "A", - "target": "" - } - ], - "title": "System status", - "transform": "table", - "type": "table" + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(45, 172, 121, 0.97)", + "value": 0 + }, + { + "color": "rgb(176, 176, 176)", + "value": 1 + } + ] + } + } + ] + } + ] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 9, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": ["sum"], + "show": false + }, + "showHeader": true + }, + "pluginVersion": "11.4.0-pre", + "targets": [ + { + "application": { + "filter": "" + }, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "$group" + }, + "host": { + "filter": "/.*/" + }, + "item": { + "filter": "" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "mode": 4, + "options": { + "acknowledged": 2, + "count": false, + "disableDataAlignment": false, + "hostProxy": false, + "hostsInMaintenance": false, + "limit": 1001, + "minSeverity": 0, + "showDisabledItems": false, + "skipEmptyValues": false, + "sortProblems": "default", + "useTimeRange": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "4", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "showProblems": "problems", + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "target": "", + "textFilter": "", + "trigger": { + "filter": "" + }, + "triggers": { + "acknowledged": 2, + "count": false, + "minSeverity": 0 + } } ], - "repeat": null, - "repeatIteration": null, - "repeatRowId": null, - "showTitle": false, - "title": "Dashboard Row", - "titleSize": "h6" + "title": "System status", + "type": "table" }, { - "collapse": false, - "height": "150px", - "panels": [ - { - "cacheTimeout": null, - "colorBackground": true, - "colorValue": false, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(16, 154, 113, 0.97)", - "#890f02" - ], - "datasource": "${DS_NAME}", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "id": 1, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "minSpan": 2, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "fieldConfig": { + "defaults": { + "mappings": [ { - "from": "null", - "text": "N/A", - "to": "null" + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" } ], - "repeat": "group", - "span": 2, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "application": { - "filter": "" + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null }, - "functions": [], - "group": { - "filter": "$group" + { + "color": "rgba(16, 154, 113, 0.97)", + "value": 0 }, - "host": { - "filter": "/.*/" - }, - "item": { - "filter": "" - }, - "mode": 4, - "triggers": { - "count": true, - "minSeverity": 3, - "acknowledged": 2 - }, - "refId": "A", - "target": "" - } - ], - "thresholds": "0,1", - "title": "$group", - "type": "singlestat", - "valueFontSize": "120%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" + { + "color": "#890f02", + "value": 1 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 4, + "x": 0, + "y": 7 + }, + "id": 1, + "maxDataPoints": 100, + "maxPerRow": 6, + "options": { + "colorMode": "background", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": ["mean"], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.4.0-pre", + "repeat": "group", + "repeatDirection": "v", + "targets": [ + { + "application": { + "filter": "" + }, + "countTriggersBy": "", + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, + "evaltype": "0", + "functions": [], + "group": { + "filter": "$group" + }, + "host": { + "filter": "/.*/" + }, + "item": { + "filter": "" + }, + "itemTag": { + "filter": "" + }, + "macro": { + "filter": "" + }, + "mode": 4, + "options": { + "acknowledged": 2, + "count": true, + "disableDataAlignment": false, + "hostProxy": false, + "hostsInMaintenance": false, + "limit": 1001, + "minSeverity": 2, + "showDisabledItems": false, + "skipEmptyValues": false, + "sortProblems": "default", + "useTimeRange": false, + "useTrends": "default", + "useZabbixValueMapping": false + }, + "proxy": { + "filter": "" + }, + "queryType": "4", + "refId": "A", + "resultFormat": "time_series", + "schema": 12, + "showProblems": "problems", + "table": { + "skipEmptyValues": false + }, + "tags": { + "filter": "" + }, + "target": "", + "textFilter": "", + "trigger": { + "filter": "" + }, + "triggers": { + "acknowledged": 2 + } } ], - "repeat": null, - "repeatIteration": null, - "repeatRowId": null, - "showTitle": false, - "title": "Dashboard Row", - "titleSize": "h6" + "title": "$group", + "type": "stat" } ], - "schemaVersion": 14, - "style": "dark", + "schemaVersion": 40, "tags": [], "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_NAME}", - "hide": 0, + "datasource": { + "type": "alexanderzobnin-zabbix-datasource", + "uid": "${DS_ZABBIX}" + }, "includeAll": true, - "label": null, "multi": true, "name": "group", "options": [], "query": "*", "refresh": 1, "regex": "", - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" } ] }, @@ -341,30 +607,10 @@ "from": "now-6h", "to": "now" }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "timezone": "" + "timepicker": {}, + "timezone": "", + "title": "Zabbix System Status", + "uid": "ae0yciqutx2iob", + "version": 2, + "weekStart": "" } From 45cd429d38e315aeac9e0119fbc99c08712f2f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= Date: Thu, 17 Oct 2024 11:30:33 +0200 Subject: [PATCH 2/2] Pin version for zabbix image to 7 --- devenv/zabbix70/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devenv/zabbix70/docker-compose.yml b/devenv/zabbix70/docker-compose.yml index eb3956017..2a61e4836 100644 --- a/devenv/zabbix70/docker-compose.yml +++ b/devenv/zabbix70/docker-compose.yml @@ -15,7 +15,7 @@ services: # Zabbix zabbix-server: - image: zabbix/zabbix-server-pgsql:alpine-trunk + image: zabbix/zabbix-server-pgsql:alpine-7.0-latest ports: - '10051:10051' depends_on: @@ -32,7 +32,7 @@ services: ZBX_DEBUGLEVEL: 3 zabbix-web: - image: zabbix/zabbix-web-apache-pgsql:alpine-trunk + image: zabbix/zabbix-web-apache-pgsql:alpine-7.0-latest ports: - '8188:8080' depends_on: @@ -57,7 +57,7 @@ services: POSTGRES_PASSWORD: zabbix zabbix-agent: - image: zabbix/zabbix-agent:alpine-trunk + image: zabbix/zabbix-agent:alpine-7.0-latest environment: ZBX_SERVER_HOST: zabbix-server ZBX_SERVER_PORT: 10051