diff --git a/Dockerfile.fixinventorybase b/Dockerfile.fixinventorybase index c9a9aa64f4..5a228d61cd 100644 --- a/Dockerfile.fixinventorybase +++ b/Dockerfile.fixinventorybase @@ -11,7 +11,6 @@ ARG AWS_CLI_VERSION=master ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin RUN echo "I am running on ${BUILDPLATFORM}, building for ${TARGETPLATFORM}" - WORKDIR / RUN dnf -y update \ && dnf -y groupinstall "Development Tools" "Development Libraries" \ diff --git a/README.md b/README.md index 7ca86173a0..acb4014980 100644 --- a/README.md +++ b/README.md @@ -9,17 +9,9 @@ [![Known Vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/someengineering/fixinventory/requirements.txt)](https://app.snyk.io/org/some-engineering-inc./projects) [![CodeCoverage](https://codecov.io/gh/someengineering/fixinventory/graph/badge.svg?token=ZEZW5JAR5J)](https://codecov.io/gh/someengineering/fixinventory) -## Table of contents - -* [Overview](#overview) -* [Getting started](#getting-started) -* [Component list](#component-list) -* [Contact](#contact) -* [License](#license) - ## Overview -🔍 Search Infrastructure: Fix Inventory maps out your cloud infrastructure in a [graph](https://inventory.fix.security/concepts/asset-inventory-graph) and provides a simple [search syntax](https://inventory.fix.security/docs/concepts/search). +🔍 Search Infrastructure: Fix Inventory maps out your cloud infrastructure in a [directed acyclic graph](https://inventory.fix.security/concepts/asset-inventory-graph) and provides a simple [search syntax](https://inventory.fix.security/docs/concepts/search). 📊 Generate Reports: Fix Inventory keeps track of and reports infrastructure changes over time, making it easy to [audit resource usage and cleanup](https://inventory.fix.security/docs/concepts/cloud-data-sync). @@ -27,6 +19,7 @@ Currently, Fix Inventory can collect [AWS](plugins/aws), [Google Cloud](plugins/gcp), [DigitalOcean](plugins/digitalocean), [VMWare Vsphere](plugins/vsphere), [OneLogin](plugins/onelogin), and [Slack](plugins/slack) resources. If the cloud you are using is not listed, it is easy to write your own collectors. An example can be found [here](plugins/example_collector). + ## Getting started Continue reading [the Quick Start Guide](https://inventory.fix.security/docs/getting-started/) diff --git a/contrib/grafana-dashboards/fix_age.json b/contrib/grafana-dashboards/fix_age.json deleted file mode 100644 index c6ba147781..0000000000 --- a/contrib/grafana-dashboards/fix_age.json +++ /dev/null @@ -1,660 +0,0 @@ -{ - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "6.7.2" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "limit": 100, - "name": "Annotations & Alerts", - "showIn": 0, - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "id": null, - "iteration": 1586948066910, - "links": [], - "panels": [ - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 12, - "x": 0, - "y": 0 - }, - "hiddenSeries": false, - "id": 24, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "sort": null, - "sortDesc": null, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeat": null, - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_age_range{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=~\"$instance_status\",age=~\"$age\"}[$__interval])) by (cloud,account,age)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{age}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Instances Age", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 12, - "x": 12, - "y": 0 - }, - "hiddenSeries": false, - "id": 26, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": false, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_age_range{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=~\"$instance_status\",age=~\"$age\"}[$__interval])) by (age)", - "format": "time_series", - "instant": false, - "interval": "", - "legendFormat": "{{age}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Instances Age Average", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "cumulative" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "series", - "name": null, - "show": true, - "values": [ - "avg" - ] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 9 - }, - "hiddenSeries": false, - "id": 6, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_volumes_age_range{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=~\"$volumes_status\",age=~\"$age\"}[$__interval])) by (cloud,account,age)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{age}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Volumes Age", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "none", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 9 - }, - "hiddenSeries": false, - "id": 27, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": false, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_volumes_age_range{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=~\"$volumes_status\",age=~\"$age\"}[$__interval])) by (age)", - "format": "time_series", - "instant": false, - "interval": "", - "legendFormat": "{{age}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Volumes Age Average", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "cumulative" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "series", - "name": null, - "show": true, - "values": [ - "avg" - ] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "refresh": "15m", - "schemaVersion": 22, - "style": "dark", - "tags": [ - "fix", - "volumes", - "buckets", - "network" - ], - "templating": { - "list": [ - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(cloud)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Cloud", - "multi": true, - "name": "cloud", - "options": [], - "query": "label_values(cloud)", - "refresh": 1, - "regex": "/^(?!onelogin|slack)/", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total, account)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Account", - "multi": true, - "name": "account", - "options": [], - "query": "label_values(fix_instances_total, account)", - "refresh": 1, - "regex": "/^(?!mesosphere.*)/", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total, region)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Region", - "multi": true, - "name": "region", - "options": [], - "query": "label_values(fix_instances_total, region)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,status)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Instance Status", - "multi": true, - "name": "instance_status", - "options": [], - "query": "label_values(fix_instances_total,status)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_volumes_total,status)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Volumes Status", - "multi": true, - "name": "volumes_status", - "options": [], - "query": "label_values(fix_volumes_total,status)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_volumes_total,type)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Volume Type", - "multi": true, - "name": "volume_types", - "options": [], - "query": "label_values(fix_volumes_total,type)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_age_range,age)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Age", - "multi": true, - "name": "age", - "options": [], - "query": "label_values(fix_instances_age_range,age)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "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" - ] - }, - "timezone": "browser", - "title": "fix - Age", - "uid": "w49-cWjZk", - "variables": { - "list": [] - }, - "version": 9 -} diff --git a/contrib/grafana-dashboards/fix_application.json b/contrib/grafana-dashboards/fix_application.json deleted file mode 100644 index c63d18faa4..0000000000 --- a/contrib/grafana-dashboards/fix_application.json +++ /dev/null @@ -1,1020 +0,0 @@ -{ - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "6.7.2" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "description": "Information about the fix application", - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "id": null, - "links": [], - "panels": [ - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "description": "Time it took the collect() method", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 0, - "y": 0 - }, - "hiddenSeries": false, - "id": 10, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "avg(rate(fix_plugin_aws_collect_seconds_sum[60m])/rate(fix_plugin_aws_collect_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "avg", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "aws_collect", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "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": "${DS_PROMETHEUS}", - "description": "", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 0 - }, - "hiddenSeries": false, - "id": 8, - "legend": { - "alignAsTable": false, - "avg": false, - "current": true, - "max": false, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(process_virtual_memory_bytes{job=\"fix\"}[$__interval])/1024/1024)", - "format": "time_series", - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "virtual", - "refId": "A" - }, - { - "expr": "sum(avg_over_time(process_resident_memory_bytes{job=\"fix\"}[$__interval])/1024/1024)", - "format": "time_series", - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "resident", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Memory usage", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 2, - "format": "decmbytes", - "label": "", - "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": "${DS_PROMETHEUS}", - "description": "", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 0 - }, - "hiddenSeries": false, - "id": 9, - "legend": { - "alignAsTable": false, - "avg": false, - "current": true, - "max": false, - "min": false, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "avg(rate(process_cpu_seconds_total{job=\"fix\"}[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "time", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "CPU time", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 2, - "format": "none", - "label": "", - "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": "${DS_PROMETHEUS}", - "description": "Time it took the collect_*() method", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 0, - "y": 8 - }, - "hiddenSeries": false, - "id": 11, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "avg(rate(fix_plugin_aws_collect_vpcs_seconds_sum[60m])/rate(fix_plugin_aws_collect_subnets_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "vpcs", - "refId": "A" - }, - { - "expr": "avg(rate(fix_plugin_aws_collect_vpcs_seconds_sum[60m])/rate(fix_plugin_aws_collect_subnets_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "subnets", - "refId": "B" - }, - { - "expr": "avg(rate(fix_plugin_aws_collect_route_tables_seconds_sum[60m])/rate(fix_plugin_aws_collect_route_tables_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "route_tables", - "refId": "C" - }, - { - "expr": "avg(rate(fix_plugin_aws_collect_security_groups_seconds_sum[60m])/rate(fix_plugin_aws_collect_security_groups_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "security_groups", - "refId": "D" - }, - { - "expr": "avg(rate(fix_plugin_aws_collect_internet_gateways_seconds_sum[60m])/rate(fix_plugin_aws_collect_internet_gateways_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "internet_gateways", - "refId": "E" - }, - { - "expr": "avg(rate(fix_plugin_aws_collect_instances_seconds_sum[60m])/rate(fix_plugin_aws_collect_instances_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "instances", - "refId": "F" - }, - { - "expr": "avg(rate(fix_plugin_aws_collect_volumes_seconds_sum[60m])/rate(fix_plugin_aws_collect_volumes_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "volumes", - "refId": "G" - }, - { - "expr": "avg(rate(fix_plugin_aws_collect_network_interfaces_seconds_sum[60m])/rate(fix_plugin_aws_collect_network_interfaces_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "network_interfaces", - "refId": "H" - }, - { - "expr": "avg(rate(fix_plugin_aws_collect_buckets_seconds_sum[60m])/rate(fix_plugin_aws_collect_buckets_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "buckets", - "refId": "I" - }, - { - "expr": "avg(rate(fix_plugin_aws_collect_elbs_seconds_sum[60m])/rate(fix_plugin_aws_collect_elbs_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "elbs", - "refId": "J" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "aws_collect_*", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "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": "${DS_PROMETHEUS}", - "description": "Time it took the Graph search() method", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 8 - }, - "hiddenSeries": false, - "id": 3, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "avg(rate(fix_graph_search_seconds_sum[60m])/rate(fix_graph_search_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "avg", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "search", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "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": "${DS_PROMETHEUS}", - "description": "Time it took the Graph search_first() method", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 8 - }, - "hiddenSeries": false, - "id": 2, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "avg(rate(fix_graph_search_first_seconds_sum[60m])/rate(fix_graph_search_first_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "avg", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "search_first", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "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": "${DS_PROMETHEUS}", - "description": "Number of open file descriptors.", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 0, - "y": 16 - }, - "hiddenSeries": false, - "id": 5, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "avg(sum_over_time(process_open_fds{job=\"fix\"}[$__interval]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "open_fds", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "open_fds", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "none", - "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": "${DS_PROMETHEUS}", - "description": "Time it took the GraphContainer update_caches() method", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 16 - }, - "hiddenSeries": false, - "id": 6, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "avg(rate(fix_graph_container_cache_update_sum[60m])/rate(fix_graph_container_cache_update_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "avg", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "container_cache_update", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "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": "${DS_PROMETHEUS}", - "description": "Time it took the Graph search_first_parent_class() method", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 16 - }, - "hiddenSeries": false, - "id": 4, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 3, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "avg(rate(fix_graph_search_first_parent_seconds_sum[60m])/rate(fix_graph_search_first_parent_seconds_count[60m]))", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "avg", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "search_first_parent_class", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "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 - } - } - ], - "refresh": "30m", - "schemaVersion": 22, - "style": "dark", - "tags": [ - "fix", - "stats" - ], - "templating": { - "list": [] - }, - "time": { - "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" - ] - }, - "timezone": "browser", - "title": "fix - Application", - "uid": "mRgQ1vMWk", - "variables": { - "list": [] - }, - "version": 1 -} diff --git a/contrib/grafana-dashboards/fix_details.json b/contrib/grafana-dashboards/fix_details.json deleted file mode 100644 index 3170bc9785..0000000000 --- a/contrib/grafana-dashboards/fix_details.json +++ /dev/null @@ -1,1672 +0,0 @@ -{ - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "6.7.2" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - }, - { - "type": "panel", - "id": "table", - "name": "Table", - "version": "" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "limit": 100, - "name": "Annotations & Alerts", - "showIn": 0, - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "id": null, - "iteration": 1586948839972, - "links": [], - "panels": [ - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 12, - "x": 0, - "y": 0 - }, - "hiddenSeries": false, - "id": 24, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "sort": null, - "sortDesc": null, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeat": null, - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=~\"$instance_status\"}[$__interval])) by (cloud,region,account,type)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}} {{type}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Instances total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 2, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 12, - "x": 12, - "y": 0 - }, - "hiddenSeries": false, - "id": 25, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_hourly_cost_estimate{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", region=~\"$region\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Instances - Cost estimate", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 2, - "format": "currencyUSD", - "label": "Amount / hour", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "columns": [ - { - "text": "Current", - "value": "current" - } - ], - "datasource": "${DS_PROMETHEUS}", - "fontSize": "100%", - "gridPos": { - "h": 8, - "w": 4, - "x": 0, - "y": 9 - }, - "id": 19, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": 1, - "desc": true - }, - "styles": [ - { - "alias": "", - "align": "auto", - "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": [ - { - "expr": "sum(avg_over_time(fix_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=~\"$instance_status\"}[$__interval])) by (cloud, type)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} - {{type}}", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Instances total", - "transform": "timeseries_aggregations", - "transparent": true, - "type": "table" - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 10, - "x": 4, - "y": 9 - }, - "hiddenSeries": false, - "id": 6, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_volumes_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", type=~\"$volume_types\", status=~\"$volumes_status\"}[$__interval])) by (cloud,region,account,type,status)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}} {{type}} {{status}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Volumes total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "none", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 10, - "x": 14, - "y": 9 - }, - "hiddenSeries": false, - "id": 22, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum((avg_over_time(fix_volume_bytes{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", type=~\"$volume_types\", status=~\"$volumes_status\"}[$__interval])/1024/1024/1024)) by (cloud,region,account,type,status)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}} {{type}} {{status}}", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Volumes Size total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 0, - "y": 17 - }, - "hiddenSeries": false, - "id": 27, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_databases_total{cloud=~\"$cloud\", account=~\"$account\"}[$__interval])) by (cloud,account,type,instance_type)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} - {{instance_type}} - {{type}} ", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Databases total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 17 - }, - "hiddenSeries": false, - "id": 28, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_databases_bytes{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])/1024/1024/1024) by (cloud,account,type,instance_type)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} - {{instance_type}} - {{type}} ", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Database bytes", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "gbytes", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 17 - }, - "hiddenSeries": false, - "id": 10, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_subnets_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Subnets total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 0, - "y": 25 - }, - "hiddenSeries": false, - "id": 9, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_buckets_total{cloud=~\"$cloud\", account=~\"$account\"}[$__interval])) by (cloud,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Buckets total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 25 - }, - "hiddenSeries": false, - "id": 26, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_load_balancers_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Loadbalancers total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 25 - }, - "hiddenSeries": false, - "id": 12, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_security_groups_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Security groups total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 0, - "y": 33 - }, - "hiddenSeries": false, - "id": 7, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_network_interfaces_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=~\"$network_interfaces_status\"}[$__interval])) by (cloud,region,account,status)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}} {{status}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Network interfaces total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 33 - }, - "hiddenSeries": false, - "id": 8, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_networks_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Networks total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 33 - }, - "hiddenSeries": false, - "id": 11, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_routing_tables_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Routing tables total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "refresh": "15m", - "schemaVersion": 22, - "style": "dark", - "tags": [ - "fix", - "volumes", - "buckets", - "network" - ], - "templating": { - "list": [ - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,cloud)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Cloud", - "multi": true, - "name": "cloud", - "options": [], - "query": "label_values(fix_instances_total,cloud)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,account)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Account", - "multi": true, - "name": "account", - "options": [], - "query": "label_values(fix_instances_total,account)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,region)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Region", - "multi": true, - "name": "region", - "options": [], - "query": "label_values(fix_instances_total,region)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,status)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Instance Status", - "multi": true, - "name": "instance_status", - "options": [], - "query": "label_values(fix_instances_total,status)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_volumes_total,status)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Volumes Status", - "multi": true, - "name": "volumes_status", - "options": [], - "query": "label_values(fix_volumes_total,status)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_volumes_total,type)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Volume Type", - "multi": true, - "name": "volume_types", - "options": [], - "query": "label_values(fix_volumes_total,type)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_network_interfaces_total,status)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Network Interface Status", - "multi": true, - "name": "network_interfaces_status", - "options": [], - "query": "label_values(fix_network_interfaces_total,status)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "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" - ] - }, - "timezone": "browser", - "title": "fix - Details", - "uid": "qJ24SUgWk", - "variables": { - "list": [] - }, - "version": 2 -} diff --git a/contrib/grafana-dashboards/fix_iam.json b/contrib/grafana-dashboards/fix_iam.json deleted file mode 100644 index 2db0e945d8..0000000000 --- a/contrib/grafana-dashboards/fix_iam.json +++ /dev/null @@ -1,796 +0,0 @@ -{ - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "6.7.2" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "limit": 100, - "name": "Annotations & Alerts", - "showIn": 0, - "type": "dashboard" - } - ] - }, - "description": "See users, roles, accounts, etc", - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "id": null, - "iteration": 1586947911446, - "links": [], - "panels": [ - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 0, - "y": 0 - }, - "hiddenSeries": false, - "id": 29, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_users_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Users total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 0 - }, - "hiddenSeries": false, - "id": 30, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_groups_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Groups total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 0 - }, - "hiddenSeries": false, - "id": 31, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_roles_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Roles total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 0, - "y": 8 - }, - "hiddenSeries": false, - "id": 33, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_access_keys_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Access keys total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 8 - }, - "hiddenSeries": false, - "id": 32, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_instance_profiles_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Instance profiles total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 8 - }, - "hiddenSeries": false, - "id": 34, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": true, - "min": true, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_policies_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,region,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Policies total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "refresh": "15m", - "schemaVersion": 22, - "style": "dark", - "tags": [ - "fix", - "iam", - "users", - "roles", - "accounts", - "policies", - "groups", - "profiles" - ], - "templating": { - "list": [ - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(cloud)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Cloud", - "multi": true, - "name": "cloud", - "options": [], - "query": "label_values(cloud)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(account)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Account", - "multi": true, - "name": "account", - "options": [], - "query": "label_values(account)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(region)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Region", - "multi": true, - "name": "region", - "options": [], - "query": "label_values(region)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "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" - ] - }, - "timezone": "browser", - "title": "fix - IAM", - "uid": "kRHCfjKWk", - "variables": { - "list": [] - }, - "version": 1 -} diff --git a/contrib/grafana-dashboards/fix_instances_costs.json b/contrib/grafana-dashboards/fix_instances_costs.json deleted file mode 100644 index 3fe4618bc8..0000000000 --- a/contrib/grafana-dashboards/fix_instances_costs.json +++ /dev/null @@ -1,307 +0,0 @@ -{ - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "6.7.2" - }, - { - "type": "panel", - "id": "michaeldmoore-multistat-panel", - "name": "Multistat", - "version": "1.2.7" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "id": null, - "iteration": 1586948011633, - "links": [], - "panels": [ - { - "Aggregate": "last", - "BarPadding": 10, - "BaseLineColor": "#ff0000", - "BaseLineValue": 0, - "BaseLineWidth": 1, - "CurveType": "Monotone", - "DateFormat": "YYYY-MM-DD HH:mm:ss", - "DateTimeColName": "Time", - "DotColor": "white", - "DotSize": 10, - "EvenRowColor": "rgba(61, 61, 64, 0.78)", - "FlashHighLimitBar": true, - "FlashLowLimitBar": false, - "GroupColName": "cloud", - "GroupCols": 0, - "GroupGap": 5, - "GroupLabelColor": "#ffffff", - "GroupLabelFontSize": "100%", - "GroupNameFilter": "", - "GroupSortString": "", - "HighAxisColor": "#ffffff", - "HighAxisWidth": 1, - "HighBarColor": "rgb(120, 128, 0)", - "HighLimitBarColor": "#ff0000", - "HighLimitBarFlashColor": "#ffa500", - "HighLimitBarFlashTimeout": 1000, - "HighLimitLineColor": "#ff0000", - "HighLimitValue": 30, - "HighLmitLineWidth": 1, - "HighSideMargin": 22, - "Horizontal": true, - "LabelColName": "account", - "LabelColor": "#ffffff", - "LabelFontSize": "100%", - "LabelMargin": null, - "LabelNameFilter": "", - "LableAngle": 0, - "LineColor": "blue", - "LineWidth": 5, - "LowAxisColor": "#ffffff", - "LowAxisWidth": 1, - "LowBarColor": "teal", - "LowLimitBarColor": "#ff0000", - "LowLimitBarFlashColor": "#ffa500", - "LowLimitBarFlashTimeout": 200, - "LowLimitLineColor": "#ff0000", - "LowLimitValue": null, - "LowLmitLineWidth": 1, - "LowSideMargin": null, - "MaxLineColor": "rgb(74, 232, 12)", - "MaxLineValue": null, - "MaxLineWidth": 1, - "MinLineColor": "#ff0000", - "MinLineValue": 0, - "MinLineWidth": 1, - "OddRowColor": "rgba(33, 33, 34, 0.92)", - "OutOfRangeLabelColor": "#ffffff", - "RecolorHighLimitBar": true, - "RecolorLowLimitBar": false, - "ScaleFactor": 1, - "ShowBars": true, - "ShowBaseLine": true, - "ShowDate": false, - "ShowGroupLabels": true, - "ShowHighLimitLine": true, - "ShowLabels": true, - "ShowLeftAxis": true, - "ShowLines": false, - "ShowLowLimitLine": false, - "ShowMaxLine": false, - "ShowMinLine": true, - "ShowRightAxis": true, - "ShowTooltips": true, - "ShowValues": true, - "SortColName": "Value", - "SortDirection": "descending", - "TZOffsetHours": 0, - "TooltipDateFormat": "YYYY-MM-DD HH:mm:ss", - "ValueColName": "Value", - "ValueColor": "#ffffff", - "ValueDecimals": 2, - "ValueFontSize": "150%", - "ValuePosition": "top", - "datasource": "${DS_PROMETHEUS}", - "description": "", - "gridPos": { - "h": 21, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 21, - "links": [], - "pluginVersion": "6.7.2", - "repeat": null, - "repeatDirection": "v", - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_hourly_cost_estimate{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,account)", - "format": "table", - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{account}}", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Instances costs (est. $ / hour)", - "transparent": true, - "type": "michaeldmoore-multistat-panel" - } - ], - "refresh": "15m", - "schemaVersion": 22, - "style": "dark", - "tags": [ - "fix", - "instances", - "costs" - ], - "templating": { - "list": [ - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,cloud)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Cloud", - "multi": true, - "name": "cloud", - "options": [], - "query": "label_values(fix_instances_total,cloud)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,account)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Account", - "multi": true, - "name": "account", - "options": [], - "query": "label_values(fix_instances_total,account)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,region)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Region", - "multi": true, - "name": "region", - "options": [], - "query": "label_values(fix_instances_total,region)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,type)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Type", - "multi": true, - "name": "type", - "options": [], - "query": "label_values(fix_instances_total,type)", - "refresh": 1, - "regex": "/.*\\..*/", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "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" - ] - }, - "timezone": "browser", - "title": "fix - Instances costs", - "uid": "DkRp5zqWz", - "variables": { - "list": [] - }, - "version": 7 -} diff --git a/contrib/grafana-dashboards/fix_overview.json b/contrib/grafana-dashboards/fix_overview.json deleted file mode 100644 index 7e8a19dda4..0000000000 --- a/contrib/grafana-dashboards/fix_overview.json +++ /dev/null @@ -1,1560 +0,0 @@ -{ - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "6.7.2" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - }, - { - "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "" - }, - { - "type": "panel", - "id": "table", - "name": "Table", - "version": "" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "id": null, - "iteration": 1586947820224, - "links": [], - "panels": [ - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "description": "current value", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 0, - "y": 0 - }, - "hideTimeOverride": true, - "id": 4, - "interval": "", - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "maxPerRow": 6, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "repeat": null, - "repeatDirection": "h", - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"running\"}[$__interval]))", - "format": "time_series", - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": "24h", - "timeShift": null, - "title": "Instances $cloud - running", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "description": "current value", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 4, - "y": 0 - }, - "hideTimeOverride": true, - "id": 28, - "interval": "", - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "maxPerRow": 6, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "repeatDirection": "h", - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(avg_over_time(fix_volumes_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval]))", - "format": "time_series", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": "24h", - "timeShift": null, - "title": "Cloud $cloud - Volumes", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorPostfix": false, - "colorPrefix": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#C4162A" - ], - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "description": "current value", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 8, - "y": 0 - }, - "hideTimeOverride": true, - "id": 32, - "interval": "", - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "maxPerRow": 6, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "repeatDirection": "h", - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(avg_over_time(fix_volumes_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=~\"available\"}[$__interval]))", - "format": "table", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "200,500", - "timeFrom": "24h", - "timeShift": null, - "title": "Cloud $cloud - not used Volumes", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "description": "current value", - "format": "gbytes", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 12, - "y": 0 - }, - "hideTimeOverride": true, - "id": 26, - "interval": "", - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "maxPerRow": 6, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "repeatDirection": "h", - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(avg_over_time(fix_memory_bytes{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval]))/1024/1024/1024", - "format": "time_series", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": "24h", - "timeShift": null, - "title": "Instances $cloud - Memory", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_PROMETHEUS}", - "decimals": 2, - "description": "current value", - "format": "currencyUSD", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 16, - "y": 0 - }, - "hideTimeOverride": true, - "id": 27, - "interval": "", - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "maxPerRow": 6, - "nullPointMode": "connected", - "nullText": null, - "postfix": " / hour", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "repeatDirection": "h", - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_hourly_cost_estimate{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval]))", - "format": "time_series", - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": "24h", - "timeShift": null, - "title": "Instances $cloud - Cost estimate", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "${DS_PROMETHEUS}", - "decimals": 2, - "description": "current value", - "format": "currencyUSD", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 20, - "y": 0 - }, - "hideTimeOverride": true, - "id": 31, - "interval": "", - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "maxPerRow": 6, - "nullPointMode": "connected", - "nullText": null, - "postfix": " / month", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "repeatDirection": "h", - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(avg_over_time(fix_volumes_monthly_cost_estimate{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval]))", - "format": "time_series", - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": "24h", - "timeShift": null, - "title": "Volumes $cloud - Cost estimate", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 12, - "x": 0, - "y": 2 - }, - "hiddenSeries": false, - "id": 2, - "interval": "", - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "sort": null, - "sortDesc": null, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeat": null, - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"running\"}[$__interval])) by (cloud,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Instances total - running", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "none", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 2, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 12, - "x": 12, - "y": 2 - }, - "hiddenSeries": false, - "id": 23, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_hourly_cost_estimate{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Instances - Cost estimate", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "currencyUSD", - "label": "Amount / hour", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": "0", - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 0, - "y": 11 - }, - "hiddenSeries": false, - "id": 29, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [ - { - "alias": "available", - "color": "#C4162A", - "fill": 0, - "stack": false - } - ], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_volumes_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"in-use\"}[$__interval])) by (cloud,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}}", - "refId": "A" - }, - { - "expr": "sum(sum(avg_over_time(fix_volumes_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"available\"}[$__interval])) by (cloud,account))", - "format": "time_series", - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "available", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Volumes total + available", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "none", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 11 - }, - "hiddenSeries": false, - "id": 33, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [ - { - "alias": "available", - "color": "#C4162A", - "fill": 0, - "stack": false - } - ], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_volume_bytes{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"in-use\"}[$__interval])/1024/1024/1024) by (cloud,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}}", - "refId": "A" - }, - { - "expr": "sum(sum(avg_over_time(fix_volume_bytes{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"available\"}[$__interval])/1024/1024/1024) by (cloud,account))", - "format": "time_series", - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "available", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Volumes bytes used + available", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "gbytes", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 3, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 11 - }, - "hiddenSeries": false, - "id": 30, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [ - { - "alias": "available", - "color": "#C4162A", - "fill": 0, - "stack": false - } - ], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_volumes_monthly_cost_estimate{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"in-use\"}[$__interval])) by (cloud,account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}}", - "refId": "A" - }, - { - "expr": "sum(sum(avg_over_time(fix_volumes_monthly_cost_estimate{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"available\"}[$__interval])) by (cloud,account))", - "format": "time_series", - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "available", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Volumes - Costs estimate", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "currencyUSD", - "label": "Amount / month", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "columns": [ - { - "text": "Current", - "value": "current" - } - ], - "datasource": "${DS_PROMETHEUS}", - "fontSize": "100%", - "gridPos": { - "h": 8, - "w": 4, - "x": 0, - "y": 19 - }, - "id": 19, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": 1, - "desc": true - }, - "styles": [ - { - "alias": "", - "align": "auto", - "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": "short" - } - ], - "targets": [ - { - "expr": "sum(avg_over_time(fix_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"running\"}[$__interval])) by (cloud, type)", - "format": "time_series", - "hide": false, - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} - {{type}}", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Instances total - running", - "transform": "timeseries_aggregations", - "transparent": true, - "type": "table" - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 10, - "x": 4, - "y": 19 - }, - "hiddenSeries": false, - "id": 9, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_cores_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud, account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Cores total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "Amount", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": 0, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 10, - "x": 14, - "y": 19 - }, - "hiddenSeries": false, - "id": 22, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 4, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeatDirection": "v", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum((avg_over_time(fix_memory_bytes{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])/1024/1024/1024)) by (cloud, account)", - "format": "time_series", - "instant": false, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}}", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Memory total", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "decimals": 0, - "format": "gbytes", - "label": "Size", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "refresh": "15m", - "schemaVersion": 22, - "style": "dark", - "tags": [ - "fix", - "instances", - "cores", - "memory", - "cost estimate" - ], - "templating": { - "list": [ - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total, cloud)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Cloud", - "multi": true, - "name": "cloud", - "options": [], - "query": "label_values(fix_instances_total, cloud)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total, account)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Account", - "multi": true, - "name": "account", - "options": [], - "query": "label_values(fix_instances_total, account)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total, region)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Region", - "multi": true, - "name": "region", - "options": [], - "query": "label_values(fix_instances_total, region)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "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" - ] - }, - "timezone": "browser", - "title": "fix - Overview", - "uid": "qJ24SUgWs", - "variables": { - "list": [] - }, - "version": 2 -} diff --git a/contrib/grafana-dashboards/fix_quotas.json b/contrib/grafana-dashboards/fix_quotas.json deleted file mode 100644 index 24dc674b12..0000000000 --- a/contrib/grafana-dashboards/fix_quotas.json +++ /dev/null @@ -1,838 +0,0 @@ -{ - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "6.7.2" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - }, - { - "type": "panel", - "id": "table", - "name": "Table", - "version": "" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "id": null, - "iteration": 1586947935858, - "links": [], - "panels": [ - { - "columns": [], - "datasource": "${DS_PROMETHEUS}", - "fontSize": "100%", - "gridPos": { - "h": 11, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 19, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": null, - "desc": false - }, - "styles": [ - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 0, - "pattern": "cloud", - "thresholds": [], - "type": "string", - "unit": "none" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "Time", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "type", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "quota", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "mappingType": 1, - "pattern": "Value #A", - "thresholds": [], - "type": "number", - "unit": "none" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "account", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "running", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "mappingType": 1, - "pattern": "Value #B", - "thresholds": [], - "type": "number", - "unit": "none" - } - ], - "targets": [ - { - "expr": "sort_desc(sum(avg_over_time(fix_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"running\"}[$__interval])) by (cloud, account, region, type))", - "format": "table", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "running", - "refId": "B" - }, - { - "expr": "sum(avg_over_time(fix_instances_quotas_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud, account, region, type)", - "format": "table", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "quota", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Instances quotas", - "transform": "table", - "transparent": true, - "type": "table" - }, - { - "columns": [ - { - "text": "Current", - "value": "current" - } - ], - "datasource": "${DS_PROMETHEUS}", - "description": "Quota is the value for the provisioned volumes size in Tebibyte", - "fontSize": "100%", - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 11 - }, - "id": 20, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": null, - "desc": false - }, - "styles": [ - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 0, - "pattern": "Time", - "thresholds": [], - "type": "hidden", - "unit": "none" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "account", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "cloud", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "type", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "quota", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "mappingType": 1, - "pattern": "Value #A", - "thresholds": [], - "type": "number", - "unit": "gbytes" - }, - { - "alias": "total", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "mappingType": 1, - "pattern": "Value #B", - "thresholds": [], - "type": "number", - "unit": "gbytes" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "region", - "thresholds": [], - "type": "string", - "unit": "short" - } - ], - "targets": [ - { - "expr": "sort_desc(sum(avg_over_time(fix_volume_bytes{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])/1024/1024/1024) by (cloud, account, region, type))", - "format": "table", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "total", - "refId": "B" - }, - { - "expr": "sum(avg_over_time(fix_volumes_quotas_bytes{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])/1024/1024/1024) by (cloud, account, region, type)", - "format": "table", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "quota", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Volumes quotas (TiB)", - "transform": "table", - "transparent": true, - "type": "table" - }, - { - "columns": [ - { - "text": "Current", - "value": "current" - } - ], - "datasource": "${DS_PROMETHEUS}", - "fontSize": "100%", - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 19 - }, - "id": 21, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": null, - "desc": false - }, - "styles": [ - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 0, - "pattern": "Time", - "thresholds": [], - "type": "hidden", - "unit": "none" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "account", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "cloud", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "type", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "quota", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "mappingType": 1, - "pattern": "Value #A", - "thresholds": [], - "type": "number", - "unit": "none" - }, - { - "alias": "total", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "mappingType": 1, - "pattern": "Value #B", - "thresholds": [], - "type": "number", - "unit": "none" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "region", - "thresholds": [], - "type": "string", - "unit": "short" - } - ], - "targets": [ - { - "expr": "sort_desc(sum(avg_over_time(fix_load_balancers_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud, account, region, type))", - "format": "table", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "total", - "refId": "B" - }, - { - "expr": "sum(avg_over_time(fix_load_balancers_quotas_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud, account, region, type)", - "format": "table", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "quota", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Loadbalancers quotas", - "transform": "table", - "transparent": true, - "type": "table" - }, - { - "columns": [ - { - "text": "Current", - "value": "current" - } - ], - "datasource": "${DS_PROMETHEUS}", - "fontSize": "100%", - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 27 - }, - "id": 22, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": null, - "desc": false - }, - "styles": [ - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 0, - "pattern": "Time", - "thresholds": [], - "type": "hidden", - "unit": "none" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "account", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "cloud", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "type", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "quota", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "mappingType": 1, - "pattern": "Value #A", - "thresholds": [], - "type": "number", - "unit": "none" - }, - { - "alias": "total", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "mappingType": 1, - "pattern": "Value #B", - "thresholds": [], - "type": "number", - "unit": "none" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "region", - "thresholds": [], - "type": "string", - "unit": "short" - } - ], - "targets": [ - { - "expr": "sort_desc(sum(avg_over_time(fix_gateways_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud, account, region, type))", - "format": "table", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "total", - "refId": "B" - }, - { - "expr": "sum(avg_over_time(fix_gateways_quotas_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud, account, region, type)", - "format": "table", - "hide": false, - "instant": true, - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "quota", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Gateways quotas", - "transform": "table", - "transparent": true, - "type": "table" - } - ], - "refresh": "15m", - "schemaVersion": 22, - "style": "dark", - "tags": [ - "fix", - "instances", - "volumes", - "quotas" - ], - "templating": { - "list": [ - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,cloud)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Cloud", - "multi": true, - "name": "cloud", - "options": [], - "query": "label_values(fix_instances_total,cloud)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,account)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Account", - "multi": true, - "name": "account", - "options": [], - "query": "label_values(fix_instances_total,account)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,region)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Region", - "multi": true, - "name": "region", - "options": [], - "query": "label_values(fix_instances_total,region)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "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" - ] - }, - "timezone": "browser", - "title": "fix - Quotas", - "uid": "u7gxvFSWz", - "variables": { - "list": [] - }, - "version": 2 -} diff --git a/contrib/grafana-dashboards/fix_reserved_instances.json b/contrib/grafana-dashboards/fix_reserved_instances.json deleted file mode 100644 index 990d4d122c..0000000000 --- a/contrib/grafana-dashboards/fix_reserved_instances.json +++ /dev/null @@ -1,388 +0,0 @@ -{ - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "6.7.2" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - }, - { - "type": "panel", - "id": "table", - "name": "Table", - "version": "" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 1, - "id": null, - "iteration": 1586947986374, - "links": [], - "panels": [ - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "description": "", - "fill": 2, - "fillGradient": 0, - "gridPos": { - "h": 19, - "w": 15, - "x": 0, - "y": 0 - }, - "hiddenSeries": false, - "id": 21, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 4, - "links": [], - "maxPerRow": 4, - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "repeat": null, - "repeatDirection": "h", - "seriesOverrides": [ - { - "alias": "reserved", - "color": "#E02F44", - "fill": 0 - }, - { - "alias": "running", - "color": "#8F3BB8" - }, - { - "alias": "1week_average_running", - "color": "#E0B400", - "fill": 0 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(avg_over_time(fix_reserved_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", type=~\"$type\"}[$__interval])) by (cloud)", - "format": "time_series", - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "reserved", - "refId": "A" - }, - { - "expr": "sum(avg_over_time(fix_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"running\", type=~\"$type\"}[$__interval])) by (cloud)", - "format": "time_series", - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "running", - "refId": "B" - }, - { - "expr": "avg_over_time(sum(avg_over_time(fix_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\", status=\"running\", type=~\"$type\"}[$__interval])) by (cloud)[1w:24h])", - "format": "time_series", - "interval": "60m", - "intervalFactor": 1, - "legendFormat": "1week_average_running", - "refId": "C" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Running instances and reservations", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "none", - "label": "", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "decimals": null, - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "columns": [ - { - "text": "Current", - "value": "current" - } - ], - "datasource": "${DS_PROMETHEUS}", - "fontSize": "100%", - "gridPos": { - "h": 19, - "w": 9, - "x": 15, - "y": 0 - }, - "id": 19, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": 1, - "desc": true - }, - "styles": [ - { - "alias": "", - "align": "auto", - "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": "short" - } - ], - "targets": [ - { - "expr": "sum(avg_over_time(fix_reserved_instances_total{cloud=~\"$cloud\", region=~\"$region\", account=~\"$account\"}[$__interval])) by (cloud, account, region, type)", - "format": "time_series", - "hide": false, - "instant": false, - "interval": "", - "intervalFactor": 1, - "legendFormat": "{{cloud}} {{account}} {{region}} - {{type}}", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Reserved instances total", - "transform": "timeseries_aggregations", - "transparent": true, - "type": "table" - } - ], - "refresh": "15m", - "schemaVersion": 22, - "style": "dark", - "tags": [ - "fix", - "instances", - "reserved" - ], - "templating": { - "list": [ - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,cloud)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Cloud", - "multi": true, - "name": "cloud", - "options": [], - "query": "label_values(fix_instances_total,cloud)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,account)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Account", - "multi": true, - "name": "account", - "options": [], - "query": "label_values(fix_instances_total,account)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,region)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Region", - "multi": true, - "name": "region", - "options": [], - "query": "label_values(fix_instances_total,region)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "label_values(fix_instances_total,type)", - "hide": 0, - "includeAll": true, - "index": -1, - "label": "Type", - "multi": true, - "name": "type", - "options": [], - "query": "label_values(fix_instances_total,type)", - "refresh": 1, - "regex": "/.*\\..*/", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "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" - ] - }, - "timezone": "browser", - "title": "fix - Reserved instances", - "uid": "QiQEh77Zk", - "variables": { - "list": [] - }, - "version": 2 -} diff --git a/fixlib/fixlib/baseresources.py b/fixlib/fixlib/baseresources.py index af4cb99b6c..936ff466cf 100644 --- a/fixlib/fixlib/baseresources.py +++ b/fixlib/fixlib/baseresources.py @@ -1052,15 +1052,6 @@ class BaseQueue(BaseResource): _categories: ClassVar[List[Category]] = [Category.storage] -@define(eq=False, slots=False) -class BaseServerlessFunction(BaseResource): - kind: ClassVar[str] = "serverless_function" - _kind_display: ClassVar[str] = "Serverless Function" - _kind_description: ClassVar[str] = "A serverless function." - _metadata: ClassVar[Dict[str, Any]] = {"icon": "function", "group": "compute"} - _categories: ClassVar[List[Category]] = [Category.compute] - - @define(eq=False, slots=False) class BaseKeyPair(BaseResource): kind: ClassVar[str] = "keypair" @@ -1079,6 +1070,15 @@ class BaseBucketQuota(BaseQuota): _metadata: ClassVar[Dict[str, Any]] = {"icon": "quota", "group": "storage"} +@define(eq=False, slots=False) +class BaseServerlessFunction(BaseResource): + kind: ClassVar[str] = "serverless_function" + _kind_display: ClassVar[str] = "Serverless Function" + _kind_description: ClassVar[str] = "A serverless function." + _metadata: ClassVar[Dict[str, Any]] = {"icon": "function", "group": "compute"} + _categories: ClassVar[List[Category]] = [Category.compute] + + @define(eq=False, slots=False) class BaseNetwork(BaseResource): kind: ClassVar[str] = "network" diff --git a/plugins/digitalocean/fix_plugin_digitalocean/collector.py b/plugins/digitalocean/fix_plugin_digitalocean/collector.py index c504a2749b..f09d45340d 100644 --- a/plugins/digitalocean/fix_plugin_digitalocean/collector.py +++ b/plugins/digitalocean/fix_plugin_digitalocean/collector.py @@ -378,14 +378,14 @@ def collect_resource( kwargs_no_underscore[key[1:]] = value else: kwargs_no_underscore[key] = value - resource_instance = resource_class(**kwargs_no_underscore) - log.debug(f"Adding {resource_instance.rtdname} to the graph") + ri = resource_class(**kwargs_no_underscore) + log.debug(f"Adding {ri.rtdname} to the graph") if dump_resource: log.debug(f"Resource Dump: {pformat(resource_json)}") pr = kwargs.get("_region", self.graph.root) - log.debug(f"Parent resource for {resource_instance.rtdname} automatically set to {pr.rtdname}") - self.graph.add_resource(pr, resource_instance, edge_type=EdgeType.default) + log.debug(f"Parent resource for {ri.rtdname} automatically set to {pr.rtdname}") + self.graph.add_resource(pr, ri, edge_type=EdgeType.default) def add_deferred_connection( search_map: Dict[str, Any], @@ -401,28 +401,20 @@ def add_deferred_connection( if isinstance(value, List): values = value for value in values: - resource_instance.add_deferred_connection( - {attr: value}, - is_parent, - edge_type=edge_type, - ) + ri.add_deferred_connection({attr: value}, is_parent, edge_type=edge_type) elif isinstance(value, str): - resource_instance.add_deferred_connection( - {attr: value}, - is_parent, - edge_type=edge_type, - ) + ri.add_deferred_connection({attr: value}, is_parent, edge_type=edge_type) else: - log.error("Unable to add deferred connection for" f" value {value} of type {type(value)}") + log.error("Failed to add deferred connection for" f" value {value} of type {type(value)}") def add_edge(search_map_key: str, is_parent: bool) -> None: srs = search_results[search_map_key] for sr in srs: if is_parent: src = sr - dst = resource_instance + dst = ri else: - src = resource_instance + src = ri dst = sr self.graph.add_edge(src, dst, edge_type=edge_type) diff --git a/plugins/gcp/fix_plugin_gcp/utils.py b/plugins/gcp/fix_plugin_gcp/utils.py index 31e5652d33..f4fa418796 100644 --- a/plugins/gcp/fix_plugin_gcp/utils.py +++ b/plugins/gcp/fix_plugin_gcp/utils.py @@ -83,7 +83,7 @@ def reload(): def load_credentials(path: str): if len(path) == 0: - return None + return None # No credentials file = os.path.expanduser(path) if os.path.isfile(file): return service_account.Credentials.from_service_account_file(file, scopes=SCOPES)