diff --git a/.github/workflows/standards.py b/.github/workflows/standards.py
index 151836b..254b76e 100644
--- a/.github/workflows/standards.py
+++ b/.github/workflows/standards.py
@@ -30,6 +30,7 @@
"aws-kinesis-firehose/aws-kinesis-firehose.json",
"aws-lambda/aws-lambda.json",
"aws-logs/aws-logs.json",
+ "aws-network-firewall/aws-network-firewall.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/aws-network-firewall/aws-network-firewall.json b/aws-network-firewall/aws-network-firewall.json
index 2deed88..a6a2004 100644
--- a/aws-network-firewall/aws-network-firewall.json
+++ b/aws-network-firewall/aws-network-firewall.json
@@ -1,5 +1,6 @@
{
"__inputs": [],
+ "__elements": {},
"__requires": [
{
"type": "datasource",
@@ -11,18 +12,18 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
- "version": "8.1.1"
+ "version": "11.3.1"
},
{
"type": "panel",
- "id": "graph",
- "name": "Graph (old)",
+ "id": "text",
+ "name": "Text",
"version": ""
},
{
"type": "panel",
- "id": "text",
- "name": "Text",
+ "id": "timeseries",
+ "name": "Time series",
"version": ""
}
],
@@ -30,7 +31,10 @@
"list": [
{
"builtIn": 1,
- "datasource": "-- Grafana --",
+ "datasource": {
+ "type": "datasource",
+ "uid": "grafana"
+ },
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
@@ -46,82 +50,108 @@
]
},
"description": "Visualize AWS Network Firewall metrics",
- "editable": true,
- "gnetId": 2969,
+ "editable": false,
+ "fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": null,
- "iteration": 1630420188037,
"links": [],
"panels": [
{
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$datasource",
- "editable": true,
- "error": false,
- "fill": 1,
- "fillGradient": 0,
- "grid": {},
+ "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
+ },
+ "insertNulls": false,
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "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": []
+ },
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
- "hiddenSeries": false,
"id": 12,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": true,
- "max": true,
- "min": true,
- "show": true,
- "sort": "current",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
"options": {
- "alertThreshold": true
- },
- "percentage": false,
- "pluginVersion": "8.1.1",
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [
- {
- "$$hashKey": "object:80",
- "alias": "Latency_Average",
- "yaxis": 2
+ "alertThreshold": true,
+ "legend": {
+ "calcs": [
+ "mean",
+ "max",
+ "min"
+ ],
+ "displayMode": "table",
+ "placement": "bottom",
+ "showLegend": true
},
- {
- "$$hashKey": "object:81",
- "alias": "TargetResponseTime_Average",
- "yaxis": 2
- },
- {
- "$$hashKey": "object:82",
- "alias": "PermittedThroughput_Average",
- "yaxis": 2
+ "tooltip": {
+ "mode": "multi",
+ "sort": "none"
}
- ],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
+ },
+ "pluginVersion": "11.3.1",
"targets": [
{
"alias": "",
"application": {
"filter": ""
},
+ "datasource": {
+ "type": "cloudwatch",
+ "uid": "$datasource"
+ },
"dimensions": {
"AvailabilityZone": "$availabilityzone",
"Engine": "$engine",
@@ -139,8 +169,11 @@
"item": {
"filter": ""
},
+ "label": "",
"matchExact": true,
+ "metricEditorMode": 0,
"metricName": "PassedPackets",
+ "metricQueryType": 0,
"mode": 0,
"namespace": "AWS/NetworkFirewall",
"options": {
@@ -149,12 +182,13 @@
"period": "",
"refId": "A",
"region": "$region",
- "statistics": [
- "Average"
- ]
+ "statistic": "Average"
},
{
"alias": "",
+ "datasource": {
+ "uid": "$datasource"
+ },
"dimensions": {
"AvailabilityZone": "$availabilityzone",
"Engine": "$engine",
@@ -163,130 +197,117 @@
"expression": "",
"hide": false,
"id": "",
+ "label": "",
"matchExact": true,
+ "metricEditorMode": 0,
"metricName": "DroppedPackets",
+ "metricQueryType": 0,
"namespace": "AWS/NetworkFirewall",
"period": "",
"refId": "B",
"region": "$region",
- "statistics": [
- "Average"
- ]
+ "statistic": "Average"
}
],
- "thresholds": [],
- "timeFrom": null,
- "timeRegions": [],
- "timeShift": null,
- "title": "PassedPackets / DroppedPackets ",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
+ "title": "PassedPackets/DroppedPackets ",
+ "type": "timeseries"
+ },
+ {
+ "datasource": {
+ "type": "cloudwatch",
+ "uid": "$datasource"
},
- "yaxes": [
- {
- "$$hashKey": "object:822",
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
+ "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": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "never",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
"min": 0,
- "show": true
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ },
+ "unit": "bytes"
},
- {
- "$$hashKey": "object:823",
- "format": "Bps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$datasource",
- "editable": true,
- "error": false,
- "fill": 1,
- "fillGradient": 0,
- "grid": {},
+ "overrides": []
+ },
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 7
},
- "hiddenSeries": false,
"id": 7,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": true,
- "max": true,
- "min": true,
- "show": true,
- "sort": "current",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "null as zero",
"options": {
- "alertThreshold": true
- },
- "percentage": false,
- "pluginVersion": "8.1.1",
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [
- {
- "$$hashKey": "object:173",
- "alias": "Latency_Average",
- "yaxis": 2
+ "alertThreshold": true,
+ "legend": {
+ "calcs": [
+ "mean",
+ "max",
+ "min"
+ ],
+ "displayMode": "table",
+ "placement": "bottom",
+ "showLegend": true
},
- {
- "$$hashKey": "object:174",
- "alias": "TargetResponseTime_Average",
- "yaxis": 2
- },
- {
- "$$hashKey": "object:175",
- "alias": "ClientConnections_Sum",
- "yaxis": 2
+ "tooltip": {
+ "mode": "multi",
+ "sort": "none"
}
- ],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
+ },
+ "pluginVersion": "11.3.1",
"targets": [
{
"alias": "",
"application": {
"filter": ""
},
+ "datasource": {
+ "uid": "$datasource"
+ },
"dimensions": {
"AvailabilityZone": "$availabilityzone",
"Engine": "$engine",
@@ -304,8 +325,11 @@
"item": {
"filter": ""
},
+ "label": "",
"matchExact": true,
+ "metricEditorMode": 0,
"metricName": "ReceivedPacketCount",
+ "metricQueryType": 0,
"mode": 0,
"namespace": "AWS/NetworkFirewall",
"options": {
@@ -314,124 +338,108 @@
"period": "",
"refId": "A",
"region": "$region",
- "statistics": [
- "Average"
- ]
+ "statistic": "Average"
}
],
- "thresholds": [],
- "timeFrom": null,
- "timeRegions": [],
- "timeShift": null,
"title": "ReceivedPacketsCount",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
+ "type": "timeseries"
+ },
+ {
+ "datasource": {
+ "type": "cloudwatch",
+ "uid": "$datasource"
},
- "yaxes": [
- {
- "$$hashKey": "object:177",
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
+ "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": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "never",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
"min": 0,
- "show": true
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ },
+ "unit": "bytes"
},
- {
- "$$hashKey": "object:178",
- "format": "none",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "$datasource",
- "editable": true,
- "error": false,
- "fill": 1,
- "fillGradient": 0,
- "grid": {},
+ "overrides": []
+ },
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 14
},
- "hiddenSeries": false,
"id": 13,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": true,
- "max": true,
- "min": true,
- "show": true,
- "sort": "current",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "null as zero",
"options": {
- "alertThreshold": true
- },
- "percentage": false,
- "pluginVersion": "8.1.1",
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [
- {
- "$$hashKey": "object:270",
- "alias": "Latency_Average",
- "yaxis": 2
+ "alertThreshold": true,
+ "legend": {
+ "calcs": [
+ "mean",
+ "max",
+ "min"
+ ],
+ "displayMode": "table",
+ "placement": "bottom",
+ "showLegend": true
},
- {
- "$$hashKey": "object:271",
- "alias": "TargetResponseTime_Average",
- "yaxis": 2
- },
- {
- "$$hashKey": "object:272",
- "alias": "ClientConnections_Sum",
- "yaxis": 2
+ "tooltip": {
+ "mode": "multi",
+ "sort": "none"
}
- ],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
+ },
+ "pluginVersion": "11.3.1",
"targets": [
{
"alias": "",
"application": {
"filter": ""
},
+ "datasource": {
+ "uid": "$datasource"
+ },
"dimensions": {
"AvailabilityZone": "$availabilityzone",
"Engine": "$engine",
@@ -449,8 +457,11 @@
"item": {
"filter": ""
},
+ "label": "",
"matchExact": true,
+ "metricEditorMode": 0,
"metricName": "Packets",
+ "metricQueryType": 0,
"mode": 0,
"namespace": "AWS/NetworkFirewall",
"options": {
@@ -459,15 +470,17 @@
"period": "",
"refId": "A",
"region": "$region",
- "statistics": [
- "Average"
- ]
+ "statistic": "Average"
},
{
"alias": "",
"application": {
"filter": ""
},
+ "datasource": {
+ "type": "cloudwatch",
+ "uid": "$datasource"
+ },
"dimensions": {
"TransitGateway": "$transitgateway"
},
@@ -483,8 +496,11 @@
"item": {
"filter": ""
},
+ "label": "",
"matchExact": true,
+ "metricEditorMode": 0,
"metricName": "BytesOut",
+ "metricQueryType": 0,
"mode": 0,
"namespace": "AWS/TransitGateway",
"options": {
@@ -493,59 +509,13 @@
"period": "",
"refId": "B",
"region": "$region",
- "statistics": [
- "Average"
- ]
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeRegions": [],
- "timeShift": null,
- "title": "Packets / BytesOut",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "$$hashKey": "object:177",
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
- },
- {
- "$$hashKey": "object:178",
- "format": "none",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": 0,
- "show": true
+ "statistic": "Average"
}
],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
+ "title": "Packets/BytesOut",
+ "type": "timeseries"
},
{
- "datasource": null,
- "editable": true,
- "error": false,
"gridPos": {
"h": 3,
"w": 24,
@@ -553,19 +523,22 @@
"y": 21
},
"id": 2,
- "links": [],
"options": {
- "content": " | \nAWS CloudWatch Network Firewall documentation | \nInstalled from Grafana.com dashboards",
+ "code": {
+ "language": "plaintext",
+ "showLineNumbers": false,
+ "showMiniMap": false
+ },
+ "content": " | \nAWS CloudWatch Network Firewall documentation | \nInstalled from Grafana.com dashboards",
"mode": "html"
},
- "pluginVersion": "8.1.1",
+ "pluginVersion": "11.3.1",
"title": "Documentation",
"type": "text"
}
],
- "refresh": false,
- "schemaVersion": 30,
- "style": "dark",
+ "refresh": "",
+ "schemaVersion": 40,
"tags": [
"monitoringartist",
"cloudwatch"
@@ -574,102 +547,77 @@
"list": [
{
"current": {},
- "description": null,
- "error": null,
- "hide": 0,
"includeAll": false,
"label": "Datasource",
- "multi": false,
"name": "datasource",
"options": [],
"query": "cloudwatch",
- "queryValue": "prd",
"refresh": 1,
"regex": "",
- "skipUrlSync": false,
"type": "datasource"
},
{
- "allValue": null,
"current": {},
- "datasource": "$datasource",
+ "datasource": {
+ "type": "cloudwatch",
+ "uid": "$datasource"
+ },
"definition": "",
- "description": null,
- "error": null,
- "hide": 0,
"includeAll": false,
"label": "Region",
- "multi": false,
"name": "region",
"options": [],
"query": "regions()",
"refresh": 1,
"regex": "",
- "skipUrlSync": false,
- "sort": 0,
- "tagValuesQuery": "",
- "tagsQuery": "",
- "type": "query",
- "useTags": false
+ "type": "query"
},
{
- "allValue": null,
"current": {},
- "datasource": "$datasource",
+ "datasource": {
+ "type": "cloudwatch",
+ "uid": "$datasource"
+ },
"definition": "dimension_values($region, AWS/NetworkFirewall, Packets, FirewallName)",
- "description": null,
- "error": null,
- "hide": 0,
"includeAll": false,
"label": "FirewallName",
- "multi": false,
"name": "firewallname",
"options": [],
"query": "dimension_values($region, AWS/NetworkFirewall, Packets, FirewallName)",
"refresh": 1,
"regex": "",
- "skipUrlSync": false,
- "sort": 0,
"type": "query"
},
{
- "allValue": null,
"current": {},
- "datasource": "$datasource",
+ "datasource": {
+ "type": "cloudwatch",
+ "uid": "$datasource"
+ },
"definition": "dimension_values($region, AWS/NetworkFirewall, Packets, AvailabilityZone)",
- "description": null,
- "error": null,
- "hide": 0,
"includeAll": false,
"label": "AvailabilityZone",
- "multi": false,
"name": "availabilityzone",
"options": [],
"query": "dimension_values($region, AWS/NetworkFirewall, Packets, AvailabilityZone)",
"refresh": 1,
"regex": "",
- "skipUrlSync": false,
- "sort": 0,
"type": "query"
},
{
- "allValue": null,
"current": {},
- "datasource": "$datasource",
+ "datasource": {
+ "type": "cloudwatch",
+ "uid": "$datasource"
+ },
"definition": "dimension_values($region, AWS/NetworkFirewall, Packets, Engine)",
- "description": null,
- "error": null,
- "hide": 0,
"includeAll": false,
"label": "Engine",
- "multi": false,
"name": "engine",
"options": [],
"query": "dimension_values($region, AWS/NetworkFirewall, Packets, Engine)",
"refresh": 1,
"regex": "",
- "skipUrlSync": false,
- "sort": 0,
"type": "query"
}
]
@@ -678,33 +626,10 @@
"from": "now-24h",
"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 Network Firewall",
"uid": "_nEZi1V7z",
- "version": 2
+ "version": 5,
+ "weekStart": ""
}
\ No newline at end of file