Update dashboards (#20486)

pull/20552/head
Erik Sundell 6 years ago committed by GitHub
parent d630ac4b68
commit 22edacd4a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 661
      public/app/plugins/datasource/cloudwatch/dashboards/EBS.json
  3. 771
      public/app/plugins/datasource/cloudwatch/dashboards/Lambda.json
  4. 784
      public/app/plugins/datasource/cloudwatch/dashboards/Logs.json
  5. 1525
      public/app/plugins/datasource/cloudwatch/dashboards/RDS.json
  6. 2203
      public/app/plugins/datasource/cloudwatch/dashboards/ec2.json
  7. 5
      public/app/plugins/datasource/cloudwatch/datasource.ts
  8. 8
      public/app/plugins/datasource/cloudwatch/plugin.json

@ -15,6 +15,7 @@
* **CloudWatch**: ContainerInsights metrics support. [#18971](https://github.com/grafana/grafana/pull/18971), [@francopeapea](https://github.com/francopeapea)
* **CloudWatch**: Support dynamic queries using dimension wildcards [#20058](https://github.com/grafana/grafana/issues/20058), [@sunker](https://github.com/sunker)
* **CloudWatch**: Stop using GetMetricStatistics and use GetMetricData for all time series requests [#20057](https://github.com/grafana/grafana/issues/20057), [@sunker](https://github.com/sunker)
* **CloudWatch**: Add curated dashboards for most popular Amazon services [#20480](https://github.com/grafana/grafana/issues/20480), [@sunker](https://github.com/sunker)
* **CloudWatch**: Convert query editor from Angular to React [#19880](https://github.com/grafana/grafana/issues/19880), [@sunker](https://github.com/sunker)
* **CloudWatch**: Convert config editor from Angular to React [#19881](https://github.com/grafana/grafana/issues/19881), [@shavonn](https://github.com/shavonn)
* **CloudWatch**: Improved error handling when throttling occurs [#20348](https://github.com/grafana/grafana/issues/20348), [@sunker](https://github.com/sunker)

@ -1,5 +1,13 @@
{
"__inputs": [
{
"name": "DS_CLOUDWATCH",
"label": "CloudWatch",
"description": "",
"type": "datasource",
"pluginId": "cloudwatch",
"pluginName": "CloudWatch"
},
{
"name": "DS_CLOUDWATCH",
"label": "CloudWatch",
@ -27,6 +35,12 @@
"id": "graph",
"name": "Graph",
"version": ""
},
{
"type": "panel",
"id": "text",
"name": "Text",
"version": ""
}
],
"annotations": {
@ -42,11 +56,12 @@
}
]
},
"description": "Visualize AWS Lambda metrics",
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1573631164529,
"iteration": 1574322239729,
"links": [],
"panels": [
{
@ -55,11 +70,11 @@
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
@ -71,7 +86,8 @@
"current": false,
"max": false,
"min": false,
"show": true,
"rightSide": true,
"show": false,
"total": false,
"values": false
},
@ -91,23 +107,26 @@
"steppedLine": false,
"targets": [
{
"alias": "",
"dimensions": {
"FunctionName": "$function"
"FunctionName": "*"
},
"expression": "",
"expression": "REMOVE_EMPTY(SEARCH('{AWS/Lambda} MetricName=\"Invocations\"', 'Sum', $period))/$period",
"id": "",
"matchExact": true,
"metricName": "Invocations",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["$statistic"]
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Invocations $statistic",
"title": "Total invocations [count/sec]",
"tooltip": {
"shared": true,
"sort": 0,
@ -127,7 +146,7 @@
"label": null,
"logBase": 1,
"max": null,
"min": null,
"min": "0",
"show": true
},
{
@ -150,29 +169,30 @@
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"x": 12,
"y": 0
"h": 7,
"w": 24,
"x": 0,
"y": 7
},
"hiddenSeries": false,
"id": 3,
"id": 15,
"legend": {
"alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"rightSide": true,
"show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"nullPointMode": "null as zero",
"options": {
"dataLinks": []
},
@ -183,26 +203,55 @@
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"steppedLine": true,
"targets": [
{
"dimensions": {
"FunctionName": "$function"
},
"alias": "",
"dimensions": {},
"expression": "",
"hide": true,
"id": "errors",
"matchExact": true,
"metricName": "Duration",
"metricName": "Errors",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Average"]
"statistics": ["Sum"]
},
{
"alias": "",
"dimensions": {},
"expression": "",
"hide": true,
"id": "invocations",
"matchExact": true,
"metricName": "Invocations",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "B",
"region": "$region",
"statistics": ["Sum"]
},
{
"alias": "",
"dimensions": {},
"expression": "errors / invocations",
"id": "",
"matchExact": true,
"metricName": "Invocations",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "C",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Duration Average",
"title": "Total error rate [errors/invocations]",
"tooltip": {
"shared": true,
"sort": 0,
@ -222,7 +271,7 @@
"label": null,
"logBase": 1,
"max": null,
"min": null,
"min": "0",
"show": true
},
{
@ -245,29 +294,30 @@
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"h": 7,
"w": 24,
"x": 0,
"y": 9
"y": 14
},
"hiddenSeries": false,
"id": 4,
"id": 16,
"legend": {
"alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"rightSide": true,
"show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"nullPointMode": "null as zero",
"options": {
"dataLinks": []
},
@ -278,26 +328,55 @@
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"steppedLine": true,
"targets": [
{
"dimensions": {
"FunctionName": "$function"
},
"alias": "",
"dimensions": {},
"expression": "",
"hide": true,
"id": "throttles",
"matchExact": true,
"metricName": "Errors",
"metricName": "Throttles",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Average"]
"statistics": ["Sum"]
},
{
"alias": "",
"dimensions": {},
"expression": "",
"hide": true,
"id": "invocations",
"matchExact": true,
"metricName": "Invocations",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "B",
"region": "$region",
"statistics": ["Sum"]
},
{
"alias": "",
"dimensions": {},
"expression": "throttles / invocations",
"id": "",
"matchExact": true,
"metricName": "Invocations",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "C",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Errors $statistic",
"title": "Total throttle rate [throttles/invocations]",
"tooltip": {
"shared": true,
"sort": 0,
@ -317,7 +396,7 @@
"label": null,
"logBase": 1,
"max": null,
"min": null,
"min": "0",
"show": true
},
{
@ -335,115 +414,484 @@
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fillGradient": 0,
"collapsed": true,
"datasource": "${DS_CLOUDWATCH}",
"gridPos": {
"h": 9,
"w": 12,
"x": 12,
"y": 9
"h": 1,
"w": 24,
"x": 0,
"y": 21
},
"hiddenSeries": false,
"id": 5,
"legend": {
"alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
"id": 9,
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 1
},
"hiddenSeries": false,
"id": 11,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"sort": "max",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "",
"dimensions": {
"FunctionName": "*"
},
"expression": "REMOVE_EMPTY(SEARCH('{AWS/Lambda,FunctionName} MetricName=\"Duration\"', 'Average', $period))",
"id": "",
"matchExact": true,
"metricName": "Invocations",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Duration per function [average time] Log scale",
"tooltip": {
"shared": true,
"sort": 2,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "ms",
"label": null,
"logBase": 10,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 10
},
"hiddenSeries": false,
"id": 6,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"sort": "max",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "",
"dimensions": {
"FunctionName": "*"
},
"expression": "REMOVE_EMPTY(SEARCH('{AWS/Lambda,FunctionName} MetricName=\"Invocations\"', 'Sum', $period))/$period",
"id": "",
"matchExact": true,
"metricName": "Invocations",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Invocations per function [count/sec]",
"tooltip": {
"shared": true,
"sort": 2,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 19
},
"hiddenSeries": false,
"id": 12,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"sort": "max",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "",
"dimensions": {
"FunctionName": "*"
},
"expression": "REMOVE_EMPTY(SEARCH('{AWS/Lambda,FunctionName} MetricName=\"Errors\"', 'Sum', $period))/$period",
"id": "",
"matchExact": true,
"metricName": "Invocations",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Errors per function [count/sec]",
"tooltip": {
"shared": true,
"sort": 2,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 28
},
"hiddenSeries": false,
"id": 13,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"sort": "max",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "",
"dimensions": {
"FunctionName": "*"
},
"expression": "REMOVE_EMPTY(SEARCH('{AWS/Lambda,FunctionName} MetricName=\"Throttles\"', 'Sum', $period))/$period",
"id": "",
"matchExact": true,
"metricName": "Invocations",
"namespace": "AWS/Lambda",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Throttles per function [count/sec]",
"tooltip": {
"shared": true,
"sort": 2,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"title": "Per function details",
"type": "row"
},
{
"collapsed": false,
"datasource": "${DS_CLOUDWATCH}",
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
"y": 22
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
"id": 20,
"panels": [],
"title": "Information",
"type": "row"
},
{
"content": "For more information about the available metrics for AWS Lambda, visit the [AWS Lambda documentation](https://docs.aws.amazon.com/lambda/latest/dg/monitoring-functions-metrics.html).",
"datasource": "${DS_CLOUDWATCH}",
"gridPos": {
"h": 2,
"w": 24,
"x": 0,
"y": 23
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"id": 18,
"mode": "markdown",
"options": {},
"targets": [
{
"dimensions": {
"FunctionName": "$function"
},
"alias": "",
"dimensions": {},
"expression": "",
"id": "",
"matchExact": true,
"metricName": "Throttles",
"namespace": "AWS/Lambda",
"metricName": "",
"namespace": "",
"refId": "A",
"region": "$region",
"region": "default",
"statistics": ["Average"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Throttles $statistic",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
"title": " ",
"type": "text"
}
],
"refresh": false,
"schemaVersion": 21,
"style": "dark",
"tags": [],
"tags": ["Amazon", "AWS", "CloudWatch", "Lambda"],
"templating": {
"list": [
{
"current": {
"selected": true,
"text": "CloudWatch",
"value": "CloudWatch"
"text": "default",
"value": "default"
},
"hide": 0,
"includeAll": false,
"label": "Datasource",
"label": "Data source",
"multi": false,
"name": "datasource",
"options": [],
@ -478,52 +926,39 @@
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {},
"datasource": "${DS_CLOUDWATCH}",
"definition": "statistics()",
"hide": 0,
"includeAll": false,
"label": "Statistic",
"multi": false,
"name": "statistic",
"options": [],
"query": "statistics()",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {
"text": "*",
"value": ["*"]
"selected": true,
"tags": [],
"text": "300",
"value": "300"
},
"datasource": "${DS_CLOUDWATCH}",
"definition": "dimension_values($region, AWS/Lambda, , FunctionName)",
"hide": 0,
"includeAll": true,
"label": "FunctionName",
"multi": true,
"name": "function",
"options": [],
"query": "dimension_values($region, AWS/Lambda, , FunctionName)",
"refresh": 1,
"regex": "",
"includeAll": false,
"label": "Period [sec]",
"multi": false,
"name": "period",
"options": [
{
"selected": false,
"text": "60",
"value": "60"
},
{
"selected": true,
"text": "300",
"value": "300"
},
{
"selected": false,
"text": "3600",
"value": "3600"
}
],
"query": "60,300,3600",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
"type": "custom"
}
]
},
@ -535,7 +970,7 @@
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Lambda",
"uid": "VgpJGb1Zg",
"version": 6
"title": "AWS Lambda",
"uid": "iUna6IxZz",
"version": 1
}

@ -0,0 +1,784 @@
{
"__inputs": [
{
"name": "DS_CLOUDWATCH",
"label": "CloudWatch",
"description": "",
"type": "datasource",
"pluginId": "cloudwatch",
"pluginName": "CloudWatch"
}
],
"__requires": [
{
"type": "datasource",
"id": "cloudwatch",
"name": "CloudWatch",
"version": "1.0.0"
},
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "6.6.0-pre"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": ""
},
{
"type": "panel",
"id": "text",
"name": "Text",
"version": ""
}
],
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"description": "Visualize Amazon CloudWatch Log based metrics",
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": null,
"iteration": 1574321829202,
"links": [],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 0
},
"hiddenSeries": false,
"id": 2,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"sort": "avg",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": true,
"targets": [
{
"alias": "",
"dimensions": {
"LogGroupName": "*"
},
"expression": "REMOVE_EMPTY(SEARCH('{AWS/Logs,LogGroupName} MetricName=\"IncomingLogEvents\"', 'Sum', $period))/$period",
"id": "",
"matchExact": true,
"metricName": "IncomingLogEvents",
"namespace": "AWS/Logs",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Incoming log events [count/sec]",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 8
},
"hiddenSeries": false,
"id": 3,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"sort": "avg",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": true,
"targets": [
{
"alias": "",
"dimensions": {
"LogGroupName": "*"
},
"expression": "REMOVE_EMPTY(SEARCH('{AWS/Logs,LogGroupName} MetricName=\"IncomingBytes\"', 'Sum', $period))/$period",
"id": "",
"matchExact": true,
"metricName": "IncomingLogEvents",
"namespace": "AWS/Logs",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Incoming bytes [bytes/sec]",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "decbytes",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 16
},
"hiddenSeries": false,
"id": 4,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"sort": "avg",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": true,
"targets": [
{
"dimensions": {
"LogGroupName": "*"
},
"expression": "",
"matchExact": true,
"metricName": "DeliveryErrors",
"namespace": "AWS/Logs",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Delivery errors [count]",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"x": 12,
"y": 16
},
"hiddenSeries": false,
"id": 5,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"sort": "avg",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": true,
"targets": [
{
"dimensions": {
"LogGroupName": "*"
},
"expression": "",
"matchExact": true,
"metricName": "DeliveryThrottling",
"namespace": "AWS/Logs",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Delivery throttling [count]",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 25
},
"hiddenSeries": false,
"id": 6,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"sort": "avg",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": true,
"targets": [
{
"dimensions": {
"LogGroupName": "*"
},
"expression": "REMOVE_EMPTY(SEARCH('{AWS/Logs,LogGroupName} MetricName=\"ForwardedLogEvents\"', 'Sum', $period))/$period",
"matchExact": true,
"metricName": "ForwardedLogEvents",
"namespace": "AWS/Logs",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Forwarded log events [count/sec]",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"x": 12,
"y": 25
},
"hiddenSeries": false,
"id": 7,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"sort": "avg",
"sortDesc": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"dataLinks": []
},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": true,
"targets": [
{
"dimensions": {
"LogGroupName": "*"
},
"expression": "REMOVE_EMPTY(SEARCH('{AWS/Logs,LogGroupName} MetricName=\"ForwardedBytes\"', 'Sum', $period))/$period",
"matchExact": true,
"metricName": "ForwardedBytes",
"namespace": "AWS/Logs",
"period": "$period",
"refId": "A",
"region": "$region",
"statistics": ["Sum"]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Forwarded bytes [bytes/sec]",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "decbytes",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"content": "For more information about the available metrics for Amazon CloudWatch Logs, please visit the [CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Monitoring-CloudWatch-Metrics.html).",
"datasource": "${DS_CLOUDWATCH}",
"gridPos": {
"h": 2,
"w": 24,
"x": 0,
"y": 34
},
"id": 9,
"mode": "markdown",
"options": {},
"targets": [
{
"alias": "",
"dimensions": {},
"expression": "",
"id": "",
"matchExact": true,
"metricName": "",
"namespace": "",
"refId": "A",
"region": "default",
"statistics": ["Average"]
}
],
"timeFrom": null,
"timeShift": null,
"title": " ",
"type": "text"
}
],
"refresh": false,
"schemaVersion": 21,
"style": "dark",
"tags": ["Amazon", "AWS", "CloudWatch", "Logs"],
"templating": {
"list": [
{
"current": {
"text": "default",
"value": "default"
},
"hide": 0,
"includeAll": false,
"label": "Data source",
"multi": false,
"name": "datasource",
"options": [],
"query": "cloudwatch",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"type": "datasource"
},
{
"allValue": null,
"current": {
"text": "default",
"value": "default"
},
"datasource": "$datasource",
"definition": "regions()",
"hide": 0,
"includeAll": false,
"label": "Region",
"multi": false,
"name": "region",
"options": [],
"query": "regions()",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {
"selected": true,
"tags": [],
"text": "300",
"value": "300"
},
"hide": 0,
"includeAll": false,
"label": "Period [sec]",
"multi": false,
"name": "period",
"options": [
{
"selected": false,
"text": "60",
"value": "60"
},
{
"selected": true,
"text": "300",
"value": "300"
},
{
"selected": false,
"text": "3600",
"value": "3600"
}
],
"query": "60,300,3600",
"skipUrlSync": false,
"type": "custom"
}
]
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
},
"timezone": "",
"title": "Amazon CloudWatch Logs",
"uid": "5lKoAHxZz",
"version": 1
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -324,7 +324,10 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery,
}
getRegions() {
return this.doMetricQueryRequest('regions', null);
return this.doMetricQueryRequest('regions', null).then((regions: any) => [
{ label: 'default', value: 'default', text: 'default' },
...regions,
]);
}
getNamespaces() {

@ -3,10 +3,16 @@
"name": "CloudWatch",
"id": "cloudwatch",
"category": "cloud",
"metrics": true,
"alerting": true,
"annotations": true,
"includes": [
{ "type": "dashboard", "name": "EC2", "path": "dashboards/ec2.json" },
{ "type": "dashboard", "name": "EBS", "path": "dashboards/EBS.json" },
{ "type": "dashboard", "name": "Lambda", "path": "dashboards/Lambda.json" },
{ "type": "dashboard", "name": "Logs", "path": "dashboards/Logs.json" },
{ "type": "dashboard", "name": "RDS", "path": "dashboards/RDS.json" }
],
"info": {
"description": "Data source for Amazon AWS monitoring service",
"author": {

Loading…
Cancel
Save