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.

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

[ops] Fix resources dashboard, disable tempo-query tracing by default #353

Merged
merged 2 commits into from Nov 19, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion operations/jsonnet/microservices/querier.libsonnet
Expand Up @@ -24,7 +24,10 @@
]) +
container.withVolumeMounts([
volumeMount.new(tempo_config_volume, '/conf'),
]),
]) +
container.withEnvMap({
JAEGER_DISABLED: 'true',
annanay25 marked this conversation as resolved.
Show resolved Hide resolved
}),

tempo_query_container::
container.new('tempo-query', $._images.tempo_query) +
Expand Down
5 changes: 4 additions & 1 deletion operations/jsonnet/single-binary/tempo.libsonnet
Expand Up @@ -57,7 +57,10 @@
]) +
container.withVolumeMounts([
volumeMount.new(tempo_query_config_volume, '/conf'),
]),
]) +
container.withEnvMap({
JAEGER_DISABLED: 'true',
}),

tempo_statefulset:
statefulset.new('tempo',
Expand Down
20 changes: 16 additions & 4 deletions operations/tempo-mixin/dashboards.libsonnet
Expand Up @@ -184,15 +184,15 @@ dashboard_utils {
)
)
.addRow(
g.row('Querier')
g.row('Distributor')
.addPanel(
$.containerCPUUsagePanel('CPU', $._config.jobs.querier),
$.containerCPUUsagePanel('CPU', $._config.jobs.distributor),
)
.addPanel(
$.containerMemoryWorkingSetPanel('Memory (workingset)', $._config.jobs.querier),
$.containerMemoryWorkingSetPanel('Memory (workingset)', $._config.jobs.distributor),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', $.jobMatcher($._config.jobs.querier)),
$.goHeapInUsePanel('Memory (go heap inuse)', $.jobMatcher($._config.jobs.distributor)),
)
)
.addRow(
Expand All @@ -207,6 +207,18 @@ dashboard_utils {
$.goHeapInUsePanel('Memory (go heap inuse)', $.jobMatcher($._config.jobs.ingester)),
)
)
.addRow(
g.row('Querier')
.addPanel(
$.containerCPUUsagePanel('CPU', $._config.jobs.querier),
)
.addPanel(
$.containerMemoryWorkingSetPanel('Memory (workingset)', $._config.jobs.querier),
)
.addPanel(
$.goHeapInUsePanel('Memory (go heap inuse)', $.jobMatcher($._config.jobs.querier)),
)
)
.addRow(
g.row('Compactor')
.addPanel(
Expand Down
127 changes: 127 additions & 0 deletions operations/tempo-mixin/out/tempo-operational.json
Expand Up @@ -5102,6 +5102,133 @@
],
"title": "Vulture",
"type": "row"
},
{
"collapsed": false,
"datasource": null,
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
"y": 76
},
"id": 81,
"panels": [

],
"title": "Compactor",
"type": "row"
},
{
"aliasColors": {

},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "$ds",
"fieldConfig": {
"defaults": {
"custom": {

}
},
"overrides": [

]
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 8,
"w": 7,
"x": 0,
"y": 77
},
"hiddenSeries": false,
"id": 83,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.3.0-beta1",
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [

],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "increase(tempodb_compaction_objects_combined_total{job=~\"$namespace/compactor\"}[$__rate_interval])",
"interval": "",
"legendFormat": "",
"refId": "A"
}
],
"thresholds": [

],
"timeFrom": null,
"timeRegions": [

],
"timeShift": null,
"title": "Objects Combined",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": [

]
},
"yaxes": [
{
"$$hashKey": "object:150",
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"$$hashKey": "object:151",
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"refresh": "30s",
Expand Down