diff --git a/.gitattributes b/.gitattributes old mode 100755 new mode 100644 diff --git a/.gitignore b/.gitignore index 4afe16df8..1dcbce76d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ tmp *~ *# #* +*.gz diff --git a/README.md b/README.md index 839aa51ce..41cc52370 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is a [BOSH](http://bosh.io/) release for [Prometheus](https://prometheus.io It includes the following [prometheus exporters](https://prometheus.io/docs/instrumenting/exporters/): [Blackbox](https://github.com/prometheus/blackbox_exporter), [BOSH](https://github.com/bosh-prometheus/bosh_exporter), [BOSH TSDB](https://github.com/bosh-prometheus/bosh_tsdb_exporter), [cAdvisor](https://github.com/google/cadvisor), [Cloud Foundry](https://github.com/bosh-prometheus/cf_exporter), [Cloud Foundry Firehose](https://github.com/bosh-prometheus/firehose_exporter), [Collectd](https://github.com/prometheus/collectd_exporter), [Consul](https://github.com/prometheus/consul_exporter), [Credhub](https://github.com/orange-cloudfoundry/credhub_exporter), [Elasticsearch](https://github.com/justwatchcom/elasticsearch_exporter), [Graphite](https://github.com/prometheus/graphite_exporter), [HAProxy](https://github.com/prometheus/haproxy_exporter), [InfluxDB](https://github.com/prometheus/influxdb_exporter), [Kubernetes](https://github.com/kubernetes/kube-state-metrics), [Memcached](https://github.com/prometheus/memcached_exporter), [MongoDB](https://github.com/dcu/mongodb_exporter), [MySQL](https://github.com/prometheus/mysqld_exporter), [NATS](https://github.com/lovoo/nats_exporter), [PostgreSQL](https://github.com/wrouesnel/postgres_exporter), [PushGateway](https://github.com/prometheus/pushgateway), [RabbitMQ](https://github.com/kbudde/rabbitmq_exporter), [Redis](https://github.com/oliver006/redis_exporter), [Shield](https://github.com/bosh-prometheus/shield_exporter), [Stackdriver](https://github.com/frodenas/stackdriver_exporter), [Statsd](https://github.com/prometheus/statsd_exporter), [Vault](https://github.com/grapeshot/vault_exporter). -It includes the following [grafana panels](https://grafana.com/grafana/plugins): [clock](https://grafana.com/grafana/plugins/grafana-clock-panel), [diagram](https://grafana.com/grafana/plugins/jdbranham-diagram-panel), [histogram](https://grafana.com/grafana/plugins/mtanda-histogram-panel), [piechart](https://grafana.com/grafana/plugins/grafana-piechart-panel), [status](https://grafana.com/grafana/plugins/vonage-status-panel), [statusmap](https://grafana.com/grafana/plugins/flant-statusmap-panel), [worldmap](https://grafana.com/grafana/plugins/grafana-worldmap-panel). +It includes the following [grafana panels](https://grafana.com/grafana/plugins): [clock](https://grafana.com/grafana/plugins/grafana-clock-panel), [diagram](https://grafana.com/grafana/plugins/jdbranham-diagram-panel), [histogram](https://grafana.com/grafana/plugins/mtanda-histogram-panel), [status](https://grafana.com/grafana/plugins/vonage-status-panel), [statusmap](https://grafana.com/grafana/plugins/flant-statusmap-panel), [worldmap](https://grafana.com/grafana/plugins/grafana-worldmap-panel). Questions? Pop in our [slack channel](https://cloudfoundry.slack.com/messages/prometheus/)! diff --git a/config/blobs.yml b/config/blobs.yml index ab7195f46..2549736eb 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -70,10 +70,6 @@ grafana_plugins/grafana-clock-panel-v1.1.1.zip: size: 621739 object_id: 9536cd55-c7d9-4f68-56a8-ab4b3f966eba sha: sha256:4af67283bafe5c6ea2ee3a98c31a4f9fa67325ceea9ad7cfb72a61629a544439 -grafana_plugins/grafana-piechart-panel-v1.6.1.zip: - size: 274360 - object_id: 1b54b9da-4c31-45af-50d5-2c94c1ced745 - sha: sha256:eb82bf79fa012ae045a7c270efd85374cc93bab4d9b0bd2a7e03c37145b3da38 grafana_plugins/grafana-worldmap-panel-v0.3.2.zip: size: 2681129 object_id: 48b520b3-8b0a-4b7c-46dd-cd5656914928 diff --git a/jobs/bosh_dashboards/templates/bosh_deployments.json b/jobs/bosh_dashboards/templates/bosh_deployments.json index 5b16e9c40..c7b10cf9e 100644 --- a/jobs/bosh_dashboards/templates/bosh_deployments.json +++ b/jobs/bosh_dashboards/templates/bosh_deployments.json @@ -9,44 +9,53 @@ "pluginName": "Prometheus" } ], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "5.0.4" + "version": "9.3.6" }, { "type": "panel", - "id": "grafana-piechart-panel", - "name": "Pie Chart", - "version": "1.2.0" + "id": "piechart", + "name": "Pie chart", + "version": "" }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", - "version": "5.0.0" + "version": "1.0.0" } ], "annotations": { "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, "type": "dashboard" } ] }, "editable": false, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1523180991549, "links": [ { "asDropdown": true, @@ -69,44 +78,73 @@ "url": "http://bosh.io/docs" } ], + "liveNow": false, "panels": [ { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] }, - "datasource": "${DS_PROMETHEUS}", - "editable": true, - "error": false, - "fontSize": "80%", - "format": "short", "gridPos": { - "h": 7, + "h": 12, "w": 12, "x": 0, "y": 0 }, "id": 6, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "sortDesc": false, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "displayLabels": [], + "legend": { + "displayMode": "table", + "placement": "bottom", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", "expr": "count_values(\"release\", bosh_deployment_release_info{environment=~\"$environment\",bosh_name=~\"$bosh_director\",bosh_deployment=~\"$bosh_deployment\"}) by(bosh_release_name, bosh_release_version)", "intervalFactor": 10, "legendFormat": "{{ bosh_release_name }}/{{ bosh_release_version }}", + "range": true, "refId": "A", "step": 200 } @@ -114,43 +152,68 @@ "timeFrom": "1m", "title": "Releases In Use", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] }, - "datasource": "${DS_PROMETHEUS}", - "editable": true, - "error": false, - "fontSize": "80%", - "format": "short", "gridPos": { - "h": 7, - "w": 12, + "h": 12, + "w": 11, "x": 12, "y": 0 }, "id": 5, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "sortDesc": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "displayLabels": [], + "legend": { + "displayMode": "table", + "placement": "bottom", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "count_values(\"stemcell\", bosh_deployment_stemcell_info{environment=~\"$environment\",bosh_name=~\"$bosh_director\",bosh_deployment=~\"$bosh_deployment\"}) by(bosh_stemcell_name, bosh_stemcell_version)", "intervalFactor": 10, "legendFormat": "{{ bosh_stemcell_name }}/{{ bosh_stemcell_version }}", @@ -159,15 +222,13 @@ } ], "timeFrom": "1m", - "timeShift": null, "title": "Stemcells In Use", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" } ], "refresh": "30s", - "schemaVersion": 16, + "schemaVersion": 37, "style": "dark", "tags": [ "bosh" @@ -175,62 +236,78 @@ "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Environment", "multi": false, "name": "environment", "options": [], - "query": "label_values(bosh_deployment_stemcell_info, environment)", + "query": { + "query": "label_values(bosh_deployment_stemcell_info, environment)", + "refId": "prometheus-environment-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Director", "multi": false, "name": "bosh_director", "options": [], - "query": "label_values(bosh_deployment_stemcell_info{environment=~\"$environment\"}, bosh_name)", + "query": { + "query": "label_values(bosh_deployment_stemcell_info{environment=~\"$environment\"}, bosh_name)", + "refId": "prometheus-bosh_director-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": true, "label": "Deployment", "multi": false, "name": "bosh_deployment", "options": [], - "query": "label_values(bosh_deployment_stemcell_info{environment=~\"$environment\",bosh_name=~\"$bosh_director\"}, bosh_deployment)", + "query": { + "query": "label_values(bosh_deployment_stemcell_info{environment=~\"$environment\",bosh_name=~\"$bosh_director\"}, bosh_deployment)", + "refId": "prometheus-bosh_deployment-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, - "tagValuesQuery": null, - "tags": [], - "tagsQuery": null, "type": "query", "useTags": false } @@ -268,5 +345,6 @@ "timezone": "browser", "title": "BOSH: Deployments", "uid": "bosh_deployments", - "version": 1 + "version": 2, + "weekStart": "" } diff --git a/jobs/cloudfoundry_dashboards/templates/cf_cells_capacity.json b/jobs/cloudfoundry_dashboards/templates/cf_cells_capacity.json index 3e7ad4a2a..727132535 100644 --- a/jobs/cloudfoundry_dashboards/templates/cf_cells_capacity.json +++ b/jobs/cloudfoundry_dashboards/templates/cf_cells_capacity.json @@ -9,56 +9,65 @@ "pluginName": "Prometheus" } ], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "5.0.4" + "version": "9.3.6" }, { "type": "panel", - "id": "grafana-piechart-panel", - "name": "Pie Chart", - "version": "1.2.0" + "id": "graph", + "name": "Graph (old)", + "version": "" }, { "type": "panel", - "id": "graph", - "name": "Graph", - "version": "5.0.0" + "id": "piechart", + "name": "Pie chart", + "version": "" }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", - "version": "5.0.0" + "version": "1.0.0" }, { "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "5.0.0" + "id": "stat", + "name": "Stat", + "version": "" } ], "annotations": { "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, "type": "dashboard" } ] }, "editable": false, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1523192027241, "links": [ { "asDropdown": true, @@ -81,24 +90,46 @@ "url": "https://docs.cloudfoundry.org/loggregator/all_metrics.html" } ], + "liveNow": false, "panels": [ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "${DS_PROMETHEUS}", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "fixedColor": "rgb(31, 120, 193)", + "mode": "fixed" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] }, "gridPos": { "h": 4, @@ -107,42 +138,29 @@ "y": 0 }, "id": 10, - "interval": null, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true + "options": { + "colorMode": "none", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" }, - "tableColumn": "", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "min(count(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(instance))", "intervalFactor": 2, "metric": "firehose_value_metric_rep_capacity_total_containers", @@ -150,37 +168,51 @@ "step": 60 } ], - "thresholds": "", "title": "Number of Cells", "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "stat" }, { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "${DS_PROMETHEUS}", - "format": "mbytes", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(245, 54, 54, 0.9)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 2000 + }, + { + "color": "rgba(50, 172, 45, 0.97)", + "value": 4000 + } + ] + }, + "unit": "mbytes" + }, + "overrides": [] }, "gridPos": { "h": 4, @@ -190,42 +222,29 @@ }, "hideTimeOverride": true, "id": 8, - "interval": null, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" }, - "tableColumn": "", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "min(min(firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(instance))", "format": "time_series", "intervalFactor": 2, @@ -234,39 +253,47 @@ "step": 60 } ], - "thresholds": "2000,4000", - "timeFrom": null, - "timeShift": null, "title": "Cell with Least Remaining Memory", "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "stat" }, { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "${DS_PROMETHEUS}", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] }, "gridPos": { "h": 4, @@ -276,42 +303,29 @@ }, "hideTimeOverride": true, "id": 9, - "interval": null, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "options": { + "colorMode": "none", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "textMode": "name" }, - "tableColumn": "", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "bottomk(1, min(firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_job_ip))", "interval": "", "intervalFactor": 2, @@ -321,32 +335,24 @@ "step": 60 } ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, "title": "Cell with Least Memory", "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "name" + "type": "stat" }, { "aliasColors": {}, "bars": true, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Cumulative used and available MiB of memory to allocate to containers.", "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 5, @@ -354,6 +360,7 @@ "x": 0, "y": 4 }, + "hiddenSeries": false, "id": 3, "legend": { "alignAsTable": true, @@ -370,7 +377,11 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -380,6 +391,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(firehose_value_metric_rep_capacity_total_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip)) - sum(avg(firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip))", "interval": "", "intervalFactor": 2, @@ -388,6 +403,10 @@ "step": 2 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip))", "intervalFactor": 2, "legendFormat": "Available", @@ -396,8 +415,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Total Cell Memory", "tooltip": { "msResolution": false, @@ -408,41 +426,41 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "mbytes", - "label": null, "logBase": 1, - "max": null, "min": 0, "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, "bars": true, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Cumulative used and available MiB of disk to allocate to containers.", "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": {}, "gridPos": { "h": 5, @@ -450,6 +468,7 @@ "x": 0, "y": 9 }, + "hiddenSeries": false, "id": 4, "legend": { "alignAsTable": true, @@ -466,7 +485,11 @@ "linewidth": 2, "links": [], "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -476,6 +499,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(firehose_value_metric_rep_capacity_total_disk{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip)) - sum(avg(firehose_value_metric_rep_capacity_remaining_disk{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip))", "intervalFactor": 2, "legendFormat": "Used", @@ -483,6 +510,10 @@ "step": 2 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(firehose_value_metric_rep_capacity_remaining_disk{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip))", "intervalFactor": 2, "legendFormat": "Available", @@ -491,8 +522,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Total Cell Disk", "tooltip": { "msResolution": false, @@ -503,41 +533,48 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "mbytes", - "label": null, "logBase": 1, - "max": null, "min": 0, "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 - }, - "datasource": "${DS_PROMETHEUS}", - "fontSize": "80%", - "format": "short", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] + }, "gridPos": { "h": 7, "w": 12, @@ -545,21 +582,37 @@ "y": 14 }, "id": 6, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "sortDesc": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"} - firehose_value_metric_rep_capacity_remaining_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_job_ip)", "interval": "", "intervalFactor": 2, @@ -570,19 +623,29 @@ ], "title": "Running Containers Per Cell", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 - }, - "datasource": "${DS_PROMETHEUS}", - "fontSize": "80%", - "format": "mbytes", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] + }, "gridPos": { "h": 7, "w": 12, @@ -590,20 +653,37 @@ "y": 14 }, "id": 7, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(firehose_value_metric_rep_capacity_total_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"} - firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_job_ip)", "format": "time_series", "interval": "", @@ -615,12 +695,11 @@ ], "title": "Memory Used Per Cell", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" } ], "refresh": "30s", - "schemaVersion": 16, + "schemaVersion": 37, "style": "dark", "tags": [ "cf", @@ -629,62 +708,76 @@ "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Environment", "multi": false, "name": "environment", "options": [], - "query": "label_values(firehose_value_metric_rep_capacity_total_containers, environment)", + "query": { + "query": "label_values(firehose_value_metric_rep_capacity_total_containers, environment)", + "refId": "prometheus-environment-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Deployment", "multi": false, "name": "bosh_deployment", "options": [], - "query": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\"}, bosh_deployment)", + "query": { + "query": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\"}, bosh_deployment)", + "refId": "prometheus-bosh_deployment-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, - "tagValuesQuery": null, - "tags": [], - "tagsQuery": null, "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": true, "label": "Job", "multi": true, "name": "bosh_job_name", "options": [], - "query": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\"}, bosh_job_name)", + "query": { + "query": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\"}, bosh_job_name)", + "refId": "prometheus-bosh_job_name-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, - "tagValuesQuery": null, - "tags": [], - "tagsQuery": null, "type": "query", "useTags": false } @@ -722,5 +815,6 @@ "timezone": "browser", "title": "CF: Cells Capacity", "uid": "cf_cells_capacity", - "version": 1 + "version": 3, + "weekStart": "" } diff --git a/jobs/cloudfoundry_dashboards/templates/cf_cells_capacity_v2.json b/jobs/cloudfoundry_dashboards/templates/cf_cells_capacity_v2.json index b4db0b9d6..f749fe275 100644 --- a/jobs/cloudfoundry_dashboards/templates/cf_cells_capacity_v2.json +++ b/jobs/cloudfoundry_dashboards/templates/cf_cells_capacity_v2.json @@ -9,23 +9,24 @@ "pluginName": "Prometheus" } ], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "7.3.3" + "version": "9.3.6" }, { "type": "panel", - "id": "grafana-piechart-panel", - "name": "Pie Chart", - "version": "1.6.1" + "id": "graph", + "name": "Graph (old)", + "version": "" }, { "type": "panel", - "id": "graph", - "name": "Graph", + "id": "piechart", + "name": "Pie chart", "version": "" }, { @@ -34,12 +35,6 @@ "name": "Prometheus", "version": "1.0.0" }, - { - "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "" - }, { "type": "panel", "id": "stat", @@ -51,20 +46,28 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, "type": "dashboard" } ] }, - "editable": true, - "gnetId": null, + "editable": false, + "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1631898322401, "links": [ { "asDropdown": true, @@ -99,31 +102,47 @@ "url": "https://docs.cloudfoundry.org/loggregator/all_metrics.html" } ], + "liveNow": false, "panels": [ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { - "custom": {} + "color": { + "fixedColor": "rgb(31, 120, 193)", + "mode": "fixed" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" }, "overrides": [] }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, "gridPos": { "h": 4, "w": 7, @@ -131,44 +150,29 @@ "y": 0 }, "id": 10, - "interval": null, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "$$hashKey": "object:278", - "name": "value to text", - "value": 1 - }, - { - "$$hashKey": "object:279", - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true + "options": { + "colorMode": "none", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" }, - "tableColumn": "", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "min(count(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(instance))", "interval": "", "intervalFactor": 2, @@ -178,45 +182,52 @@ "step": 60 } ], - "thresholds": "", "title": "Number of Cells", "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "$$hashKey": "object:281", - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "stat" }, { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { - "custom": {} + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(245, 54, 54, 0.9)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 2000 + }, + { + "color": "rgba(50, 172, 45, 0.97)", + "value": 4000 + } + ] + }, + "unit": "mbytes" }, "overrides": [] }, - "format": "mbytes", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, "gridPos": { "h": 4, "w": 7, @@ -225,44 +236,29 @@ }, "hideTimeOverride": true, "id": 8, - "interval": null, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "$$hashKey": "object:266", - "name": "value to text", - "value": 1 - }, - { - "$$hashKey": "object:267", - "name": "range to text", - "value": 2 - } - ], "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" }, - "tableColumn": "", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "min(min(firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(instance))", "format": "time_series", "instant": false, @@ -274,43 +270,32 @@ "step": 60 } ], - "thresholds": "2000,4000", - "timeFrom": null, - "timeShift": null, "title": "Cell with Least Remaining Memory", "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "$$hashKey": "object:269", - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "stat" }, { - "cacheTimeout": null, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { "fixedColor": "blue", "mode": "fixed" }, - "custom": {}, "mappings": [ { - "id": 0, - "op": "=", - "text": "N/A", - "type": 1, - "value": "null" + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" } ], - "nullValueMode": "connected", "thresholds": { "mode": "absolute", "steps": [ @@ -332,7 +317,6 @@ }, "hideTimeOverride": true, "id": 9, - "interval": null, "links": [], "maxDataPoints": 100, "options": { @@ -349,9 +333,13 @@ }, "textMode": "name" }, - "pluginVersion": "7.3.3", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "bottomk(1, min(firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_job_ip))", "instant": true, "interval": "", @@ -362,8 +350,6 @@ "step": 60 } ], - "timeFrom": null, - "timeShift": null, "title": "Cell with Least Memory", "transparent": true, "type": "stat" @@ -373,16 +359,13 @@ "bars": true, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Cumulative used and available MiB of memory to allocate to containers.", "editable": true, "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -413,7 +396,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.3", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -423,6 +406,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(firehose_value_metric_rep_capacity_total_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip)) - sum(avg(firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip))", "interval": "", "intervalFactor": 2, @@ -431,6 +418,10 @@ "step": 2 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip))", "interval": "", "intervalFactor": 2, @@ -440,9 +431,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Total Cell Memory", "tooltip": { "msResolution": false, @@ -453,9 +442,7 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, @@ -463,25 +450,19 @@ { "$$hashKey": "object:325", "format": "mbytes", - "label": null, "logBase": 1, - "max": null, "min": 0, "show": true }, { "$$hashKey": "object:326", "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } ], "yaxis": { - "align": false, - "alignLevel": null + "align": false } }, { @@ -489,16 +470,13 @@ "bars": true, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Cumulative used and available MiB of disk to allocate to containers.", "editable": true, "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, "fill": 1, "fillGradient": 0, "grid": {}, @@ -529,7 +507,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.3", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -539,6 +517,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(firehose_value_metric_rep_capacity_total_disk{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip)) - sum(avg(firehose_value_metric_rep_capacity_remaining_disk{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip))", "interval": "", "intervalFactor": 2, @@ -547,6 +529,10 @@ "step": 2 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(firehose_value_metric_rep_capacity_remaining_disk{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_deployment, bosh_job_name, bosh_job_ip))", "interval": "", "intervalFactor": 2, @@ -556,9 +542,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Total Cell Disk", "tooltip": { "msResolution": false, @@ -569,9 +553,7 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, @@ -579,44 +561,42 @@ { "$$hashKey": "object:80", "format": "mbytes", - "label": null, "logBase": 1, - "max": null, "min": 0, "show": true }, { "$$hashKey": "object:81", "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } ], "yaxis": { - "align": false, - "alignLevel": null + "align": false } }, { - "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { - "custom": {} + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] }, "overrides": [] }, - "fontSize": "80%", - "format": "short", "gridPos": { "h": 10, "w": 6, @@ -624,21 +604,37 @@ "y": 14 }, "id": 6, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "sortDesc": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"} - firehose_value_metric_rep_capacity_remaining_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_job_ip)", "interval": "", "intervalFactor": 2, @@ -649,26 +645,30 @@ ], "title": "Running Containers Per Cell", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { - "custom": {} + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [], + "unit": "decmbytes" }, "overrides": [] }, - "fontSize": "80%", - "format": "mbytes", "gridPos": { "h": 10, "w": 6, @@ -676,70 +676,74 @@ "y": 14 }, "id": 7, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "sort": "current", - "sortDesc": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", "expr": "avg(firehose_value_metric_rep_capacity_total_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"} - firehose_value_metric_rep_capacity_remaining_memory{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_job_ip)", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "{{ bosh_job_ip }}", + "range": true, "refId": "A", "step": 2400 } ], "title": "Memory Used Per Cell", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { + "color": { + "mode": "palette-classic" + }, "custom": { - "align": null, - "filterable": false + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } }, "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } + "unit": "percent" }, "overrides": [] }, - "fontSize": "80%", - "format": "percent", "gridPos": { "h": 10, "w": 6, @@ -747,54 +751,74 @@ "y": 14 }, "id": 12, - "interval": null, - "legend": { - "percentage": false, - "show": true, - "sort": "current", - "sortDesc": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "pluginVersion": "7.3.3", - "strokeWidth": 1, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", "expr": "sum(bosh_job_process_cpu_total{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_job_ip)", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "{{ bosh_job_ip }}", + "range": true, "refId": "A", "step": 2400 } ], "title": "Percent of CPU Used Per Cell", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { - "custom": {} + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [], + "unit": "decmbytes" }, "overrides": [] }, - "fontSize": "80%", - "format": "mbytes", "gridPos": { "h": 10, "w": 6, @@ -802,22 +826,37 @@ "y": 14 }, "id": 11, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "sort": "current", - "sortDesc": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(firehose_value_metric_rep_capacity_total_disk{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"} - firehose_value_metric_rep_capacity_remaining_disk{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\",bosh_job_name=~\"$bosh_job_name\"}) by(bosh_job_ip)", "format": "time_series", "interval": "", @@ -829,12 +868,11 @@ ], "title": "Disk Used Per Cell", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" } ], "refresh": "30s", - "schemaVersion": 26, + "schemaVersion": 37, "style": "dark", "tags": [ "cf", @@ -844,71 +882,76 @@ "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "definition": "label_values(firehose_value_metric_rep_capacity_total_containers, environment)", - "error": null, "hide": 0, "includeAll": false, "label": "Environment", "multi": false, "name": "environment", "options": [], - "query": "label_values(firehose_value_metric_rep_capacity_total_containers, environment)", + "query": { + "query": "label_values(firehose_value_metric_rep_capacity_total_containers, environment)", + "refId": "prometheus-environment-Variable-Query" + }, "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "definition": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\"}, bosh_deployment)", - "error": null, "hide": 0, "includeAll": false, "label": "Deployment", "multi": false, "name": "bosh_deployment", "options": [], - "query": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\"}, bosh_deployment)", + "query": { + "query": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\"}, bosh_deployment)", + "refId": "prometheus-bosh_deployment-Variable-Query" + }, "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 1, - "tagValuesQuery": null, - "tags": [], - "tagsQuery": null, "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "definition": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\"}, bosh_job_name)", - "error": null, "hide": 0, "includeAll": true, "label": "Job", "multi": true, "name": "bosh_job_name", "options": [], - "query": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\"}, bosh_job_name)", + "query": { + "query": "label_values(firehose_value_metric_rep_capacity_total_containers{environment=~\"$environment\",bosh_deployment=~\"${bosh_deployment}\"}, bosh_job_name)", + "refId": "prometheus-bosh_job_name-Variable-Query" + }, "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 1, - "tagValuesQuery": null, - "tags": [], - "tagsQuery": null, "type": "query", "useTags": false } @@ -946,5 +989,6 @@ "timezone": "browser", "title": "CF: Cells Capacity v2", "uid": "cf_cells_capacity_v2", - "version": 2 -} \ No newline at end of file + "version": 3, + "weekStart": "" +} diff --git a/jobs/cloudfoundry_dashboards/templates/cf_organization_summary.json b/jobs/cloudfoundry_dashboards/templates/cf_organization_summary.json index c0b02a724..9da516927 100644 --- a/jobs/cloudfoundry_dashboards/templates/cf_organization_summary.json +++ b/jobs/cloudfoundry_dashboards/templates/cf_organization_summary.json @@ -9,50 +9,59 @@ "pluginName": "Prometheus" } ], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "5.0.4" + "version": "9.3.6" }, { "type": "panel", - "id": "grafana-piechart-panel", - "name": "Pie Chart", - "version": "1.2.0" + "id": "graph", + "name": "Graph (old)", + "version": "" }, { "type": "panel", - "id": "graph", - "name": "Graph", - "version": "5.0.0" + "id": "piechart", + "name": "Pie chart", + "version": "" }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", - "version": "5.0.0" + "version": "1.0.0" } ], "annotations": { "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, "type": "dashboard" } ] }, "editable": false, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1523192749269, "links": [ { "asDropdown": true, @@ -76,21 +85,27 @@ "url": "https://docs.cloudfoundry.org/loggregator/all_metrics.html" } ], + "liveNow": false, "panels": [ { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Total number of running Instances and Quota for this Organization.", "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 12, "x": 0, "y": 0 }, + "hiddenSeries": false, "id": 2, "legend": { "avg": false, @@ -105,7 +120,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -115,6 +134,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_instances{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\",state=\"STARTED\"}) by(application_id))", "interval": "", "intervalFactor": 2, @@ -123,6 +146,10 @@ "step": 4 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(cf_organization_total_app_instances_quota{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\"})", "interval": "", "intervalFactor": 2, @@ -132,8 +159,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Instances", "tooltip": { "shared": true, @@ -143,42 +169,49 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "short", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "description": "State of Applications at this Organization.", - "fontSize": "80%", - "format": "short", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] + }, "gridPos": { "h": 5, "w": 12, @@ -186,20 +219,38 @@ "y": 0 }, "id": 6, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Right side", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "displayLabels": [], + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\"}) by(application_id, state)) by(state) ", "interval": "", "intervalFactor": 2, @@ -210,24 +261,27 @@ ], "title": "State of Applications", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": null, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Total Memory Used by running instances and Quota for this Organization.", "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 12, "x": 0, "y": 5 }, + "hiddenSeries": false, "id": 3, "legend": { "avg": false, @@ -242,7 +296,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -252,6 +310,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_memory_mb{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\"} * on (application_id) cf_application_instances{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\",state=\"STARTED\"}) by(application_id))", "intervalFactor": 2, "legendFormat": "Used", @@ -259,6 +321,10 @@ "step": 4 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(cf_organization_total_memory_mb_quota{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\"})", "interval": "", "intervalFactor": 2, @@ -269,8 +335,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Memory", "tooltip": { "shared": true, @@ -280,45 +345,46 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "mbytes", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Total Disk allocated to running instances for this Organization.", "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 12, "x": 12, "y": 5 }, + "hiddenSeries": false, "id": 4, "legend": { "avg": false, @@ -333,7 +399,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -343,6 +413,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_disk_quota_mb{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\"} * on (application_id) cf_application_instances{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\",state=\"STARTED\"}) by(application_id))", "intervalFactor": 2, "legendFormat": "Used", @@ -351,8 +425,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Disk", "tooltip": { "shared": true, @@ -362,63 +435,87 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "mbytes", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "description": "Stacks used at this Organization.", - "fontSize": "80%", - "format": "short", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] + }, "gridPos": { - "h": 5, + "h": 6, "w": 12, "x": 0, "y": 10 }, "id": 5, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\"}) by(application_id, stack_id)) by(stack_id) * on(stack_id) group_left(stack_name) count(cf_stack_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\"}) by(stack_id, stack_name)", "interval": "", "intervalFactor": 2, @@ -429,41 +526,68 @@ ], "title": "Stacks", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "description": "Buildpacks used at this Organization.", - "fontSize": "80%", - "format": "short", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] + }, "gridPos": { - "h": 5, + "h": 6, "w": 12, "x": 12, "y": 10 }, "id": 1, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}[-0-9a-f]*\",organization_name=~\"$cf_organization_name\"}) by(application_id, buildpack)) by(buildpack)", "interval": "", "intervalFactor": 2, @@ -474,12 +598,11 @@ ], "title": "Buildpacks", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" } ], "refresh": "30s", - "schemaVersion": 16, + "schemaVersion": 37, "style": "dark", "tags": [ "cf" @@ -487,61 +610,79 @@ "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Environment", "multi": false, "name": "environment", "options": [], - "query": "label_values(cf_organization_info, environment)", + "query": { + "query": "label_values(cf_organization_info, environment)", + "refId": "prometheus-environment-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Deployment", "multi": false, "name": "bosh_deployment", "options": [], - "query": "label_values(cf_organization_info{environment=~\"$environment\"}, deployment)", + "query": { + "query": "label_values(cf_organization_info{environment=~\"$environment\"}, deployment)", + "refId": "prometheus-bosh_deployment-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Organization", "multi": false, "name": "cf_organization_name", "options": [], - "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\"}, organization_name)", + "query": { + "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\"}, organization_name)", + "refId": "prometheus-cf_organization_name-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false @@ -580,5 +721,6 @@ "timezone": "browser", "title": "CF: Organization Summary", "uid": "cf_organization_summary", - "version": 1 + "version": 3, + "weekStart": "" } diff --git a/jobs/cloudfoundry_dashboards/templates/cf_space_summary.json b/jobs/cloudfoundry_dashboards/templates/cf_space_summary.json index e116ac938..3f507c019 100644 --- a/jobs/cloudfoundry_dashboards/templates/cf_space_summary.json +++ b/jobs/cloudfoundry_dashboards/templates/cf_space_summary.json @@ -9,50 +9,59 @@ "pluginName": "Prometheus" } ], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "5.0.4" + "version": "9.3.6" }, { "type": "panel", - "id": "grafana-piechart-panel", - "name": "Pie Chart", - "version": "1.2.0" + "id": "graph", + "name": "Graph (old)", + "version": "" }, { "type": "panel", - "id": "graph", - "name": "Graph", - "version": "5.0.0" + "id": "piechart", + "name": "Pie chart", + "version": "" }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", - "version": "5.0.0" + "version": "1.0.0" } ], "annotations": { "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, "type": "dashboard" } ] }, "editable": false, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1523192944753, "links": [ { "asDropdown": true, @@ -76,21 +85,27 @@ "url": "https://docs.cloudfoundry.org/loggregator/all_metrics.html" } ], + "liveNow": false, "panels": [ { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Total number of running Instances and Quota for this Space.", "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 12, "x": 0, "y": 0 }, + "hiddenSeries": false, "id": 2, "legend": { "avg": false, @@ -105,7 +120,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -115,6 +134,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_instances{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\",state=\"STARTED\"}) by(application_id))", "interval": "", "intervalFactor": 2, @@ -123,6 +146,10 @@ "step": 4 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(cf_space_total_app_instances_quota{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"})", "interval": "", "intervalFactor": 2, @@ -132,8 +159,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Instances", "tooltip": { "shared": true, @@ -143,42 +169,49 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "short", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "description": "State of Applications at this Space.", - "fontSize": "80%", - "format": "short", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] + }, "gridPos": { "h": 5, "w": 12, @@ -186,20 +219,37 @@ "y": 0 }, "id": 6, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Right side", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"}) by(application_id, state)) by(state) ", "interval": "", "intervalFactor": 2, @@ -210,24 +260,27 @@ ], "title": "State of Applications", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "decimals": null, + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Total Memory Used by running instances and Quota for this Space.", "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 12, "x": 0, "y": 5 }, + "hiddenSeries": false, "id": 3, "legend": { "avg": false, @@ -242,7 +295,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -252,6 +309,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_memory_mb{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"} * on (application_id) cf_application_instances{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\",state=\"STARTED\"}) by(application_id))", "intervalFactor": 2, "legendFormat": "Used", @@ -259,6 +320,10 @@ "step": 4 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(cf_space_total_memory_mb_quota{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"})", "interval": "", "intervalFactor": 2, @@ -269,8 +334,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Memory", "tooltip": { "shared": true, @@ -280,45 +344,46 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "mbytes", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Total Disk allocated to running instances for this Space.", "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 12, "x": 12, "y": 5 }, + "hiddenSeries": false, "id": 4, "legend": { "avg": false, @@ -333,7 +398,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -343,6 +412,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_disk_quota_mb{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"} * on (application_id) cf_application_instances{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\",state=\"STARTED\"}) by(application_id))", "intervalFactor": 2, "legendFormat": "Used", @@ -351,8 +424,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Disk", "tooltip": { "shared": true, @@ -362,44 +434,45 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "mbytes", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 12, "x": 0, "y": 10 }, + "hiddenSeries": false, "id": 7, "legend": { "avg": false, @@ -414,7 +487,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -424,6 +501,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_route_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",space_id=~\"$cf_space_id\"}) by(route_id))", "interval": "", "intervalFactor": 2, @@ -432,6 +513,10 @@ "step": 4 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(cf_space_total_routes_quota{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"})", "intervalFactor": 2, "legendFormat": "Quota", @@ -440,8 +525,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Routes", "tooltip": { "shared": true, @@ -451,44 +535,45 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "short", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 5, "w": 12, "x": 12, "y": 10 }, + "hiddenSeries": false, "id": 8, "legend": { "avg": false, @@ -503,7 +588,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -513,6 +602,10 @@ "steppedLine": false, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_service_instance_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",space_id=~\"$cf_space_id\"}) by(service_instance_id))", "interval": "", "intervalFactor": 2, @@ -521,6 +614,10 @@ "step": 4 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "avg(cf_space_total_services_quota{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"})", "intervalFactor": 2, "legendFormat": "Quota", @@ -529,8 +626,7 @@ } ], "thresholds": [], - "timeFrom": null, - "timeShift": null, + "timeRegions": [], "title": "Service Instances", "tooltip": { "shared": true, @@ -540,42 +636,49 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "short", - "label": null, "logBase": 1, - "max": null, "min": "0", "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": false } - ] + ], + "yaxis": { + "align": false + } }, { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "description": "Stacks used at this Space.", - "fontSize": "80%", - "format": "short", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] + }, "gridPos": { "h": 5, "w": 12, @@ -583,20 +686,37 @@ "y": 15 }, "id": 5, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"}) by(application_id, stack_id)) by(stack_id) * on(stack_id) group_left(stack_name) count(cf_stack_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\"}) by(stack_id, stack_name)", "interval": "", "intervalFactor": 2, @@ -607,20 +727,30 @@ ], "title": "Stacks", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, - "datasource": "${DS_PROMETHEUS}", "description": "Buildpacks used at this Space.", - "fontSize": "80%", - "format": "short", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] + }, + "overrides": [] + }, "gridPos": { "h": 5, "w": 12, @@ -628,20 +758,37 @@ "y": 15 }, "id": 1, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"}) by(application_id, buildpack)) by(buildpack)", "interval": "", "intervalFactor": 2, @@ -652,12 +799,11 @@ ], "title": "Buildpacks", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" } ], "refresh": "30s", - "schemaVersion": 16, + "schemaVersion": 37, "style": "dark", "tags": [ "cf" @@ -665,121 +811,157 @@ "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Environment", "multi": false, "name": "environment", "options": [], - "query": "label_values(cf_space_info, environment)", + "query": { + "query": "label_values(cf_space_info, environment)", + "refId": "prometheus-environment-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Deployment", "multi": false, "name": "bosh_deployment", "options": [], - "query": "label_values(cf_space_info{environment=~\"$environment\"}, deployment)", + "query": { + "query": "label_values(cf_space_info{environment=~\"$environment\"}, deployment)", + "refId": "prometheus-bosh_deployment-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Organization", "multi": false, "name": "cf_organization_name", "options": [], - "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\"}, organization_name)", + "query": { + "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\"}, organization_name)", + "refId": "prometheus-cf_organization_name-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 2, "includeAll": false, "label": "Organization ID", "multi": false, "name": "cf_organization_id", "options": [], - "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_name=~\"$cf_organization_name\"}, organization_id)", + "query": { + "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_name=~\"$cf_organization_name\"}, organization_id)", + "refId": "prometheus-cf_organization_id-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 0, "includeAll": false, "label": "Space", "multi": false, "name": "cf_space_name", "options": [], - "query": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\"}, space_name)", + "query": { + "query": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\"}, space_name)", + "refId": "prometheus-cf_space_name-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "definition": "", "hide": 2, "includeAll": false, "label": "Space ID", "multi": false, "name": "cf_space_id", "options": [], - "query": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\", space_name=~\"$cf_space_name\"}, space_id)", + "query": { + "query": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\", space_name=~\"$cf_space_name\"}, space_id)", + "refId": "prometheus-cf_space_id-Variable-Query" + }, "refresh": 1, "regex": "", + "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false @@ -818,5 +1000,6 @@ "timezone": "browser", "title": "CF: Space Summary", "uid": "cf_space_summary", - "version": 1 + "version": 3, + "weekStart": "" } diff --git a/jobs/cloudfoundry_dashboards/templates/cf_space_summary_v2.json b/jobs/cloudfoundry_dashboards/templates/cf_space_summary_v2.json index d8c7d6016..a34fa947f 100644 --- a/jobs/cloudfoundry_dashboards/templates/cf_space_summary_v2.json +++ b/jobs/cloudfoundry_dashboards/templates/cf_space_summary_v2.json @@ -9,18 +9,19 @@ "pluginName": "Prometheus" } ], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "7.3.3" + "version": "9.3.6" }, { "type": "panel", - "id": "grafana-piechart-panel", - "name": "Pie Chart", - "version": "1.6.1" + "id": "piechart", + "name": "Pie chart", + "version": "" }, { "type": "datasource", @@ -39,20 +40,28 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, "type": "dashboard" } ] }, - "editable": true, - "gnetId": null, + "editable": false, + "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1631898378939, "links": [ { "asDropdown": true, @@ -88,13 +97,16 @@ "url": "https://docs.cloudfoundry.org/loggregator/all_metrics.html" } ], + "liveNow": false, "panels": [ { - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Total number of running Instances and Quota for this Space.", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -134,9 +146,13 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.3", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_instances{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\",state=\"STARTED\"}) by(application_id))", "interval": "", "intervalFactor": 2, @@ -145,14 +161,15 @@ "step": 4 } ], - "timeFrom": null, - "timeShift": null, "title": "Instances", "transparent": true, "type": "stat" }, { - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Total Memory Used by running instances and Quota for this Space.", "fieldConfig": { "defaults": { @@ -160,7 +177,6 @@ "fixedColor": "green", "mode": "fixed" }, - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -197,9 +213,13 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.3", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_memory_mb{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"} * on (application_id) cf_application_instances{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\",state=\"STARTED\"}) by(application_id))", "interval": "", "intervalFactor": 2, @@ -208,17 +228,17 @@ "step": 4 } ], - "timeFrom": null, - "timeShift": null, "title": "Memory", "transparent": true, "type": "stat" }, { - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -258,9 +278,13 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.3", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_service_instance_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",space_id=~\"$cf_space_id\"}) by(service_instance_id))", "interval": "", "intervalFactor": 2, @@ -269,17 +293,17 @@ "step": 4 } ], - "timeFrom": null, - "timeShift": null, "title": "Service Instances", "transparent": true, "type": "stat" }, { - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -319,9 +343,13 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.3", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_route_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",space_id=~\"$cf_space_id\"}) by(route_id))", "interval": "", "intervalFactor": 2, @@ -330,14 +358,15 @@ "step": 4 } ], - "timeFrom": null, - "timeShift": null, "title": "Routes", "transparent": true, "type": "stat" }, { - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Total Disk allocated to running instances for this Space.", "fieldConfig": { "defaults": { @@ -345,7 +374,6 @@ "fixedColor": "green", "mode": "fixed" }, - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -382,9 +410,13 @@ }, "textMode": "auto" }, - "pluginVersion": "7.3.3", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_disk_quota_mb{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"} * on (application_id) cf_application_instances{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\",state=\"STARTED\"}) by(application_id))", "interval": "", "intervalFactor": 2, @@ -393,30 +425,32 @@ "step": 4 } ], - "timeFrom": null, - "timeShift": null, "title": "Disk", "transparent": true, "type": "stat" }, { - "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 - }, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Stacks used at this Space.", "fieldConfig": { "defaults": { - "custom": {} + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] }, "overrides": [] }, - "fontSize": "80%", - "format": "short", "gridPos": { "h": 7, "w": 7, @@ -424,20 +458,37 @@ "y": 5 }, "id": 5, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"}) by(application_id, stack_id)) by(stack_id) * on(stack_id) group_left(stack_name) count(cf_stack_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\"}) by(stack_id, stack_name)", "interval": "", "intervalFactor": 2, @@ -448,27 +499,30 @@ ], "title": "Stacks", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 - }, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "Buildpacks used at this Space.", "fieldConfig": { "defaults": { - "custom": {} + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] }, "overrides": [] }, - "fontSize": "80%", - "format": "short", "gridPos": { "h": 7, "w": 9, @@ -476,20 +530,37 @@ "y": 5 }, "id": 1, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"}) by(application_id, buildpack)) by(buildpack)", "interval": "", "intervalFactor": 2, @@ -500,27 +571,30 @@ ], "title": "Buildpacks", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" }, { - "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 - }, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "description": "State of Applications at this Space.", "fieldConfig": { "defaults": { - "custom": {} + "color": { + "mode": "palette-classic" + }, + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + } + }, + "mappings": [] }, "overrides": [] }, - "fontSize": "80%", - "format": "short", "gridPos": { "h": 7, "w": 8, @@ -528,20 +602,37 @@ "y": 5 }, "id": 6, - "interval": null, - "legend": { - "percentage": true, - "show": true, - "values": true - }, - "legendType": "Under graph", "links": [], "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "options": { + "legend": { + "displayMode": "table", + "placement": "right", + "showLegend": true, + "values": [ + "percent", + "value" + ] + }, + "pieType": "pie", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(avg(cf_application_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\",organization_id=~\"$cf_organization_id\",space_name=~\"$cf_space_name\"}) by(application_id, state)) by(state) ", "interval": "", "intervalFactor": 2, @@ -552,12 +643,11 @@ ], "title": "State of Applications", "transparent": true, - "type": "grafana-piechart-panel", - "valueName": "current" + "type": "piechart" } ], "refresh": "30s", - "schemaVersion": 26, + "schemaVersion": 37, "style": "dark", "tags": [ "cf", @@ -566,139 +656,157 @@ "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "definition": "label_values(cf_space_info, environment)", - "error": null, "hide": 0, "includeAll": false, "label": "Environment", "multi": false, "name": "environment", "options": [], - "query": "label_values(cf_space_info, environment)", + "query": { + "query": "label_values(cf_space_info, environment)", + "refId": "prometheus-environment-Variable-Query" + }, "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "definition": "label_values(cf_space_info{environment=~\"$environment\"}, deployment)", - "error": null, "hide": 0, "includeAll": false, "label": "Deployment", "multi": false, "name": "bosh_deployment", "options": [], - "query": "label_values(cf_space_info{environment=~\"$environment\"}, deployment)", + "query": { + "query": "label_values(cf_space_info{environment=~\"$environment\"}, deployment)", + "refId": "prometheus-bosh_deployment-Variable-Query" + }, "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "definition": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\"}, organization_name)", - "error": null, "hide": 0, "includeAll": false, "label": "Organization", "multi": false, "name": "cf_organization_name", "options": [], - "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\"}, organization_name)", + "query": { + "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\"}, organization_name)", + "refId": "prometheus-cf_organization_name-Variable-Query" + }, "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "definition": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_name=~\"$cf_organization_name\"}, organization_id)", - "error": null, "hide": 2, "includeAll": false, "label": "Organization ID", "multi": false, "name": "cf_organization_id", "options": [], - "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_name=~\"$cf_organization_name\"}, organization_id)", + "query": { + "query": "label_values(cf_organization_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_name=~\"$cf_organization_name\"}, organization_id)", + "refId": "prometheus-cf_organization_id-Variable-Query" + }, "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "definition": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\"}, space_name)", - "error": null, "hide": 0, "includeAll": false, "label": "Space", "multi": false, "name": "cf_space_name", "options": [], - "query": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\"}, space_name)", + "query": { + "query": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\"}, space_name)", + "refId": "prometheus-cf_space_name-Variable-Query" + }, "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 1, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_PROMETHEUS}", + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "definition": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\", space_name=~\"$cf_space_name\"}, space_id)", - "error": null, "hide": 2, "includeAll": false, "label": "Space ID", "multi": false, "name": "cf_space_id", "options": [], - "query": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\", space_name=~\"$cf_space_name\"}, space_id)", + "query": { + "query": "label_values(cf_space_info{environment=~\"$environment\",deployment=~\"${bosh_deployment}\", organization_id=~\"$cf_organization_id\", space_name=~\"$cf_space_name\"}, space_id)", + "refId": "prometheus-cf_space_id-Variable-Query" + }, "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false @@ -737,5 +845,6 @@ "timezone": "browser", "title": "CF: Space Summary v2", "uid": "cf_space_summary_v2", - "version": 2 -} \ No newline at end of file + "version": 2, + "weekStart": "" +} diff --git a/packages/grafana_plugins/packaging b/packages/grafana_plugins/packaging index ad383696f..bcf46204e 100644 --- a/packages/grafana_plugins/packaging +++ b/packages/grafana_plugins/packaging @@ -8,9 +8,6 @@ unzip ${BOSH_COMPILE_TARGET}/grafana_plugins/flant-statusmap-panel-v0.4.2.zip -d # Unzip Clock Panel unzip ${BOSH_COMPILE_TARGET}/grafana_plugins/grafana-clock-panel-v1.1.1.zip -d ${BOSH_INSTALL_TARGET} -# Unzip Pie Chart Panel -unzip ${BOSH_COMPILE_TARGET}/grafana_plugins/grafana-piechart-panel-v1.6.1.zip -d ${BOSH_INSTALL_TARGET} - # Unzip Worldmap Panel unzip ${BOSH_COMPILE_TARGET}/grafana_plugins/grafana-worldmap-panel-v0.3.2.zip -d ${BOSH_INSTALL_TARGET} diff --git a/packages/grafana_plugins/spec b/packages/grafana_plugins/spec index 5575fc3f6..eef73adcf 100644 --- a/packages/grafana_plugins/spec +++ b/packages/grafana_plugins/spec @@ -5,7 +5,6 @@ files: # https://grafana.com/api/plugins//versions//download - grafana_plugins/flant-statusmap-panel-v0.4.2.zip - grafana_plugins/grafana-clock-panel-v1.1.1.zip - - grafana_plugins/grafana-piechart-panel-v1.6.1.zip - grafana_plugins/grafana-worldmap-panel-v0.3.2.zip - grafana_plugins/jdbranham-diagram-panel-v1.7.1.zip - grafana_plugins/mtanda-histogram-panel-v0.1.6.zip