diff --git a/grafana/dashboards/dns-sanity.json b/grafana/dashboards/dns-sanity.json
index e68bf74..50980bd 100644
--- a/grafana/dashboards/dns-sanity.json
+++ b/grafana/dashboards/dns-sanity.json
@@ -24,7 +24,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
- "id": 5,
+ "id": 1,
"links": [],
"liveNow": false,
"panels": [
@@ -733,6 +733,6 @@
"timezone": "",
"title": "DNS sanity",
"uid": "dnsy",
- "version": 2,
+ "version": 8,
"weekStart": ""
}
diff --git a/grafana/dashboards/dovecot.json b/grafana/dashboards/dovecot.json
index e596570..51259ec 100644
--- a/grafana/dashboards/dovecot.json
+++ b/grafana/dashboards/dovecot.json
@@ -24,7 +24,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
- "id": 1,
+ "id": 2,
"links": [],
"liveNow": false,
"panels": [
@@ -982,6 +982,6 @@
"timezone": "",
"title": "dovecot",
"uid": "dvct",
- "version": 3,
+ "version": 12,
"weekStart": ""
}
diff --git a/grafana/dashboards/fail2ban.json b/grafana/dashboards/fail2ban.json
index 0b940b0..170e7de 100644
--- a/grafana/dashboards/fail2ban.json
+++ b/grafana/dashboards/fail2ban.json
@@ -18,7 +18,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
- "id": 2,
+ "id": 3,
"links": [],
"liveNow": false,
"panels": [
@@ -397,6 +397,6 @@
"timezone": "",
"title": "Fail2ban",
"uid": "f2bn",
- "version": 2,
+ "version": 8,
"weekStart": ""
}
diff --git a/grafana/dashboards/main.json b/grafana/dashboards/main.json
index 672d532..3ffa437 100644
--- a/grafana/dashboards/main.json
+++ b/grafana/dashboards/main.json
@@ -24,10 +24,93 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
- "id": 3,
+ "id": 4,
"links": [],
"liveNow": false,
"panels": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "PBFA97CFB590B2093"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "fieldMinMax": false,
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "dark-red",
+ "value": null
+ },
+ {
+ "color": "dark-red",
+ "value": 86400
+ },
+ {
+ "color": "#EAB839",
+ "value": 604800
+ },
+ {
+ "color": "green",
+ "value": 1200000
+ }
+ ]
+ },
+ "unit": "s"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 2,
+ "w": 3,
+ "x": 0,
+ "y": 0
+ },
+ "id": 46,
+ "options": {
+ "colorMode": "value",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "text": {
+ "titleSize": 18,
+ "valueSize": 22
+ },
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "11.0.0",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "PBFA97CFB590B2093"
+ },
+ "editorMode": "code",
+ "expr": "ssl_certificate_expiration_seconds_validity_left",
+ "hide": false,
+ "instant": false,
+ "legendFormat": "\"\"",
+ "range": true,
+ "refId": "B"
+ }
+ ],
+ "title": "TLS Cert Expires In",
+ "type": "stat"
+ },
{
"datasource": {
"type": "prometheus",
@@ -63,8 +146,8 @@
},
"gridPos": {
"h": 5,
- "w": 3,
- "x": 0,
+ "w": 2,
+ "x": 3,
"y": 0
},
"id": 39,
@@ -173,8 +256,8 @@
},
"gridPos": {
"h": 5,
- "w": 3,
- "x": 3,
+ "w": 2,
+ "x": 5,
"y": 0
},
"id": 41,
@@ -279,8 +362,8 @@
},
"gridPos": {
"h": 5,
- "w": 3,
- "x": 6,
+ "w": 2,
+ "x": 7,
"y": 0
},
"id": 43,
@@ -433,7 +516,9 @@
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
+ "exemplar": false,
"expr": "postmaster_unread_emails",
+ "instant": false,
"legendFormat": "Postmaster unread mails",
"range": true,
"refId": "A"
@@ -508,6 +593,87 @@
],
"type": "stat"
},
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "PBFA97CFB590B2093"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "dark-red",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 86400
+ },
+ {
+ "color": "#EAB839",
+ "value": 604800
+ },
+ {
+ "color": "green",
+ "value": 604801
+ }
+ ]
+ },
+ "unit": "dateTimeAsLocal"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 3,
+ "x": 0,
+ "y": 2
+ },
+ "id": 45,
+ "options": {
+ "colorMode": "value",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "text": {
+ "titleSize": 18,
+ "valueSize": 20
+ },
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "11.0.0",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "PBFA97CFB590B2093"
+ },
+ "editorMode": "code",
+ "expr": "ssl_certificate_expiration_date_seconds * 1000",
+ "instant": false,
+ "legendFormat": " ",
+ "range": true,
+ "refId": "A"
+ }
+ ],
+ "title": "TLS Cert Expires On",
+ "type": "stat"
+ },
{
"datasource": {
"type": "prometheus",
@@ -832,112 +998,6 @@
],
"type": "table"
},
- {
- "datasource": {
- "type": "prometheus",
- "uid": "PBFA97CFB590B2093"
- },
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "thresholds"
- },
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "dark-red",
- "value": null
- },
- {
- "color": "red",
- "value": 86400
- },
- {
- "color": "#EAB839",
- "value": 604800
- },
- {
- "color": "green",
- "value": 604801
- }
- ]
- },
- "unit": "dateTimeAsLocal"
- },
- "overrides": [
- {
- "matcher": {
- "id": "byFrameRefID",
- "options": "B"
- },
- "properties": [
- {
- "id": "unit",
- "value": "s"
- }
- ]
- }
- ]
- },
- "gridPos": {
- "h": 2,
- "w": 9,
- "x": 0,
- "y": 5
- },
- "id": 45,
- "options": {
- "colorMode": "value",
- "graphMode": "none",
- "justifyMode": "auto",
- "orientation": "auto",
- "reduceOptions": {
- "calcs": [
- "lastNotNull"
- ],
- "fields": "",
- "values": false
- },
- "showPercentChange": false,
- "text": {
- "titleSize": 18,
- "valueSize": 22
- },
- "textMode": "auto",
- "wideLayout": true
- },
- "pluginVersion": "11.0.0",
- "targets": [
- {
- "datasource": {
- "type": "prometheus",
- "uid": "PBFA97CFB590B2093"
- },
- "editorMode": "code",
- "expr": "ssl_certificate_expiration_date_seconds * 1000",
- "instant": false,
- "legendFormat": "Mailserver Cert Expires On",
- "range": true,
- "refId": "A"
- },
- {
- "datasource": {
- "type": "prometheus",
- "uid": "PBFA97CFB590B2093"
- },
- "editorMode": "code",
- "expr": "ssl_certificate_expiration_seconds_validity_left",
- "hide": false,
- "instant": false,
- "legendFormat": " Expires in",
- "range": true,
- "refId": "B"
- }
- ],
- "type": "stat"
- },
{
"datasource": {
"type": "prometheus",
@@ -1019,7 +1079,7 @@
"h": 6,
"w": 9,
"x": 0,
- "y": 7
+ "y": 5
},
"id": 44,
"options": {
@@ -1389,180 +1449,42 @@
"sortBy": [
{
"desc": true,
- "displayName": "# Attempts"
- }
- ]
- },
- "pluginVersion": "11.0.0",
- "targets": [
- {
- "datasource": {
- "type": "prometheus",
- "uid": "PBFA97CFB590B2093"
- },
- "editorMode": "code",
- "exemplar": false,
- "expr": "dovecot_auth_failures_total",
- "format": "table",
- "instant": true,
- "legendFormat": "__auto",
- "range": false,
- "refId": "A"
- }
- ],
- "title": "Failed logins",
- "transformations": [
- {
- "id": "filterFieldsByName",
- "options": {
- "include": {
- "names": [
- "user",
- "Value"
- ]
- }
- }
- }
- ],
- "type": "table"
- },
- {
- "datasource": {
- "type": "prometheus",
- "uid": "PBFA97CFB590B2093"
- },
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "palette-classic"
- },
- "custom": {
- "axisBorderShow": false,
- "axisCenteredZero": false,
- "axisColorMode": "text",
- "axisLabel": "",
- "axisPlacement": "auto",
- "barAlignment": 0,
- "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": "auto",
- "spanNulls": false,
- "stacking": {
- "group": "A",
- "mode": "none"
- },
- "thresholdsStyle": {
- "mode": "off"
- }
- },
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
- },
- {
- "color": "red",
- "value": 80
- }
- ]
- }
- },
- "overrides": [
- {
- "matcher": {
- "id": "byName",
- "options": "Sieve action duration"
- },
- "properties": [
- {
- "id": "custom.axisPlacement",
- "value": "right"
- },
- {
- "id": "unit",
- "value": "s"
- }
- ]
- }
- ]
- },
- "gridPos": {
- "h": 5,
- "w": 11,
- "x": 13,
- "y": 12
- },
- "id": 38,
- "options": {
- "legend": {
- "calcs": [
- "lastNotNull"
- ],
- "displayMode": "table",
- "placement": "right",
- "showLegend": true
- },
- "tooltip": {
- "maxHeight": 600,
- "mode": "single",
- "sort": "none"
- }
- },
- "targets": [
- {
- "datasource": {
- "type": "prometheus",
- "uid": "PBFA97CFB590B2093"
- },
- "editorMode": "code",
- "expr": "rate(dovecot_sieve_action_count[1m])*60",
- "legendFormat": "Sieve actions",
- "range": true,
- "refId": "A"
- },
- {
- "datasource": {
- "type": "prometheus",
- "uid": "PBFA97CFB590B2093"
- },
- "editorMode": "code",
- "expr": "rate(dovecot_sieve_error_count[1m])*60",
- "hide": false,
- "legendFormat": "Sieve errors",
- "range": true,
- "refId": "B"
- },
+ "displayName": "# Attempts"
+ }
+ ]
+ },
+ "pluginVersion": "11.0.0",
+ "targets": [
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
- "expr": "rate(dovecot_sieve_action_duration_seconds_sum[1m])*60",
- "hide": false,
- "legendFormat": "Sieve action duration",
- "range": true,
- "refId": "C"
+ "exemplar": false,
+ "expr": "dovecot_auth_failures_total",
+ "format": "table",
+ "instant": true,
+ "legendFormat": "__auto",
+ "range": false,
+ "refId": "A"
}
],
- "title": "Sieve",
- "type": "timeseries"
+ "title": "Failed logins",
+ "transformations": [
+ {
+ "id": "filterFieldsByName",
+ "options": {
+ "include": {
+ "names": [
+ "user",
+ "Value"
+ ]
+ }
+ }
+ }
+ ],
+ "type": "table"
},
{
"datasource": {
@@ -1673,10 +1595,10 @@
]
},
"gridPos": {
- "h": 5,
+ "h": 6,
"w": 9,
"x": 0,
- "y": 13
+ "y": 11
},
"id": 40,
"options": {
@@ -1775,30 +1697,6 @@
"title": "Memoy & Swap",
"type": "timeseries"
},
- {
- "datasource": {
- "type": "prometheus",
- "uid": "PBFA97CFB590B2093"
- },
- "gridPos": {
- "h": 2,
- "w": 4,
- "x": 9,
- "y": 15
- },
- "id": 35,
- "options": {
- "code": {
- "language": "plaintext",
- "showLineNumbers": false,
- "showMiniMap": false
- },
- "content": "
\n",
- "mode": "html"
- },
- "pluginVersion": "11.0.0",
- "type": "text"
- },
{
"datasource": {
"type": "prometheus",
@@ -1856,15 +1754,32 @@
]
}
},
- "overrides": []
+ "overrides": [
+ {
+ "matcher": {
+ "id": "byName",
+ "options": "Sieve action duration"
+ },
+ "properties": [
+ {
+ "id": "custom.axisPlacement",
+ "value": "right"
+ },
+ {
+ "id": "unit",
+ "value": "s"
+ }
+ ]
+ }
+ ]
},
"gridPos": {
"h": 5,
- "w": 15,
- "x": 9,
- "y": 17
+ "w": 11,
+ "x": 13,
+ "y": 12
},
- "id": 36,
+ "id": 38,
"options": {
"legend": {
"calcs": [
@@ -1887,8 +1802,8 @@
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
- "expr": "f2b_jail_banned_current",
- "legendFormat": "{{jail}} bans",
+ "expr": "rate(dovecot_sieve_action_count[1m])*60",
+ "legendFormat": "Sieve actions",
"range": true,
"refId": "A"
},
@@ -1898,16 +1813,52 @@
"uid": "PBFA97CFB590B2093"
},
"editorMode": "code",
- "expr": "f2b_jail_failed_current",
+ "expr": "rate(dovecot_sieve_error_count[1m])*60",
"hide": false,
- "legendFormat": "{{jail}} fails",
+ "legendFormat": "Sieve errors",
"range": true,
"refId": "B"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "PBFA97CFB590B2093"
+ },
+ "editorMode": "code",
+ "expr": "rate(dovecot_sieve_action_duration_seconds_sum[1m])*60",
+ "hide": false,
+ "legendFormat": "Sieve action duration",
+ "range": true,
+ "refId": "C"
}
],
- "title": "Fail & Bans count",
+ "title": "Sieve",
"type": "timeseries"
},
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "PBFA97CFB590B2093"
+ },
+ "gridPos": {
+ "h": 2,
+ "w": 4,
+ "x": 9,
+ "y": 15
+ },
+ "id": 35,
+ "options": {
+ "code": {
+ "language": "plaintext",
+ "showLineNumbers": false,
+ "showMiniMap": false
+ },
+ "content": "
\n",
+ "mode": "html"
+ },
+ "pluginVersion": "11.0.0",
+ "type": "text"
+ },
{
"datasource": {
"type": "prometheus",
@@ -2005,10 +1956,10 @@
]
},
"gridPos": {
- "h": 4,
+ "h": 5,
"w": 9,
"x": 0,
- "y": 18
+ "y": 17
},
"id": 42,
"options": {
@@ -2055,6 +2006,115 @@
"title": "Disk usage",
"type": "timeseries"
},
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "PBFA97CFB590B2093"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "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": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 5,
+ "w": 15,
+ "x": 9,
+ "y": 17
+ },
+ "id": 36,
+ "options": {
+ "legend": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "displayMode": "table",
+ "placement": "right",
+ "showLegend": true
+ },
+ "tooltip": {
+ "maxHeight": 600,
+ "mode": "single",
+ "sort": "none"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "PBFA97CFB590B2093"
+ },
+ "editorMode": "code",
+ "expr": "f2b_jail_banned_current",
+ "legendFormat": "{{jail}} bans",
+ "range": true,
+ "refId": "A"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "PBFA97CFB590B2093"
+ },
+ "editorMode": "code",
+ "expr": "f2b_jail_failed_current",
+ "hide": false,
+ "legendFormat": "{{jail}} fails",
+ "range": true,
+ "refId": "B"
+ }
+ ],
+ "title": "Fail & Bans count",
+ "type": "timeseries"
+ },
{
"datasource": {
"type": "prometheus",
@@ -2476,7 +2536,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
},
{
"color": "red",
@@ -2576,7 +2637,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
},
{
"color": "red",
@@ -2677,7 +2739,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
},
{
"color": "red",
@@ -2786,7 +2849,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
},
{
"color": "red",
@@ -2890,7 +2954,8 @@
"mode": "absolute",
"steps": [
{
- "color": "green"
+ "color": "green",
+ "value": null
},
{
"color": "red",
@@ -3006,6 +3071,6 @@
"timezone": "",
"title": "Main",
"uid": "main",
- "version": 6,
+ "version": 19,
"weekStart": ""
}
diff --git a/grafana/dashboards/postfix.json b/grafana/dashboards/postfix.json
index 04f759d..0e29cb5 100644
--- a/grafana/dashboards/postfix.json
+++ b/grafana/dashboards/postfix.json
@@ -26,7 +26,7 @@
"fiscalYearStartMonth": 0,
"gnetId": 10013,
"graphTooltip": 0,
- "id": 4,
+ "id": 5,
"links": [],
"liveNow": false,
"panels": [
@@ -2285,6 +2285,6 @@
"timezone": "",
"title": "Postfix Metrics",
"uid": "psfx",
- "version": 2,
+ "version": 6,
"weekStart": ""
}