diff --git a/README.md b/README.md index 5966bb9..9be58bc 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ grafana_host="http://localhost:3000" grafana_cred="admin:admin" # Keep grafana_folder empty for adding the dashboards in "General" folder grafana_folder="AWS CloudWatch" -ds=(1516 677 139 674 590 659 758 623 617 551 653 969 650 644 607 593 707 575 1519 581 584 2969 8050 11099 11154 11155 12979 13018 13040 13104 13892 14189 14391 14392 14954 14955 15016 16899 17741 17978 20007 20008 20009 20144); +ds=(1516 677 139 674 659 758 623 617 551 653 969 650 644 607 593 707 575 1519 581 584 2969 8050 11099 11154 11155 12979 13018 13040 13104 13892 14189 14391 14392 14954 14955 15016 16899 17741 17978 20007 20008 20009 20144); folderId=$(curl -s -k -u "$grafana_cred" $grafana_host/api/folders | jq -r --arg grafana_folder "$grafana_folder" '.[] | select(.title==$grafana_folder).id') if [ -z "$folderId" ] ; then echo "Didn't get folderId" ; else echo "Got folderId $folderId" ; fi for d in "${ds[@]}"; do @@ -111,9 +111,6 @@ Single click provisioning [![Gitpod ready-to-test](https://img.shields.io/badge/ ### [AWS CloudFront](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-cloudfront) [![AWS CloudFront](aws-cloudfront/aws-cloudfront.png)](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-cloudfront) -### [AWS CloudWatch Browser](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-cloudwatch-browser) -[![AWS Cloudwatch Browser](aws-cloudwatch-browser/aws-cloudwatch-browser.png)](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-cloudwatch-browser) - ### [AWS CloudWatch Synthetics](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-cloudwatch-synthetics) [![AWS Cloudwatch Synthetics](aws-cloudwatch-synthetics/aws-cloudwatch-synthetics.png)](https://github.com/monitoringartist/grafana-aws-cloudwatch-dashboards/tree/master/aws-cloudwatch-synthetics) diff --git a/aws-cloudwatch-browser/aws-cloudwatch-browser.json b/aws-cloudwatch-browser/aws-cloudwatch-browser.json deleted file mode 100644 index ba32771..0000000 --- a/aws-cloudwatch-browser/aws-cloudwatch-browser.json +++ /dev/null @@ -1,490 +0,0 @@ -{ - "__inputs": [], - "__requires": [ - { - "type": "datasource", - "id": "cloudwatch", - "name": "CloudWatch", - "version": "1.0.0" - }, - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "6.0.0" - }, - { - "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": "Browse and visualize available AWS Cloudwatch metrics and filters", - "editable": false, - "gnetId": 590, - "graphTooltip": 0, - "id": null, - "iteration": 1569014626163, - "links": [], - "panels": [ - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "editable": true, - "error": false, - "fill": 1, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "h": 7, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 7, - "isNew": true, - "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": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "", - "application": { - "filter": "" - }, - "dimensions": { - "$dimension": "$dimensionvalue" - }, - "expression": "", - "functions": [], - "group": { - "filter": "" - }, - "highResolution": false, - "host": { - "filter": "" - }, - "id": "", - "item": { - "filter": "" - }, - "metricName": "$metric", - "mode": 0, - "namespace": "$namespace", - "options": { - "showDisabledItems": false - }, - "period": "", - "refId": "A", - "region": "$region", - "returnData": false, - "statistics": [ - "Average" - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Metric", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "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": {}, - "gridPos": { - "h": 7, - "w": 24, - "x": 0, - "y": 7 - }, - "id": 8, - "isNew": true, - "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": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "", - "application": { - "filter": "" - }, - "dimensions": {}, - "expression": "", - "functions": [], - "group": { - "filter": "" - }, - "highResolution": false, - "host": { - "filter": "" - }, - "id": "", - "item": { - "filter": "" - }, - "metricName": "$metric", - "mode": 0, - "namespace": "$namespace", - "options": { - "showDisabledItems": false - }, - "period": "", - "refId": "A", - "region": "$region", - "returnData": false, - "statistics": [ - "Average" - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Metric without dimension", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "content": "\nAmazon CloudWatch Namespaces, Dimensions, and Metrics Reference  Note: some metrics may need more dimensions.
\nInstalled from Grafana.com dashboards\n
", - "editable": true, - "error": false, - "gridPos": { - "h": 3, - "w": 24, - "x": 0, - "y": 14 - }, - "id": 2, - "isNew": true, - "links": [], - "mode": "html", - "options": {}, - "title": "Documentation", - "type": "text" - } - ], - "refresh": false, - "schemaVersion": 19, - "style": "dark", - "tags": [ - "monitoringartist", - "cloudwatch" - ], - "templating": { - "list": [ - { - "current": { - "selected": false, - "tags": [], - "text": "cloudwatch-isoc-prd", - "value": "cloudwatch-isoc-prd" - }, - "hide": 0, - "includeAll": false, - "label": "Datasource", - "multi": false, - "name": "datasource", - "options": [], - "query": "cloudwatch", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "type": "datasource" - }, - { - "allValue": null, - "current": {}, - "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": "*", - "current": {}, - "datasource": "$datasource", - "definition": "namespaces()", - "hide": 0, - "includeAll": false, - "label": "Namespace", - "multi": false, - "name": "namespace", - "options": [], - "query": "namespaces()", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": "*", - "current": {}, - "datasource": "$datasource", - "definition": "metrics($namespace)", - "hide": 0, - "includeAll": false, - "label": "Metric", - "multi": false, - "name": "metric", - "options": [], - "query": "metrics($namespace)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "$datasource", - "definition": "dimension_keys($namespace)", - "hide": 0, - "includeAll": false, - "label": "Dimenson key", - "multi": false, - "name": "dimension", - "options": [], - "query": "dimension_keys($namespace)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "$datasource", - "definition": "dimension_values($region, $namespace, $metric, $dimension)", - "hide": 0, - "includeAll": false, - "label": "Dimenson value", - "multi": false, - "name": "dimensionvalue", - "options": [], - "query": "dimension_values($region, $namespace, $metric, $dimension)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "from": "now-30d", - "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": "browser", - "title": "AWS Cloudwatch Browser", - "uid": "AWSCWBrow", - "version": 1 -} diff --git a/aws-cloudwatch-browser/aws-cloudwatch-browser.png b/aws-cloudwatch-browser/aws-cloudwatch-browser.png deleted file mode 100644 index e8db65d..0000000 Binary files a/aws-cloudwatch-browser/aws-cloudwatch-browser.png and /dev/null differ diff --git a/dashboards.libsonnet b/dashboards.libsonnet index 93cf272..56f2ff1 100644 --- a/dashboards.libsonnet +++ b/dashboards.libsonnet @@ -5,7 +5,6 @@ 'aws-billing.json': (import 'aws-billing/aws-billing.json'), 'aws-certificate-manager.json': (import 'aws-certificate-manager/aws-certificate-manager.json'), 'aws-cloudfront.json': (import 'aws-cloudfront/aws-cloudfront.json'), - 'aws-cloudwatch-browser.json': (import 'aws-cloudwatch-browser/aws-cloudwatch-browser.json'), 'aws-cloudwatch-synthetics.json': (import 'aws-cloudwatch-synthetics/aws-cloudwatch-synthetics.json'), 'aws-cloudwatch-usage-metrics.json': (import 'aws-cloudwatch-usage-metrics/aws-cloudwatch-usage-metrics.json'), 'aws-codebuild.json': (import 'aws-codebuild/aws-codebuild.json'),