mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
add a panel header, change memeory usage panel
This commit is contained in:
@@ -34,20 +34,36 @@ grafana:
|
||||
- monint
|
||||
- cpucount
|
||||
panels:
|
||||
cpu_docker_combined_current:
|
||||
row_docker_details:
|
||||
gridPos:
|
||||
x: 0
|
||||
y: 0
|
||||
h: 1
|
||||
w: 24
|
||||
cpu_docker_combined_current:
|
||||
gridPos:
|
||||
x: 0
|
||||
y: 1
|
||||
h: 10
|
||||
w: 24
|
||||
cpu_docker_combined_trend:
|
||||
gridPos:
|
||||
x: 0
|
||||
y: 10
|
||||
y: 11
|
||||
h: 10
|
||||
w: 24
|
||||
memory_used_docker_combined_current:
|
||||
gridPos:
|
||||
x: 0
|
||||
y: 21
|
||||
h: 10
|
||||
w: 24
|
||||
memory_used_docker_combined_trend:
|
||||
gridPos:
|
||||
x: 0
|
||||
y: 31
|
||||
h: 10
|
||||
w: 24
|
||||
memory_used_docker_combined_current: {}
|
||||
memory_used_docker_combined_trend: {}
|
||||
# cpu_usage_idle:
|
||||
# enabled: true
|
||||
# trend: true
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"w": {{ PANELS.cpu_docker_combined_current.gridPos.w }},
|
||||
"h": {{ PANELS.cpu_docker_combined_current.gridPos.h }}
|
||||
},
|
||||
"id": 4,
|
||||
"id": 2,
|
||||
"targets": [
|
||||
{
|
||||
"refId": "A",
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"w": {{ PANELS.cpu_docker_combined_trend.gridPos.w }},
|
||||
"h": {{ PANELS.cpu_docker_combined_trend.gridPos.h }}
|
||||
},
|
||||
"id": 6,
|
||||
"id": 3,
|
||||
"targets": [
|
||||
{
|
||||
"refId": "A",
|
||||
|
||||
@@ -1,483 +0,0 @@
|
||||
{
|
||||
"aliasColors": {
|
||||
"Buffered": "#6ED0E0",
|
||||
"Cached": "#F9934E",
|
||||
"Free": "#629E51",
|
||||
"Used": "#58140C"
|
||||
},
|
||||
"dashLength": 10,
|
||||
"datasource": "InfluxDB",
|
||||
"editable": true,
|
||||
"fieldConfig": {
|
||||
"defaults": {
|
||||
"links": []
|
||||
},
|
||||
"overrides": []
|
||||
},
|
||||
"fill": 6,
|
||||
"grid": {},
|
||||
"gridPos": {
|
||||
"h": 5,
|
||||
"w": 8,
|
||||
"x": 0,
|
||||
"y": 40
|
||||
},
|
||||
"id": 5,
|
||||
"legend": {
|
||||
"alignAsTable": true,
|
||||
"avg": true,
|
||||
"current": true,
|
||||
"hideEmpty": false,
|
||||
"hideZero": false,
|
||||
"max": true,
|
||||
"min": true,
|
||||
"show": true,
|
||||
"total": false,
|
||||
"values": true
|
||||
},
|
||||
"lines": true,
|
||||
"links": [],
|
||||
"nullPointMode": "connected",
|
||||
"options": {
|
||||
"alertThreshold": true
|
||||
},
|
||||
"pluginVersion": "7.5.4",
|
||||
"pointradius": 5,
|
||||
"renderer": "flot",
|
||||
"seriesOverrides": [
|
||||
{
|
||||
"alias": "/Trend/",
|
||||
"dashLength": 4,
|
||||
"dashes": true,
|
||||
"fill": 0,
|
||||
"linewidth": 4
|
||||
}
|
||||
],
|
||||
"spaceLength": 10,
|
||||
"stack": true,
|
||||
"targets": [
|
||||
{
|
||||
"alias": "Used Current",
|
||||
"dsType": "influxdb",
|
||||
"groupBy": [
|
||||
{
|
||||
"params": [
|
||||
"$__interval"
|
||||
],
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"params": [
|
||||
"null"
|
||||
],
|
||||
"type": "fill"
|
||||
}
|
||||
],
|
||||
"measurement": "mem",
|
||||
"orderByTime": "ASC",
|
||||
"policy": "default",
|
||||
"query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)",
|
||||
"rawQuery": false,
|
||||
"refId": "A",
|
||||
"resultFormat": "time_series",
|
||||
"select": [
|
||||
[
|
||||
{
|
||||
"params": [
|
||||
"used"
|
||||
],
|
||||
"type": "field"
|
||||
},
|
||||
{
|
||||
"params": [],
|
||||
"type": "mean"
|
||||
}
|
||||
]
|
||||
],
|
||||
"tags": [
|
||||
{
|
||||
"key": "host",
|
||||
"operator": "=",
|
||||
"value": "$servername"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"alias": "Buffered Current",
|
||||
"dsType": "influxdb",
|
||||
"groupBy": [
|
||||
{
|
||||
"params": [
|
||||
"$__interval"
|
||||
],
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"params": [
|
||||
"null"
|
||||
],
|
||||
"type": "fill"
|
||||
}
|
||||
],
|
||||
"measurement": "mem",
|
||||
"orderByTime": "ASC",
|
||||
"policy": "default",
|
||||
"query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)",
|
||||
"rawQuery": false,
|
||||
"refId": "B",
|
||||
"resultFormat": "time_series",
|
||||
"select": [
|
||||
[
|
||||
{
|
||||
"params": [
|
||||
"buffered"
|
||||
],
|
||||
"type": "field"
|
||||
},
|
||||
{
|
||||
"params": [],
|
||||
"type": "mean"
|
||||
}
|
||||
]
|
||||
],
|
||||
"tags": [
|
||||
{
|
||||
"key": "host",
|
||||
"operator": "=",
|
||||
"value": "$servername"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"alias": "Cached Current",
|
||||
"dsType": "influxdb",
|
||||
"groupBy": [
|
||||
{
|
||||
"params": [
|
||||
"$__interval"
|
||||
],
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"params": [
|
||||
"null"
|
||||
],
|
||||
"type": "fill"
|
||||
}
|
||||
],
|
||||
"measurement": "mem",
|
||||
"orderByTime": "ASC",
|
||||
"policy": "default",
|
||||
"query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)",
|
||||
"rawQuery": false,
|
||||
"refId": "C",
|
||||
"resultFormat": "time_series",
|
||||
"select": [
|
||||
[
|
||||
{
|
||||
"params": [
|
||||
"cached"
|
||||
],
|
||||
"type": "field"
|
||||
},
|
||||
{
|
||||
"params": [],
|
||||
"type": "mean"
|
||||
}
|
||||
]
|
||||
],
|
||||
"tags": [
|
||||
{
|
||||
"key": "host",
|
||||
"operator": "=",
|
||||
"value": "$servername"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"alias": "Free Current",
|
||||
"dsType": "influxdb",
|
||||
"groupBy": [
|
||||
{
|
||||
"params": [
|
||||
"$__interval"
|
||||
],
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"params": [
|
||||
"null"
|
||||
],
|
||||
"type": "fill"
|
||||
}
|
||||
],
|
||||
"measurement": "mem",
|
||||
"orderByTime": "ASC",
|
||||
"policy": "default",
|
||||
"query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)",
|
||||
"rawQuery": false,
|
||||
"refId": "D",
|
||||
"resultFormat": "time_series",
|
||||
"select": [
|
||||
[
|
||||
{
|
||||
"params": [
|
||||
"free"
|
||||
],
|
||||
"type": "field"
|
||||
},
|
||||
{
|
||||
"params": [],
|
||||
"type": "mean"
|
||||
}
|
||||
]
|
||||
],
|
||||
"tags": [
|
||||
{
|
||||
"key": "host",
|
||||
"operator": "=",
|
||||
"value": "$servername"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"alias": "Used Trend",
|
||||
"dsType": "influxdb",
|
||||
"groupBy": [
|
||||
{
|
||||
"params": [
|
||||
"$__interval"
|
||||
],
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"params": [
|
||||
"null"
|
||||
],
|
||||
"type": "fill"
|
||||
}
|
||||
],
|
||||
"hide": true,
|
||||
"measurement": "mem",
|
||||
"orderByTime": "ASC",
|
||||
"policy": "so_long_term",
|
||||
"query": "SELECT mean(\"used\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)",
|
||||
"rawQuery": false,
|
||||
"refId": "E",
|
||||
"resultFormat": "time_series",
|
||||
"select": [
|
||||
[
|
||||
{
|
||||
"params": [
|
||||
"mean_used"
|
||||
],
|
||||
"type": "field"
|
||||
},
|
||||
{
|
||||
"params": [],
|
||||
"type": "mean"
|
||||
}
|
||||
]
|
||||
],
|
||||
"tags": [
|
||||
{
|
||||
"key": "host",
|
||||
"operator": "=",
|
||||
"value": "$servername"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"alias": "Buffered Trend",
|
||||
"dsType": "influxdb",
|
||||
"groupBy": [
|
||||
{
|
||||
"params": [
|
||||
"$__interval"
|
||||
],
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"params": [
|
||||
"null"
|
||||
],
|
||||
"type": "fill"
|
||||
}
|
||||
],
|
||||
"hide": true,
|
||||
"measurement": "mem",
|
||||
"orderByTime": "ASC",
|
||||
"policy": "so_long_term",
|
||||
"query": "SELECT mean(\"buffered\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)",
|
||||
"rawQuery": false,
|
||||
"refId": "F",
|
||||
"resultFormat": "time_series",
|
||||
"select": [
|
||||
[
|
||||
{
|
||||
"params": [
|
||||
"mean_buffered"
|
||||
],
|
||||
"type": "field"
|
||||
},
|
||||
{
|
||||
"params": [],
|
||||
"type": "mean"
|
||||
}
|
||||
]
|
||||
],
|
||||
"tags": [
|
||||
{
|
||||
"key": "host",
|
||||
"operator": "=",
|
||||
"value": "$servername"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"alias": "Cached Trend",
|
||||
"dsType": "influxdb",
|
||||
"groupBy": [
|
||||
{
|
||||
"params": [
|
||||
"$__interval"
|
||||
],
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"params": [
|
||||
"null"
|
||||
],
|
||||
"type": "fill"
|
||||
}
|
||||
],
|
||||
"hide": true,
|
||||
"measurement": "mem",
|
||||
"orderByTime": "ASC",
|
||||
"policy": "so_long_term",
|
||||
"query": "SELECT mean(\"cached\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)",
|
||||
"rawQuery": false,
|
||||
"refId": "G",
|
||||
"resultFormat": "time_series",
|
||||
"select": [
|
||||
[
|
||||
{
|
||||
"params": [
|
||||
"mean_cached"
|
||||
],
|
||||
"type": "field"
|
||||
},
|
||||
{
|
||||
"params": [],
|
||||
"type": "mean"
|
||||
}
|
||||
]
|
||||
],
|
||||
"tags": [
|
||||
{
|
||||
"key": "host",
|
||||
"operator": "=",
|
||||
"value": "$servername"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"alias": "Free Trend",
|
||||
"dsType": "influxdb",
|
||||
"groupBy": [
|
||||
{
|
||||
"params": [
|
||||
"$__interval"
|
||||
],
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"params": [
|
||||
"null"
|
||||
],
|
||||
"type": "fill"
|
||||
}
|
||||
],
|
||||
"hide": true,
|
||||
"measurement": "mem",
|
||||
"orderByTime": "ASC",
|
||||
"policy": "so_long_term",
|
||||
"query": "SELECT mean(\"free\") FROM \"mem\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)",
|
||||
"rawQuery": false,
|
||||
"refId": "H",
|
||||
"resultFormat": "time_series",
|
||||
"select": [
|
||||
[
|
||||
{
|
||||
"params": [
|
||||
"mean_free"
|
||||
],
|
||||
"type": "field"
|
||||
},
|
||||
{
|
||||
"params": [],
|
||||
"type": "mean"
|
||||
}
|
||||
]
|
||||
],
|
||||
"tags": [
|
||||
{
|
||||
"key": "host",
|
||||
"operator": "=",
|
||||
"value": "$servername"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"thresholds": [],
|
||||
"timeRegions": [],
|
||||
"title": "$servername - Memory",
|
||||
"tooltip": {
|
||||
"msResolution": true,
|
||||
"shared": true,
|
||||
"sort": 0,
|
||||
"value_type": "individual"
|
||||
},
|
||||
"type": "graph",
|
||||
"xaxis": {
|
||||
"buckets": null,
|
||||
"mode": "time",
|
||||
"name": null,
|
||||
"show": true,
|
||||
"values": []
|
||||
},
|
||||
"yaxes": [
|
||||
{
|
||||
"format": "bytes",
|
||||
"label": "Bytes",
|
||||
"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
|
||||
},
|
||||
"bars": false,
|
||||
"dashes": false,
|
||||
"decimals": null,
|
||||
"error": false,
|
||||
"fillGradient": 0,
|
||||
"hiddenSeries": false,
|
||||
"linewidth": 0,
|
||||
"percentage": false,
|
||||
"points": false,
|
||||
"steppedLine": false,
|
||||
"timeFrom": null,
|
||||
"timeShift": null
|
||||
}
|
||||
146
salt/grafana/panels/memory_usage_current.json.jinja
Normal file
146
salt/grafana/panels/memory_usage_current.json.jinja
Normal file
@@ -0,0 +1,146 @@
|
||||
{
|
||||
"aliasColors": {},
|
||||
"bars": false,
|
||||
"dashLength": 10,
|
||||
"dashes": false,
|
||||
"datasource": "InfluxDB",
|
||||
"editable": true,
|
||||
"error": false,
|
||||
"fill": 1,
|
||||
"fillGradient": 0,
|
||||
"grid": {},
|
||||
"gridPos": {
|
||||
"x": {{ PANELS.memory_usage_current.gridPos.x }},
|
||||
"y": {{ PANELS.memory_usage_current.gridPos.y }},
|
||||
"w": {{ PANELS.memory_usage_current.gridPos.w }},
|
||||
"h": {{ PANELS.memory_usage_current.gridPos.h }}
|
||||
},
|
||||
"height": "400",
|
||||
"id": 12054,
|
||||
"interval": "$inter",
|
||||
"legend": {
|
||||
"alignAsTable": true,
|
||||
"avg": true,
|
||||
"current": true,
|
||||
"max": true,
|
||||
"min": true,
|
||||
"show": true,
|
||||
"sort": "current",
|
||||
"sortDesc": true,
|
||||
"total": false,
|
||||
"values": true
|
||||
},
|
||||
"lines": true,
|
||||
"linewidth": 1,
|
||||
"links": [],
|
||||
"nullPointMode": "connected",
|
||||
"options": {
|
||||
"alertThreshold": true
|
||||
},
|
||||
"percentage": false,
|
||||
"pointradius": 5,
|
||||
"points": false,
|
||||
"renderer": "flot",
|
||||
"seriesOverrides": [
|
||||
{
|
||||
"alias": "/total/",
|
||||
"color": "#BF1B00",
|
||||
"fill": 0,
|
||||
"linewidth": 2
|
||||
}
|
||||
],
|
||||
"spaceLength": 10,
|
||||
"stack": false,
|
||||
"steppedLine": false,
|
||||
"targets": [
|
||||
{
|
||||
"alias": "$tag_host: $col",
|
||||
"dsType": "influxdb",
|
||||
"function": "mean",
|
||||
"groupBy": [
|
||||
{
|
||||
"interval": "auto",
|
||||
"params": [
|
||||
"auto"
|
||||
],
|
||||
"type": "time"
|
||||
},
|
||||
{
|
||||
"key": "host",
|
||||
"params": [
|
||||
"tag"
|
||||
],
|
||||
"type": "tag"
|
||||
}
|
||||
],
|
||||
"measurement": "mem_inactive",
|
||||
"policy": "default",
|
||||
"query": "SELECT mean(total) as total, mean(used) as used, mean(cached) as cached, mean(free) as free, mean(buffered) as buffered FROM \"mem\" WHERE host =~ /$server$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc",
|
||||
"rawQuery": true,
|
||||
"refId": "A",
|
||||
"resultFormat": "time_series",
|
||||
"select": [
|
||||
[
|
||||
{
|
||||
"params": [
|
||||
"value"
|
||||
],
|
||||
"type": "field"
|
||||
},
|
||||
{
|
||||
"params": [],
|
||||
"type": "mean"
|
||||
}
|
||||
]
|
||||
],
|
||||
"tags": []
|
||||
}
|
||||
],
|
||||
"thresholds": [],
|
||||
"timeFrom": null,
|
||||
"timeRegions": [],
|
||||
"timeShift": null,
|
||||
"title": "Memory Usage",
|
||||
"tooltip": {
|
||||
"msResolution": false,
|
||||
"shared": true,
|
||||
"sort": 0,
|
||||
"value_type": "cumulative"
|
||||
},
|
||||
"type": "graph",
|
||||
"xaxis": {
|
||||
"buckets": null,
|
||||
"mode": "time",
|
||||
"name": null,
|
||||
"show": true,
|
||||
"values": []
|
||||
},
|
||||
"yaxes": [
|
||||
{
|
||||
"format": "bytes",
|
||||
"logBase": 1,
|
||||
"max": null,
|
||||
"min": 0,
|
||||
"show": true
|
||||
},
|
||||
{
|
||||
"format": "short",
|
||||
"logBase": 1,
|
||||
"max": null,
|
||||
"min": null,
|
||||
"show": true
|
||||
}
|
||||
],
|
||||
"yaxis": {
|
||||
"align": false,
|
||||
"alignLevel": null
|
||||
},
|
||||
"fieldConfig": {
|
||||
"defaults": {
|
||||
"links": []
|
||||
},
|
||||
"overrides": []
|
||||
},
|
||||
"pluginVersion": "7.5.4",
|
||||
"hiddenSeries": false
|
||||
}
|
||||
@@ -2,12 +2,12 @@
|
||||
"type": "graph",
|
||||
"title": "Container Memory Usage Current",
|
||||
"gridPos": {
|
||||
"x": 0,
|
||||
"y": 20,
|
||||
"w": 24,
|
||||
"h": 10
|
||||
"x": {{ PANELS.memory_used_docker_combined_current.gridPos.x }},
|
||||
"y": {{ PANELS.memory_used_docker_combined_current.gridPos.y }},
|
||||
"w": {{ PANELS.memory_used_docker_combined_current.gridPos.w }},
|
||||
"h": {{ PANELS.memory_used_docker_combined_current.gridPos.h }}
|
||||
},
|
||||
"id": 5,
|
||||
"id": 4,
|
||||
"targets": [
|
||||
{
|
||||
"refId": "A",
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
"type": "graph",
|
||||
"title": "Container Memory Usage Trend",
|
||||
"gridPos": {
|
||||
"x": 0,
|
||||
"y": 30,
|
||||
"w": 24,
|
||||
"h": 10
|
||||
"x": {{ PANELS.memory_used_docker_combined_trend.gridPos.x }},
|
||||
"y": {{ PANELS.memory_used_docker_combined_trend.gridPos.y }},
|
||||
"w": {{ PANELS.memory_used_docker_combined_trend.gridPos.w }},
|
||||
"h": {{ PANELS.memory_used_docker_combined_trend.gridPos.h }}
|
||||
},
|
||||
"id": 7,
|
||||
"id": 5,
|
||||
"targets": [
|
||||
{
|
||||
"refId": "A",
|
||||
|
||||
15
salt/grafana/panels/row_docker_details.json.jinja
Normal file
15
salt/grafana/panels/row_docker_details.json.jinja
Normal file
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"collapsed": false,
|
||||
"datasource": null,
|
||||
"gridPos": {
|
||||
"x": {{ PANELS.row_docker_details.gridPos.x }},
|
||||
"y": {{ PANELS.row_docker_details.gridPos.y }},
|
||||
"w": {{ PANELS.row_docker_details.gridPos.w }},
|
||||
"h": {{ PANELS.row_docker_details.gridPos.h }}
|
||||
},
|
||||
"id": 1,
|
||||
"panels": [],
|
||||
"repeat": null,
|
||||
"title": "Docker Details",
|
||||
"type": "row"
|
||||
}
|
||||
Reference in New Issue
Block a user