Skip to content

Commit 1093b04

Browse files
committed
fail2ban: Grafana Panels list "Banned IPs" twice (fixed #139)
1 parent 096e778 commit 1093b04

File tree

2 files changed

+254
-186
lines changed

2 files changed

+254
-186
lines changed

assets/grafana/all-panels-external.json

Lines changed: 127 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"gnetId": null,
8080
"graphTooltip": 0,
8181
"id": null,
82-
"iteration": 1646056879752,
82+
"iteration": 1646056879758,
8383
"links": [],
8484
"liveNow": false,
8585
"panels": [
@@ -9684,69 +9684,141 @@
96849684
"id": 144,
96859685
"panels": [
96869686
{
9687-
"aliasColors": {},
9688-
"bars": false,
9689-
"dashLength": 10,
9690-
"dashes": false,
96919687
"datasource": "${DS_INFLUXDB}",
96929688
"description": "",
96939689
"fieldConfig": {
96949690
"defaults": {
9695-
"custom": {}
9691+
"color": {
9692+
"mode": "palette-classic"
9693+
},
9694+
"custom": {
9695+
"axisLabel": "",
9696+
"axisPlacement": "auto",
9697+
"barAlignment": 0,
9698+
"drawStyle": "line",
9699+
"fillOpacity": 0,
9700+
"gradientMode": "none",
9701+
"hideFrom": {
9702+
"legend": false,
9703+
"tooltip": false,
9704+
"viz": false
9705+
},
9706+
"lineInterpolation": "linear",
9707+
"lineWidth": 1,
9708+
"pointSize": 5,
9709+
"scaleDistribution": {
9710+
"type": "linear"
9711+
},
9712+
"showPoints": "never",
9713+
"spanNulls": true,
9714+
"stacking": {
9715+
"group": "A",
9716+
"mode": "none"
9717+
},
9718+
"thresholdsStyle": {
9719+
"mode": "off"
9720+
}
9721+
},
9722+
"decimals": 0,
9723+
"mappings": [],
9724+
"min": 0,
9725+
"thresholds": {
9726+
"mode": "absolute",
9727+
"steps": [
9728+
{
9729+
"color": "green",
9730+
"value": null
9731+
},
9732+
{
9733+
"color": "red",
9734+
"value": 80
9735+
}
9736+
]
9737+
},
9738+
"unit": "none"
96969739
},
9697-
"overrides": []
9740+
"overrides": [
9741+
{
9742+
"matcher": {
9743+
"id": "byRegexp",
9744+
"options": "/crit/"
9745+
},
9746+
"properties": [
9747+
{
9748+
"id": "color",
9749+
"value": {
9750+
"fixedColor": "#C4162A",
9751+
"mode": "fixed"
9752+
}
9753+
},
9754+
{
9755+
"id": "custom.fillOpacity",
9756+
"value": 0
9757+
},
9758+
{
9759+
"id": "custom.lineStyle",
9760+
"value": {
9761+
"dash": [
9762+
10,
9763+
10
9764+
],
9765+
"fill": "dash"
9766+
}
9767+
}
9768+
]
9769+
},
9770+
{
9771+
"matcher": {
9772+
"id": "byRegexp",
9773+
"options": "/warn/"
9774+
},
9775+
"properties": [
9776+
{
9777+
"id": "color",
9778+
"value": {
9779+
"fixedColor": "#FA6400",
9780+
"mode": "fixed"
9781+
}
9782+
},
9783+
{
9784+
"id": "custom.fillOpacity",
9785+
"value": 0
9786+
},
9787+
{
9788+
"id": "custom.lineStyle",
9789+
"value": {
9790+
"dash": [
9791+
10,
9792+
10
9793+
],
9794+
"fill": "dash"
9795+
}
9796+
}
9797+
]
9798+
}
9799+
]
96989800
},
9699-
"fill": 0,
9700-
"fillGradient": 0,
97019801
"gridPos": {
97029802
"h": 8,
97039803
"w": 12,
97049804
"x": 0,
9705-
"y": 11
9805+
"y": 14
97069806
},
9707-
"hiddenSeries": false,
97089807
"id": 32,
9709-
"legend": {
9710-
"alignAsTable": false,
9711-
"avg": false,
9712-
"current": false,
9713-
"max": false,
9714-
"min": false,
9715-
"rightSide": false,
9716-
"show": true,
9717-
"total": false,
9718-
"values": false
9719-
},
9720-
"lines": true,
9721-
"linewidth": 1,
9722-
"nullPointMode": "null",
9723-
"percentage": false,
9724-
"pluginVersion": "7.1.5",
9725-
"pointradius": 2,
9726-
"points": false,
9727-
"renderer": "flot",
9728-
"seriesOverrides": [
9729-
{
9730-
"$$hashKey": "object:356",
9731-
"alias": "/crit/",
9732-
"color": "#C4162A",
9733-
"dashes": true,
9734-
"fill": 0
9808+
"options": {
9809+
"legend": {
9810+
"calcs": [],
9811+
"displayMode": "list",
9812+
"placement": "bottom"
97359813
},
9736-
{
9737-
"$$hashKey": "object:393",
9738-
"alias": "/warn/",
9739-
"color": "#FA6400",
9740-
"dashes": true,
9741-
"fill": 0
9814+
"tooltip": {
9815+
"mode": "single"
97429816
}
9743-
],
9744-
"spaceLength": 10,
9745-
"stack": false,
9746-
"steppedLine": false,
9817+
},
9818+
"pluginVersion": "8.2.5",
97479819
"targets": [
97489820
{
9749-
"alias": "Banned IPs",
9821+
"alias": "Banned IPs in $tag_metric",
97509822
"groupBy": [
97519823
{
97529824
"params": [
@@ -9875,57 +9947,19 @@
98759947
]
98769948
}
98779949
],
9878-
"thresholds": [],
98799950
"timeFrom": null,
9880-
"timeRegions": [],
98819951
"timeShift": null,
98829952
"title": "Fail2Ban - Banned IPs",
9883-
"tooltip": {
9884-
"shared": true,
9885-
"sort": 0,
9886-
"value_type": "individual"
9887-
},
9888-
"type": "graph",
9889-
"xaxis": {
9890-
"buckets": null,
9891-
"mode": "time",
9892-
"name": null,
9893-
"show": true,
9894-
"values": []
9895-
},
9896-
"yaxes": [
9897-
{
9898-
"$$hashKey": "object:336",
9899-
"decimals": 0,
9900-
"format": "none",
9901-
"label": "",
9902-
"logBase": 1,
9903-
"max": null,
9904-
"min": "0",
9905-
"show": true
9906-
},
9907-
{
9908-
"$$hashKey": "object:337",
9909-
"format": "short",
9910-
"label": null,
9911-
"logBase": 1,
9912-
"max": null,
9913-
"min": null,
9914-
"show": false
9915-
}
9916-
],
9917-
"yaxis": {
9918-
"align": false,
9919-
"alignLevel": null
9920-
}
9953+
"type": "timeseries"
99219954
},
99229955
{
99239956
"datasource": "${DS_INFLUXDB}",
99249957
"description": "",
99259958
"fieldConfig": {
99269959
"defaults": {
99279960
"custom": {
9928-
"align": null
9961+
"align": null,
9962+
"displayMode": "auto"
99299963
},
99309964
"mappings": [],
99319965
"thresholds": {
@@ -9949,16 +9983,16 @@
99499983
"h": 8,
99509984
"w": 12,
99519985
"x": 0,
9952-
"y": 19
9986+
"y": 22
99539987
},
99549988
"id": 187,
99559989
"options": {
99569990
"showHeader": true
99579991
},
9958-
"pluginVersion": "7.1.5",
9992+
"pluginVersion": "8.2.5",
99599993
"targets": [
99609994
{
9961-
"alias": "Banned IPs",
9995+
"alias": "Banned IPs in $tag_metric",
99629996
"groupBy": [
99639997
{
99649998
"params": [
@@ -35492,5 +35526,5 @@
3549235526
"timezone": "",
3549335527
"title": "All Panels",
3549435528
"uid": "all-panels",
35495-
"version": 2
35529+
"version": 3
3549635530
}

0 commit comments

Comments
 (0)