diff --git a/README.md b/README.md new file mode 100644 index 0000000..fe44b3c --- /dev/null +++ b/README.md @@ -0,0 +1,24 @@ +This is a [BOSH](http://bosh.io/) release for [boshupdate_exporter](https://github.com/orange-cloudfoundry/boshupdate_exporter). + + +## Alerts + +![alert](./docs/alert.png) + +## Dashboards + +### Deployments + +![deployments](./docs/deployments.png) + +### Deployment Bosh Releases + +![deployments_releases](./docs/deployment_releases.png) + +### Canonical Manifests + +![manifests](./docs/manifests.png) + +### Scrapping + +![manifests](./docs/scrapping.png) diff --git a/config/blobs.yml b/config/blobs.yml index f8b2384..a78fd25 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -1,3 +1,3 @@ -boshupdate_exporter/boshupdate_exporter-0.2.0.linux-amd64.tar.gz: - size: 5526012 - sha: c75fbe6c2acd5b148461c45b3beb2f999186230e +boshupdate_exporter/boshupdate_exporter-0.3.0.linux-amd64.tar.gz: + size: 7738537 + sha: 3bb27f3ef61ccb1fdbc41d476d49cb147ab08cde diff --git a/docs/alert.png b/docs/alert.png new file mode 100644 index 0000000..de27798 Binary files /dev/null and b/docs/alert.png differ diff --git a/docs/deployment_releases.png b/docs/deployment_releases.png new file mode 100644 index 0000000..f9a917e Binary files /dev/null and b/docs/deployment_releases.png differ diff --git a/docs/deployments.png b/docs/deployments.png new file mode 100644 index 0000000..30b8794 Binary files /dev/null and b/docs/deployments.png differ diff --git a/docs/manifests.png b/docs/manifests.png new file mode 100644 index 0000000..a3c30f7 Binary files /dev/null and b/docs/manifests.png differ diff --git a/docs/scrapping.png b/docs/scrapping.png new file mode 100644 index 0000000..e07d382 Binary files /dev/null and b/docs/scrapping.png differ diff --git a/jobs/boshupdate_dashboards/templates/boshupdate.json b/jobs/boshupdate_dashboards/templates/boshupdate.json index fcafcfa..07ad2e0 100644 --- a/jobs/boshupdate_dashboards/templates/boshupdate.json +++ b/jobs/boshupdate_dashboards/templates/boshupdate.json @@ -16,6 +16,7 @@ "editable": false, "gnetId": null, "graphTooltip": 0, + "iteration": 1538385700575, "links": [], "panels": [ { @@ -34,7 +35,7 @@ { "columns": [], "datasource": "prometheus", - "fontSize": "100%", + "fontSize": "80%", "gridPos": { "h": 5, "w": 8, @@ -192,7 +193,7 @@ { "columns": [], "datasource": "prometheus", - "fontSize": "100%", + "fontSize": "80%", "gridPos": { "h": 5, "w": 8, @@ -347,7 +348,7 @@ { "columns": [], "datasource": "prometheus", - "fontSize": "100%", + "fontSize": "80%", "gridPos": { "h": 5, "w": 8, @@ -423,7 +424,7 @@ "alias": "Manifest", "colorMode": "row", "colors": [ - "rgba(50, 172, 45, 0.97)", + "#3f6833", "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)" ], @@ -431,11 +432,598 @@ "decimals": 2, "mappingType": 1, "pattern": "_01_manifest", + "thresholds": [ + "50", + "80" + ], + "type": "string", + "unit": "short" + }, + { + "alias": "Deployment", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "_02_deployment", + "thresholds": [], + "type": "number", + "unit": "short" + }, + { + "alias": "Current", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "current", + "thresholds": [], + "type": "number", + "unit": "short" + }, + { + "alias": "Lastest", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "#508642" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "latest", "thresholds": [ "" ], "type": "number", "unit": "short" + } + ], + "targets": [ + { + "expr": "label_replace(\n label_replace(\n min_over_time(boshupdate_deployment_status{environment=~\"$environment\", latest!=\"not-found\"}[2h]) == 0,\n \"_01_manifest\", \"$1\", \"name\", \"(.*)\"),\n \"_02_deployment\", \"$1\", \"deployment\", \"(.*)\")\n * 1000", + "format": "table", + "hide": false, + "instant": true, + "intervalFactor": 1, + "legendFormat": "", + "refId": "A" + } + ], + "title": "Up-to-date", + "transform": "table", + "transparent": false, + "type": "table" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 6 + }, + "id": 17, + "panels": [], + "title": "Deployment Releases", + "type": "row" + }, + { + "columns": [], + "datasource": "prometheus", + "fontSize": "80%", + "gridPos": { + "h": 5, + "w": 12, + "x": 0, + "y": 7 + }, + "id": 15, + "links": [], + "pageSize": null, + "scroll": true, + "showHeader": true, + "sort": { + "col": 2, + "desc": true + }, + "styles": [ + { + "alias": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "hidden" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "mappingType": 1, + "pattern": "/site|environment|job|instance|name/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "Since (days)", + "colorMode": "row", + "colors": [ + "rgba(137, 129, 40, 0.5)", + "rgba(237, 129, 40, 0.5)", + "rgba(245, 54, 54, 0.5)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 0, + "mappingType": 1, + "pattern": "Value", + "thresholds": [ + "15", + "40" + ], + "type": "number", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "deployment", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "Manifest", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "_02_manifest", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Deployment", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "_01_deployment", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Release", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "_03_boshrelease", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Current", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "boshrelease_current", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Latest", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "boshrelease_latest", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "manifest_current", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "manifest_latest", + "thresholds": [], + "type": "hidden", + "unit": "short" + } + ], + "targets": [ + { + "expr": "(time() - \nlabel_replace(\n label_replace(\n label_replace(\n min_over_time(boshupdate_deployment_bosh_release_status{environment=~\"$environment\"}[2h]) > 0,\n \"_02_manifest\", \"$1\", \"manifest_name\", \"(.*)\"),\n \"_03_boshrelease\",\"$1\", \"boshrelease_name\", \"(.*)\"),\n \"_01_deployment\", \"$1\", \"deployment\", \"(.*)\"))\n / 86400", + "format": "table", + "hide": false, + "instant": true, + "intervalFactor": 1, + "legendFormat": "", + "refId": "A" + } + ], + "title": "Out-of-date", + "transform": "table", + "type": "table" + }, + { + "columns": [], + "datasource": "prometheus", + "fontSize": "80%", + "gridPos": { + "h": 5, + "w": 12, + "x": 12, + "y": 7 + }, + "id": 18, + "links": [], + "pageSize": null, + "scroll": true, + "showHeader": true, + "sort": { + "col": 1, + "desc": true + }, + "styles": [ + { + "alias": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "hidden" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "mappingType": 1, + "pattern": "/site|environment|job|instance|name/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "Since (days)", + "colorMode": null, + "colors": [ + "rgba(137, 129, 40, 0.5)", + "rgba(237, 129, 40, 0.5)", + "rgba(245, 54, 54, 0.5)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 0, + "mappingType": 1, + "pattern": "Value", + "thresholds": [ + "15", + "40" + ], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "deployment", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "Manifest", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "_02_manifest", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Deployment", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "_01_deployment", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Release", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "_03_boshrelease", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Current", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "boshrelease_current", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Latest", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "boshrelease_latest", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "manifest_current", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "manifest_lastest", + "thresholds": [], + "type": "hidden", + "unit": "short" + } + ], + "targets": [ + { + "expr": "label_replace(\n label_replace(\n label_replace(\n min_over_time(boshupdate_deployment_bosh_release_status{environment=~\"$environment\", boshrelease_latest=\"not-found\"}[2h]) == 0,\n \"_02_manifest\", \"$1\", \"manifest_name\", \"(.*)\"),\n \"_03_boshrelease\",\"$1\", \"boshrelease_name\", \"(.*)\"),\n \"_01_deployment\", \"$1\", \"deployment\", \"(.*)\")\n* 1000", + "format": "table", + "hide": false, + "instant": true, + "intervalFactor": 1, + "legendFormat": "", + "refId": "A" + } + ], + "title": "Not monitored", + "transform": "table", + "type": "table" + }, + { + "columns": [], + "datasource": "prometheus", + "fontSize": "80%", + "gridPos": { + "h": 5, + "w": 24, + "x": 0, + "y": 12 + }, + "id": 19, + "links": [], + "pageSize": null, + "scroll": true, + "showHeader": true, + "sort": { + "col": 2, + "desc": true + }, + "styles": [ + { + "alias": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "hidden" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "mappingType": 1, + "pattern": "/site|environment|job|instance|name/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "Since (days)", + "colorMode": "row", + "colors": [ + "#3f6833", + "rgba(237, 129, 40, 0.5)", + "rgba(245, 54, 54, 0.5)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 0, + "mappingType": 1, + "pattern": "Value", + "thresholds": [ + "15", + "40" + ], + "type": "number", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "deployment", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "Manifest", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "_02_manifest", + "thresholds": [], + "type": "string", + "unit": "short" }, { "alias": "Deployment", @@ -448,9 +1036,25 @@ "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "mappingType": 1, - "pattern": "_02_deployment", + "pattern": "_01_deployment", "thresholds": [], - "type": "number", + "type": "string", + "unit": "short" + }, + { + "alias": "Release", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "_03_boshrelease", + "thresholds": [], + "type": "string", "unit": "short" }, { @@ -464,33 +1068,63 @@ "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "mappingType": 1, - "pattern": "current", + "pattern": "boshrelease_current", "thresholds": [], - "type": "number", + "type": "string", "unit": "short" }, { - "alias": "Lastest", + "alias": "Latest", "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", - "#508642" + "rgba(50, 172, 45, 0.97)" ], "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "mappingType": 1, - "pattern": "latest", - "thresholds": [ - "" + "pattern": "boshrelease_latest", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" ], - "type": "number", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "manifest_current", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "manifest_lastest", + "thresholds": [], + "type": "hidden", "unit": "short" } ], "targets": [ { - "expr": "label_replace(\n label_replace(\n min_over_time(boshupdate_deployment_status{environment=~\"$environment\", latest!=\"not-found\"}[2h]) == 0,\n \"_01_manifest\", \"$1\", \"name\", \"(.*)\"),\n \"_02_deployment\", \"$1\", \"deployment\", \"(.*)\")\n * 1000", + "expr": "label_replace(\n label_replace(\n label_replace(\n min_over_time(boshupdate_deployment_bosh_release_status{environment=~\"$environment\", boshrelease_latest!=\"not-found\"}[2h]) == 0,\n \"_02_manifest\", \"$1\", \"manifest_name\", \"(.*)\"),\n \"_03_boshrelease\",\"$1\", \"boshrelease_name\", \"(.*)\"),\n \"_01_deployment\", \"$1\", \"deployment\", \"(.*)\")\n * 1000", "format": "table", "hide": false, "instant": true, @@ -501,7 +1135,6 @@ ], "title": "Up-to-date", "transform": "table", - "transparent": false, "type": "table" }, { @@ -510,7 +1143,7 @@ "h": 1, "w": 24, "x": 0, - "y": 6 + "y": 17 }, "id": 8, "panels": [], @@ -520,12 +1153,12 @@ { "columns": [], "datasource": "prometheus", - "fontSize": "100%", + "fontSize": "80%", "gridPos": { - "h": 15, + "h": 5, "w": 12, "x": 0, - "y": 7 + "y": 18 }, "id": 12, "links": [], @@ -612,12 +1245,12 @@ { "columns": [], "datasource": "prometheus", - "fontSize": "100%", + "fontSize": "80%", "gridPos": { - "h": 15, + "h": 5, "w": 12, "x": 12, - "y": 7 + "y": 18 }, "id": 14, "links": [], @@ -792,6 +1425,22 @@ "thresholds": [], "type": "hidden", "unit": "short" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "boshrelease_url", + "thresholds": [], + "type": "hidden", + "unit": "short" } ], "targets": [ @@ -807,6 +1456,192 @@ "title": "Bosh releases", "transform": "table", "type": "table" + }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 23 + }, + "id": 21, + "panels": [], + "title": "Scrapping", + "type": "row" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "prometheus", + "fill": 1, + "gridPos": { + "h": 5, + "w": 12, + "x": 0, + "y": 24 + }, + "id": 23, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": true, + "targets": [ + { + "expr": "boshupdate_last_scrape_duration", + "format": "time_series", + "intervalFactor": 1, + "legendFormat": "{{site}}/{{environment}}/{{job}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Scrape duration (ms)", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "sophia/xmt/boshupdate": "#890f02" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "prometheus", + "fill": 1, + "gridPos": { + "h": 5, + "w": 12, + "x": 12, + "y": 24 + }, + "id": 25, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "rightSide": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "boshupdate_last_scrape_error", + "format": "time_series", + "intervalFactor": 1, + "legendFormat": "{{site}}/{{environment}}/{{job}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Scrape Errors", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "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": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], "schemaVersion": 16, @@ -867,6 +1702,6 @@ }, "timezone": "", "title": "BOSH: Updates", - "uid": "MoAGbW0mz", - "version": 1 -} \ No newline at end of file + "uid": "u51X3Q0mz", + "version": 30 +} diff --git a/packages/boshupdate_exporter/packaging b/packages/boshupdate_exporter/packaging index 4386412..4b8d252 100644 --- a/packages/boshupdate_exporter/packaging +++ b/packages/boshupdate_exporter/packaging @@ -8,5 +8,5 @@ cp -a ${BOSH_COMPILE_TARGET}/common/* ${BOSH_INSTALL_TARGET}/common # Extract boshupdate_exporter package mkdir -p ${BOSH_INSTALL_TARGET}/bin -tar xzvf ${BOSH_COMPILE_TARGET}/boshupdate_exporter/boshupdate_exporter-0.2.0.linux-amd64.tar.gz -cp -a ${BOSH_COMPILE_TARGET}/boshupdate_exporter-0.2.0.linux-amd64/* ${BOSH_INSTALL_TARGET}/bin +tar xzvf ${BOSH_COMPILE_TARGET}/boshupdate_exporter/boshupdate_exporter-0.3.0.linux-amd64.tar.gz +cp -a ${BOSH_COMPILE_TARGET}/boshupdate_exporter-0.3.0.linux-amd64/* ${BOSH_INSTALL_TARGET}/bin diff --git a/packages/boshupdate_exporter/spec b/packages/boshupdate_exporter/spec index ad13b38..f62a895 100644 --- a/packages/boshupdate_exporter/spec +++ b/packages/boshupdate_exporter/spec @@ -3,4 +3,4 @@ name: boshupdate_exporter files: - common/utils.sh - - boshupdate_exporter/boshupdate_exporter-0.2.0.linux-amd64.tar.gz + - boshupdate_exporter/boshupdate_exporter-0.3.0.linux-amd64.tar.gz