Skip to content

Commit

Permalink
Dashboard Certificate Manager update
Browse files Browse the repository at this point in the history
  • Loading branch information
jangaraj committed Dec 22, 2024
1 parent e671eea commit 6efc29c
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 134 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/standards.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"aws-api-gateway/aws-api-gateway.json",
"aws-autoscaling/aws-autoscaling.json",
"aws-billing/aws-billing.json",
"aws-certificate-manager/aws-certificate-manager.json"
]

standard_footer = "<a target=\"_blank\" href=\"http://www.monitoringartist.com\" title=\"Dashboard maintained by Monitoring Artist - DevOps / Docker / Kubernetes / AWS ECS / Google GCP / Zabbix / Zenoss / Terraform / Monitoring\"><img src=\"https://monitoringartist.github.io/monitoring-artist-logo-grafana.png\" height=\"30px\" /></a> | \n<a target=\"_blank\" href=\"https://docs.aws.amazon.com/transfer/latest/userguide/monitoring.html\">AWS CloudWatch Transfer Family documentation</a> | \n<a target=\"_blank\" href=\"https://grafana.com/dashboards/20008\">Installed from Grafana.com dashboards</a>"
Expand Down Expand Up @@ -42,12 +43,12 @@ def validate_config(f, dashboard):
print('Dashboard ' + f + ' is missing tags "monitoringartist","cloudwatch"')

def validate_inputs(f, dashboard):
if len(dashboard["__inputs"]) < 0:
if len(dashboard["__inputs"]) > 0:
print('Dashboard ' + f + ' doesn\'t have empty __inputs')

def validate_schema_version(f, dashboard):
if dashboard["schemaVersion"] < 40:
print('Dashboard ' + f + ' schemaVersion is less thn 40, migrate it')
print('Dashboard ' + f + ' schemaVersion is lower than 40, migrate it')

