Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add logical cpu cores and memory into grafana #5124

Merged
merged 8 commits into from
Jul 7, 2022
+42 −5
Merged

feat: add logical cpu cores and memory into grafana #5124

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7e9ee9
add logical cpu cores and memory into grafana
Lloyd-Pottiger Jun 10, 2022
f0d15c2
change type to graph
Lloyd-Pottiger Jun 20, 2022
104a26a
Merge branch 'master' into feat/add-cpu-cores-in-grafana
Lloyd-Pottiger Jun 23, 2022
f9d962e
Update dbms/src/Common/CurrentMetrics.cpp
Lloyd-Pottiger Jul 6, 2022
05b7093
Update dbms/src/Server/Server.cpp
Lloyd-Pottiger Jul 6, 2022
d6601c0
Merge branch 'master' into feat/add-cpu-cores-in-grafana
Lloyd-Pottiger Jul 6, 2022
e302fe4
add them to cpu usage and memory panel
Lloyd-Pottiger Jul 6, 2022
c5a7e1b
Merge branch 'master' into feat/add-cpu-cores-in-grafana
ti-chi-bot Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions dbms/src/Common/CurrentMetrics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@
M(OpenFileForReadWrite) \
M(MemoryTracking) \
M(MemoryTrackingInBackgroundProcessingPool) \
M(MemoryTrackingForMerges) \
M(LeaderElection) \
M(EphemeralNode) \
M(DelayedInserts) \
M(ContextLockWait) \
M(StorageBufferRows) \
M(StorageBufferBytes) \
M(DictCacheRequests) \
M(Revision) \
M(LogicalCPUCores) \
M(MemoryCapacity) \
Lloyd-Pottiger marked this conversation as resolved.
Show resolved Hide resolved
Lloyd-Pottiger marked this conversation as resolved.
Show resolved Hide resolved
M(PSMVCCNumSnapshots) \
M(PSMVCCSnapshotsList) \
M(RWLockWaitingReaders) \
Expand Down
9 changes: 9 additions & 0 deletions dbms/src/Server/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@ namespace
}
} // namespace

namespace CurrentMetrics
{
extern const Metric Revision;
extern const Metric LogicalCPUCores;
extern const Metric MemoryCapacity;
Lloyd-Pottiger marked this conversation as resolved.
Show resolved Hide resolved
} // namespace CurrentMetrics

namespace DB
{
namespace ErrorCodes
Expand Down Expand Up @@ -1419,6 +1426,8 @@ int Server::main(const std::vector<std::string> & /*args*/)

{
// on ARM processors it can show only enabled at current moment cores
CurrentMetrics::set(CurrentMetrics::LogicalCPUCores, server_info.cpu_info.logical_cores);
CurrentMetrics::set(CurrentMetrics::MemoryCapacity, server_info.memory_info.capacity);
LOG_FMT_INFO(
log,
"Available RAM = {}; physical cores = {}; logical cores = {}.",
Expand Down
202 changes: 201 additions & 1 deletion metrics/grafana/tiflash_summary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,206 @@
"align": false,
"alignLevel": null
}
},
{
"datasource": "${DS_TEST-CLUSTER}",
"description": "The logical cpu cores per TiFlash instance.",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 32
},
"hiddenSeries": false,
"id": 130,
"legend": {
"alignAsTable": true,
"avg": false,
"current": true,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.11",
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"exemplar": true,
"expr": "sum(tiflash_system_current_metric_LogicalCPUCores{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}) by (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
"refId": "A",
"step": 10
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Logical Cpu Cores",
"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
}
},
{
"datasource": "${DS_TEST-CLUSTER}",
"description": "The memory capacity per TiFlash instance.\n",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"fill": 1,
"gridPos": {
"h": 9,
"w": 12,
"x": 12,
"y": 32
},
"id": 131,
"legend": {
"alignAsTable": true,
"avg": false,
"current": true,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"options": {
"alertThreshold": true
},
"pluginVersion": "7.5.11",
"pointradius": 2,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"targets": [
{
"exemplar": true,
"expr": "sum(tiflash_system_current_metric_MemoryCapacity{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}) by (instance) / (1024 * 1024 * 1024)",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
"refId": "A",
"step": 10
},
{
"hide": false,
"refId": "B"
}
],
"thresholds": [],
"timeRegions": [],
"title": "Memory Capacity (GB)",
"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
},
"bars": false,
"dashes": false,
"fillGradient": 0,
"hiddenSeries": false,
"percentage": false,
"points": false,
"stack": false,
"steppedLine": false,
"timeFrom": null,
"timeShift": null
}
],
"repeat": null,
Expand Down Expand Up @@ -8184,4 +8384,4 @@
"title": "Test-Cluster-TiFlash-Summary",
"uid": "SVbh2xUWk",
"version": 2
}
}