diff --git a/.github/workflows/standards.py b/.github/workflows/standards.py
index a326a8b..33fcbc0 100644
--- a/.github/workflows/standards.py
+++ b/.github/workflows/standards.py
@@ -27,6 +27,7 @@
"aws-fsx/aws-fsx.json",
"aws-inspector/aws-inspector.json",
"aws-kinesis/aws-kinesis.json",
+ "aws-kinesis-firehose/aws-kinesis-firehose.json",
]
standard_footer = "![](\"https://monitoringartist.github.io/monitoring-artist-logo-grafana.png\")
| \nAWS CloudWatch Transfer Family documentation | \nInstalled from Grafana.com dashboards"
diff --git a/README.md b/README.md
index 19b8122..9d1115f 100644
--- a/README.md
+++ b/README.md
@@ -168,6 +168,7 @@ Single click provisioning [](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-kinesis)
### [AWS Kinesis Firehose](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-kinesis-firehose)
+[](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-kinesis-firehose)
### [AWS Lambda](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-lambda)
[](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-lambda)
diff --git a/aws-kinesis-firehose/aws-kinesis-firehose.json b/aws-kinesis-firehose/aws-kinesis-firehose.json
index 900f52e..fc5353c 100644
--- a/aws-kinesis-firehose/aws-kinesis-firehose.json
+++ b/aws-kinesis-firehose/aws-kinesis-firehose.json
@@ -12,13 +12,7 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
- "version": "10.1.5"
- },
- {
- "type": "datasource",
- "id": "influxdb",
- "name": "InfluxDB",
- "version": "1.0.0"
+ "version": "11.3.1"
},
{
"type": "panel",
@@ -55,7 +49,6 @@
"graphTooltip": 0,
"id": null,
"links": [],
- "liveNow": false,
"panels": [
{
"collapsed": false,
@@ -81,13 +74,15 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
+ "barWidthFactor": 0.6,
"drawStyle": "line",
- "fillOpacity": 10,
+ "fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
@@ -133,22 +128,7 @@
{
"matcher": {
"id": "byName",
- "options": "Maximum"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "#e24d42",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "IncomingBytes Sum"
+ "options": "IncomingBytes"
},
"properties": [
{
@@ -166,12 +146,10 @@
"y": 1
},
"id": 1,
- "links": [],
"options": {
"legend": {
"calcs": [
"mean",
- "lastNotNull",
"max",
"min",
"sum"
@@ -185,7 +163,7 @@
"sort": "none"
}
},
- "pluginVersion": "10.1.5",
+ "pluginVersion": "11.3.1",
"targets": [
{
"alias": "{{metric}} {{stat}}",
@@ -193,6 +171,7 @@
"filter": ""
},
"datasource": {
+ "type": "cloudwatch",
"uid": "$datasource"
},
"dimensions": {
@@ -211,7 +190,7 @@
"item": {
"filter": ""
},
- "label": "${PROP('MetricName')} ${PROP('Stat')}",
+ "label": "",
"matchExact": true,
"metricEditorMode": 0,
"metricName": "IncomingRecords",
@@ -221,7 +200,7 @@
"options": {
"showDisabledItems": false
},
- "period": "$agg",
+ "period": "",
"refId": "A",
"region": "$region",
"returnData": false,
@@ -251,7 +230,7 @@
"item": {
"filter": ""
},
- "label": "${PROP('MetricName')} ${PROP('Stat')}",
+ "label": "",
"matchExact": true,
"metricEditorMode": 0,
"metricName": "IncomingBytes",
@@ -261,7 +240,7 @@
"options": {
"showDisabledItems": false
},
- "period": "$agg",
+ "period": "",
"refId": "B",
"region": "$region",
"returnData": false,
@@ -282,11 +261,13 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
+ "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 10,
"gradientMode": "none",
@@ -334,7 +315,7 @@
{
"matcher": {
"id": "byName",
- "options": "ThrottledRecords Average"
+ "options": "ThrottledRecords"
},
"properties": [
{
@@ -356,12 +337,10 @@
"y": 8
},
"id": 4,
- "links": [],
"options": {
"legend": {
"calcs": [
"mean",
- "lastNotNull",
"max",
"min",
"sum"
@@ -375,7 +354,7 @@
"sort": "none"
}
},
- "pluginVersion": "10.1.5",
+ "pluginVersion": "11.3.1",
"targets": [
{
"alias": "{{metric}} {{stat}}",
@@ -401,7 +380,7 @@
"item": {
"filter": ""
},
- "label": "${PROP('MetricName')} ${PROP('Stat')}",
+ "label": "",
"matchExact": true,
"metricEditorMode": 0,
"metricName": "RecordsPerSecondLimit",
@@ -411,7 +390,7 @@
"options": {
"showDisabledItems": false
},
- "period": "$agg",
+ "period": "",
"refId": "A",
"region": "$region",
"returnData": false,
@@ -423,6 +402,7 @@
"filter": ""
},
"datasource": {
+ "type": "cloudwatch",
"uid": "$datasource"
},
"dimensions": {
@@ -441,7 +421,7 @@
"item": {
"filter": ""
},
- "label": "${PROP('MetricName')} ${PROP('Stat')}",
+ "label": "",
"matchExact": true,
"metricEditorMode": 0,
"metricName": "ThrottledRecords",
@@ -451,7 +431,7 @@
"options": {
"showDisabledItems": false
},
- "period": "$agg",
+ "period": "",
"refId": "B",
"region": "$region",
"returnData": false,
@@ -485,11 +465,13 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
+ "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 10,
"gradientMode": "none",
@@ -537,7 +519,7 @@
{
"matcher": {
"id": "byName",
- "options": "DeliveryToSplunk.Bytes Sum"
+ "options": "DeliveryToSplunk.Bytes"
},
"properties": [
{
@@ -559,12 +541,10 @@
"y": 16
},
"id": 7,
- "links": [],
"options": {
"legend": {
"calcs": [
"mean",
- "lastNotNull",
"max",
"min",
"sum"
@@ -578,7 +558,7 @@
"sort": "none"
}
},
- "pluginVersion": "10.1.5",
+ "pluginVersion": "11.3.1",
"targets": [
{
"alias": "{{metric}} {{stat}}",
@@ -586,6 +566,7 @@
"filter": ""
},
"datasource": {
+ "type": "cloudwatch",
"uid": "$datasource"
},
"dimensions": {
@@ -604,7 +585,7 @@
"item": {
"filter": ""
},
- "label": "${PROP('MetricName')} ${PROP('Stat')}",
+ "label": "",
"matchExact": true,
"metricEditorMode": 0,
"metricName": "DeliveryToSplunk.Records",
@@ -614,7 +595,7 @@
"options": {
"showDisabledItems": false
},
- "period": "$agg",
+ "period": "",
"refId": "A",
"region": "$region",
"returnData": false,
@@ -644,7 +625,7 @@
"item": {
"filter": ""
},
- "label": "${PROP('MetricName')} ${PROP('Stat')}",
+ "label": "",
"matchExact": true,
"metricEditorMode": 0,
"metricName": "DeliveryToSplunk.Bytes",
@@ -654,7 +635,7 @@
"options": {
"showDisabledItems": false
},
- "period": "$agg",
+ "period": "",
"refId": "B",
"region": "$region",
"returnData": false,
@@ -675,11 +656,13 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
+ "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 10,
"gradientMode": "none",
@@ -727,7 +710,7 @@
{
"matcher": {
"id": "byName",
- "options": "DeliveryToSplunk.DataFreshness Average"
+ "options": "DeliveryToSplunk.DataFreshness"
},
"properties": [
{
@@ -749,12 +732,10 @@
"y": 23
},
"id": 9,
- "links": [],
"options": {
"legend": {
"calcs": [
"mean",
- "lastNotNull",
"max",
"min",
"sum"
@@ -768,7 +749,7 @@
"sort": "none"
}
},
- "pluginVersion": "10.1.5",
+ "pluginVersion": "11.3.1",
"targets": [
{
"alias": "{{metric}} {{stat}}",
@@ -794,7 +775,7 @@
"item": {
"filter": ""
},
- "label": "${PROP('MetricName')} ${PROP('Stat')}",
+ "label": "",
"matchExact": true,
"metricEditorMode": 0,
"metricName": "DeliveryToSplunk.Success",
@@ -804,7 +785,7 @@
"options": {
"showDisabledItems": false
},
- "period": "$agg",
+ "period": "",
"refId": "A",
"region": "$region",
"returnData": false,
@@ -816,6 +797,7 @@
"filter": ""
},
"datasource": {
+ "type": "cloudwatch",
"uid": "$datasource"
},
"dimensions": {
@@ -834,7 +816,7 @@
"item": {
"filter": ""
},
- "label": "${PROP('MetricName')} ${PROP('Stat')}",
+ "label": "",
"matchExact": true,
"metricEditorMode": 0,
"metricName": "DeliveryToSplunk.DataFreshness",
@@ -844,7 +826,7 @@
"options": {
"showDisabledItems": false
},
- "period": "$agg",
+ "period": "",
"refId": "B",
"region": "$region",
"returnData": false,
@@ -867,12 +849,6 @@
"type": "row"
},
{
- "datasource": {
- "type": "influxdb",
- "uid": "${datasource}"
- },
- "editable": true,
- "error": false,
"gridPos": {
"h": 3,
"w": 24,
@@ -880,132 +856,39 @@
"y": 31
},
"id": 2,
- "links": [],
"options": {
"code": {
"language": "plaintext",
"showLineNumbers": false,
"showMiniMap": false
},
- "content": " | \nAWS CloudWatch Kinesis documentation | \nInstalled from Grafana.com dashboards",
+ "content": " | \nAWS CloudWatch Kinesis documentation | \nInstalled from Grafana.com dashboards",
"mode": "html"
},
- "pluginVersion": "10.1.5",
- "targets": [
- {
- "datasource": {
- "type": "influxdb",
- "uid": "${datasource}"
- },
- "refId": "A"
- }
- ],
+ "pluginVersion": "11.3.1",
"title": "Documentation",
"type": "text"
}
],
"refresh": "",
- "schemaVersion": 38,
- "style": "dark",
- "tags": [],
+ "schemaVersion": 40,
+ "tags": [
+ "monitoringartist",
+ "cloudwatch"
+ ],
"templating": {
"list": [
{
"current": {},
- "hide": 0,
"includeAll": false,
"label": "Datasource",
- "multi": false,
"name": "datasource",
"options": [],
"query": "cloudwatch",
- "queryValue": "trac",
"refresh": 1,
"regex": "",
- "skipUrlSync": false,
"type": "datasource"
},
- {
- "auto": true,
- "auto_count": 30,
- "auto_min": "10s",
- "current": {},
- "hide": 0,
- "label": "Aggregation",
- "name": "agg",
- "options": [
- {
- "selected": true,
- "text": "auto",
- "value": "$__auto_interval_agg"
- },
- {
- "selected": false,
- "text": "1s",
- "value": "1s"
- },
- {
- "selected": false,
- "text": "5s",
- "value": "5s"
- },
- {
- "selected": false,
- "text": "10s",
- "value": "10s"
- },
- {
- "selected": false,
- "text": "30s",
- "value": "30s"
- },
- {
- "selected": true,
- "text": "1m",
- "value": "1m"
- },
- {
- "selected": false,
- "text": "5m",
- "value": "5m"
- },
- {
- "selected": false,
- "text": "15m",
- "value": "15m"
- },
- {
- "selected": false,
- "text": "1h",
- "value": "1h"
- },
- {
- "selected": false,
- "text": "6h",
- "value": "6h"
- },
- {
- "selected": false,
- "text": "1d",
- "value": "1d"
- },
- {
- "selected": false,
- "text": "7d",
- "value": "7d"
- },
- {
- "selected": false,
- "text": "30d",
- "value": "30d"
- }
- ],
- "query": "1s,5s,10s,30s,1m,5m,15m,1h,6h,1d,7d,30d",
- "queryValue": "",
- "refresh": 2,
- "skipUrlSync": false,
- "type": "interval"
- },
{
"current": {},
"datasource": {
@@ -1013,21 +896,15 @@
"uid": "$datasource"
},
"definition": "regions()",
- "hide": 0,
"includeAll": false,
"label": "Region",
- "multi": false,
"name": "region",
"options": [],
"query": "regions()",
"refresh": 1,
"regex": "",
- "skipUrlSync": false,
"sort": 1,
- "tagValuesQuery": "",
- "tagsQuery": "",
- "type": "query",
- "useTags": false
+ "type": "query"
},
{
"current": {},
@@ -1036,10 +913,8 @@
"uid": "$datasource"
},
"definition": "",
- "hide": 0,
"includeAll": false,
"label": "DeliveryStreamName",
- "multi": false,
"name": "deliverystreamname",
"options": [],
"query": {
@@ -1058,12 +933,8 @@
},
"refresh": 1,
"regex": "",
- "skipUrlSync": false,
"sort": 1,
- "tagValuesQuery": "",
- "tagsQuery": "",
- "type": "query",
- "useTags": false
+ "type": "query"
}
]
},
@@ -1071,34 +942,10 @@
"from": "now-12h",
"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"
- ]
- },
+ "timepicker": {},
"timezone": "browser",
"title": "AWS Kinesis Firehose",
"uid": "AWSFirehose",
- "version": 1,
+ "version": 13,
"weekStart": ""
}
\ No newline at end of file
diff --git a/aws-kinesis-firehose/aws-kinesis-firehose.png b/aws-kinesis-firehose/aws-kinesis-firehose.png
new file mode 100644
index 0000000..036e411
Binary files /dev/null and b/aws-kinesis-firehose/aws-kinesis-firehose.png differ