Skip to content

Commit

Permalink
Merge pull request #649 from Boavizta/648
Browse files Browse the repository at this point in the history 
Show API and CloudScanner versions in dasboard, fixes #648
  • Loading branch information
@jnioche
jnioche authored Jan 3, 2025
2 parents 1109158 + a0d94f5 commit 0f1b969
Show file tree
Hide file tree
Showing 2 changed files with 121 additions and 39 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased

_This paragraph may describe WIP/unreleased features. They are merged to main branch but not tagged._
- [Show API and CloudScanner versions in dasboard](https://github.com/Boavizta/cloud-scanner/pull/649)
- [Return API and scanner version in the metrics output](https://github.com/Boavizta/cloud-scanner/issues/266)
- [Upgrade version of BoaviztAPI to 1.3.7 and adjust tests accordingly](https://github.com/Boavizta/cloud-scanner/issues/643)
- [Return API and scanner version in the json output](https://github.com/Boavizta/cloud-scanner/issues/265)
Expand Down
159 changes: 120 additions & 39 deletions dashboard-config/provisioning/dashboards/grafana-dashboard-cloud-impacts.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
"overrides": []
},
"gridPos": {
"h": 5,
"h": 6,
"w": 5,
"x": 0,
"y": 2
Expand Down Expand Up @@ -429,6 +429,99 @@
],
"title": "Number of resources - Running",
"type": "stat"
},
{
"datasource": {
"default": false,
"type": "prometheus",
"uid": "cloud-scanner-prometheus-demo-uid"
},
"description": "",
"fieldConfig": {
"defaults": {
"color": {
"fixedColor": "#5794F2",
"mode": "fixed"
},
"custom": {
"align": "center",
"cellOptions": {
"type": "color-text"
},
"inspect": false
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 3,
"w": 6,
"x": 5,
"y": 5
},
"id": 47,
"options": {
"cellHeight": "md",
"footer": {
"countRows": false,
"fields": "",
"reducer": [
"sum"
],
"show": false
},
"frameIndex": 0,
"showHeader": true
},
"pluginVersion": "11.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "cloud-scanner-prometheus-demo-uid"
},
"disableTextWrap": false,
"editorMode": "code",
"exemplar": false,
"expr": "max(boavizta_number_of_resources_total) by (boaviztapi_version, cloud_scanner_version)\n\n",
"format": "table",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": true,
"legendFormat": "__auto",
"range": false,
"refId": "A",
"useBackend": false
}
],
"transformations": [
{
"id": "filterFieldsByName",
"options": {
"include": {
"names": [
"boaviztapi_version",
"cloud_scanner_version"
]
}
}
}
],
"type": "table"
}
],
"title": "🧭 Overview",
Expand Down Expand Up @@ -459,8 +552,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -476,7 +568,7 @@
"h": 5,
"w": 9,
"x": 0,
"y": 3
"y": 11
},
"id": 21,
"options": {
Expand Down Expand Up @@ -533,8 +625,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand All @@ -546,7 +637,7 @@
"h": 5,
"w": 10,
"x": 9,
"y": 3
"y": 11
},
"id": 29,
"options": {
Expand Down Expand Up @@ -656,8 +747,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -673,7 +763,7 @@
"h": 5,
"w": 9,
"x": 0,
"y": 8
"y": 16
},
"id": 26,
"options": {
Expand Down Expand Up @@ -743,8 +833,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand All @@ -756,7 +845,7 @@
"h": 5,
"w": 10,
"x": 9,
"y": 8
"y": 16
},
"id": 41,
"options": {
Expand Down Expand Up @@ -847,8 +936,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -864,7 +952,7 @@
"h": 5,
"w": 9,
"x": 0,
"y": 14
"y": 22
},
"id": 42,
"links": [
Expand Down Expand Up @@ -929,8 +1017,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand All @@ -942,7 +1029,7 @@
"h": 5,
"w": 10,
"x": 9,
"y": 14
"y": 22
},
"id": 34,
"links": [
Expand Down Expand Up @@ -1057,8 +1144,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -1074,7 +1160,7 @@
"h": 5,
"w": 9,
"x": 0,
"y": 19
"y": 27
},
"id": 27,
"links": [
Expand Down Expand Up @@ -1149,8 +1235,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
}
]
},
Expand All @@ -1162,7 +1247,7 @@
"h": 5,
"w": 10,
"x": 9,
"y": 19
"y": 27
},
"id": 32,
"links": [
Expand Down Expand Up @@ -1292,8 +1377,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -1309,7 +1393,7 @@
"h": 5,
"w": 9,
"x": 0,
"y": 15
"y": 23
},
"id": 28,
"links": [
Expand Down Expand Up @@ -1418,8 +1502,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -1435,7 +1518,7 @@
"h": 5,
"w": 10,
"x": 9,
"y": 15
"y": 23
},
"id": 33,
"links": [
Expand Down Expand Up @@ -1559,8 +1642,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -1576,7 +1658,7 @@
"h": 8,
"w": 12,
"x": 0,
"y": 16
"y": 24
},
"id": 44,
"options": {
Expand Down Expand Up @@ -1662,8 +1744,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand All @@ -1679,7 +1760,7 @@
"h": 8,
"w": 12,
"x": 12,
"y": 16
"y": 24
},
"id": 45,
"options": {
Expand Down Expand Up @@ -1720,7 +1801,7 @@
"type": "row"
}
],
"refresh": "",
"refresh": "5s",
"schemaVersion": 39,
"tags": [],
"templating": {
Expand Down Expand Up @@ -1814,4 +1895,4 @@
"uid": "e2cad6b6-5c70-4bf4-9d8e-6e57dfdfa597",
"version": 2,
"weekStart": ""
}
}

0 comments on commit 0f1b969

Please sign in to comment.