def validate_title(f, dashboard):
if not dashboard['title'].startswith('AWS '):
Expand Down
Binary file modified aws-billing/aws-billing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
245 changes: 113 additions & 132 deletions aws-certificate-manager/aws-certificate-manager.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"__inputs": [],
"__elements": {},
"__requires": [
{
"type": "datasource",
Expand All @@ -11,26 +12,29 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "7.5.2"
"version": "11.3.1"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"id": "text",
"name": "Text",
"version": ""
},
{
"type": "panel",
"id": "text",
"name": "Text",
"id": "timeseries",
"name": "Time series",
"version": ""
}
],
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"datasource": {
"type": "datasource",
"uid": "grafana"
},
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
Expand All @@ -41,151 +45,147 @@
},
"description": "Visualize AWS Certificate Manager metrics",
"editable": false,
"gnetId": null,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": null,
"iteration": 1617715347127,
"links": [],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
"datasource": {
"uid": "$datasource"
},
"description": "",
"fieldConfig": {
"defaults": {},
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "never",
"spanNulls": true,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"min": 0,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
},
"unit": "none"
},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 0
},
"hiddenSeries": false,
"id": 3,
"legend": {
"alignAsTable": true,
"avg": false,
"current": true,
"max": false,
"min": false,
"show": true,
"sort": "current",
"sortDesc": false,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"nullPointMode": "connected",
"options": {
"alertThreshold": false
"alertThreshold": false,
"legend": {
"calcs": [
"lastNotNull"
],
"displayMode": "table",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "multi",
"sort": "none"
}
},
"percentage": false,
"pluginVersion": "7.5.2",
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"pluginVersion": "11.3.1",
"targets": [
{
"alias": "{{CertificateArn}}",
"datasource": {
"type": "cloudwatch",
"uid": "$datasource"
},
"dimensions": {
"CertificateArn": "$CertificateArn"
},
"expression": "",
"id": "",
"label": "${PROP('Dim.CertificateArn')}",
"matchExact": true,
"metricEditorMode": 0,
"metricName": "DaysToExpiry",
"metricQueryType": 0,
"namespace": "AWS/CertificateManager",
"period": "",
"refId": "A",
"region": "$region",
"statistics": [
"Average"
]
"statistic": "Average"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "DaysToExpiry",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"$$hashKey": "object:180",
"format": "none",
"label": null,
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"$$hashKey": "object:181",
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": false
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
"type": "timeseries"
},
{
"datasource": "",
"editable": true,
"error": false,
"fieldConfig": {
"defaults": {},
"overrides": []
},
"gridPos": {
"h": 3,
"w": 24,
"x": 0,
"y": 9
},
"id": 5,
"isNew": true,
"links": [],
"options": {
"content": "<a href=\"http://www.monitoringartist.com\" target=\"_blank\" title=\"Dashboard maintained by Monitoring Artist - DevOps / Docker / Kubernetes / AWS ECS / Google GCP / Zabbix / Zenoss / Terraform / Monitoring\"><img src=\"https://monitoringartist.github.io/monitoring-artist-logo-grafana.png\" height=\"30px\" /></a> | \n<a target=\"_blank\" href=\"https://docs.aws.amazon.com/acm/latest/userguide/cloudwatch-metrics.html\">AWS CloudWatch Certificate Manager documentation</a> | \n<a target=\"_blank\" href=\"https://grafana.com/dashboards/14189\">Installed from Grafana.com dashboards</a>\n",
"code": {
"language": "plaintext",
"showLineNumbers": false,
"showMiniMap": false
},
"content": "<a target=\"_blank\" href=\"http://www.monitoringartist.com\" title=\"Dashboard maintained by Monitoring Artist - DevOps / Docker / Kubernetes / AWS ECS / Google GCP / Zabbix / Zenoss / Terraform / Monitoring\"><img src=\"https://monitoringartist.github.io/monitoring-artist-logo-grafana.png\" height=\"30px\" /></a> | \n<a target=\"_blank\" href=\"https://docs.aws.amazon.com/acm/latest/userguide/cloudwatch-metrics.html\">AWS CloudWatch Certificate Manager documentation</a> | \n<a target=\"_blank\" href=\"https://grafana.com/dashboards/14189\">Installed from Grafana.com dashboards</a>",
"mode": "html"
},
"pluginVersion": "7.5.2",
"pluginVersion": "11.3.1",
"title": "Documentation",
"type": "text"
}
],
"refresh": false,
"schemaVersion": 27,
"style": "dark",
"refresh": "",
"schemaVersion": 40,
"tags": [
"monitoringartist",
"cloudwatch"
Expand All @@ -194,68 +194,48 @@
"list": [
{
"current": {},
"description": null,
"error": null,
"hide": 0,
"includeAll": false,
"label": "Datasource",
"multi": false,
"name": "datasource",
"options": [],
"query": "cloudwatch",
"queryValue": "hea",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"type": "datasource"
},
{
"allValue": null,
{
"current": {},
"datasource": "$datasource",
"datasource": {
"type": "cloudwatch",
"uid": "$datasource"
},
"definition": "regions()",
"description": null,
"error": null,
"hide": 0,
"includeAll": false,
"label": "Region",
"multi": false,
"name": "region",
"options": [],
"query": "regions()",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
"type": "query"
},
{
"allValue": "*",
"current": {},
"datasource": "$datasource",
"datasource": {
"type": "cloudwatch",
"uid": "$datasource"
},
"definition": "dimension_values($region,AWS/CertificateManager,DaysToExpiry,CertificateArn)",
"description": null,
"error": null,
"hide": 0,
"includeAll": true,
"label": "CertificateArn",
"multi": false,
"name": "CertificateArn",
"options": [],
"query": "dimension_values($region,AWS/CertificateManager,DaysToExpiry,CertificateArn)",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 1,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
"type": "query"
}
]
},
Expand All @@ -267,5 +247,6 @@
"timezone": "browser",
"title": "AWS Certificate Manager",
"uid": "AWSCertMg",
"version": 1
"version": 2,
"weekStart": ""
}
Binary file modified aws-certificate-manager/aws-certificate-manager.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6efc29c

Please sign in to comment.