Skip to content

Commit 52beb8e

Browse files
committed
pr feedback; minus validation on histogram switch
1 parent 05a474c commit 52beb8e

File tree

5 files changed

+89
-83
lines changed

5 files changed

+89
-83
lines changed

discourse-mixin/alerts.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
alert: 'DiscourseHigh5xxErrors',
99
expr: |||
10-
100 * rate(discourse_http_requests{status="500"}[5m]) / on() group_left() (sum(rate(discourse_http_requests[5m])) by (instance)) > %(alertsCritical5xxResponses)s
10+
100 * rate(discourse_http_requests{status=~"5..", %(filteringSelector)s}[5m]) / on() group_left() (sum(rate(discourse_http_requests[5m])) by (instance)) > %(alertsCritical5xxResponses)s
1111
||| % this.config,
1212
'for': '5m',
1313
labels: {

discourse-mixin/dashboards_out/discourse-jobs.json

Lines changed: 52 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

discourse-mixin/dashboards_out/discourse-overview.json

Lines changed: 14 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

discourse-mixin/panels.libsonnet

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ local commonlib = import 'common-lib/common/main.libsonnet';
1111
'Traffic by response code',
1212
targets=[signals.overview.httpRequests.asTarget()]
1313
)
14+
+ g.panel.timeSeries.options.legend.withAsTable(true)
15+
+ g.panel.timeSeries.options.legend.withPlacement('right')
1416
+ g.panel.timeSeries.panelOptions.withDescription('Rate of HTTP traffic over time for the entire application. Grouped by response code.')
1517
+ g.panel.timeSeries.standardOptions.withUnit('reqps'),
1618

@@ -49,28 +51,34 @@ local commonlib = import 'common-lib/common/main.libsonnet';
4951
+ g.panel.timeSeries.standardOptions.withUnit('s'),
5052

5153
latest99thPercentileRequestTime:
52-
commonlib.panels.network.timeSeries.base.new('Latest 99th percentile request time', targets=[signals.overview.latest99thPercentileRequestTime.asTarget()])
53-
+ g.panel.timeSeries.panelOptions.withDescription('The 99th percentile amount of time for "latest" page requests for the selected site.')
54-
+ g.panel.timeSeries.standardOptions.withUnit('s'),
54+
g.panel.histogram.new('Latest request time')
55+
+ g.panel.histogram.queryOptions.withTargets([signals.overview.latest99thPercentileRequestTime.asTarget()])
56+
+ g.panel.histogram.panelOptions.withDescription('The 99th percentile amount of time for "latest" page requests for the selected site.')
57+
+ g.panel.histogram.standardOptions.withUnit('s'),
5558

5659
topic99thPercentileRequestTime:
57-
commonlib.panels.network.timeSeries.base.new('Topic show 99th percentile request time', targets=[signals.overview.topic99thPercentileRequestTime.asTarget()])
58-
+ g.panel.timeSeries.panelOptions.withDescription('The 99th percentile amount of time for "topics show" requests for the selected site.')
59-
+ g.panel.timeSeries.standardOptions.withUnit('s'),
60+
g.panel.histogram.new('Topic show request time')
61+
+ g.panel.histogram.queryOptions.withTargets([signals.overview.topic99thPercentileRequestTime.asTarget()])
62+
+ g.panel.histogram.panelOptions.withDescription('The amount of time for "topics show" requests for the selected site.')
63+
+ g.panel.histogram.standardOptions.withUnit('s'),
6064

6165
// Jobs dashboard panels
6266
sidekiqJobDuration:
63-
commonlib.panels.generic.stat.base.new('Sidekiq job duration', targets=[signals.jobs.sidekiqJobDuration.asTarget()])
64-
+ g.panel.stat.panelOptions.withDescription('Time spent in Sidekiq jobs broken out by job name.')
65-
+ g.panel.stat.standardOptions.withUnit('s'),
67+
commonlib.panels.generic.timeSeries.base.new('Sidekiq job duration', targets=[signals.jobs.sidekiqJobDuration.asTarget()])
68+
+ g.panel.timeSeries.options.legend.withAsTable(true)
69+
+ g.panel.timeSeries.options.legend.withPlacement('right')
70+
+ g.panel.timeSeries.panelOptions.withDescription('Time spent in Sidekiq jobs broken out by job name.')
71+
+ g.panel.timeSeries.standardOptions.withUnit('s'),
6672

6773
scheduledJobDuration:
68-
commonlib.panels.generic.stat.base.new('Scheduled job duration', targets=[signals.jobs.scheduledJobDuration.asTarget()])
69-
+ g.panel.stat.panelOptions.withDescription('Time spent in scheduled jobs broken out by job name.')
70-
+ g.panel.stat.standardOptions.withUnit('s'),
74+
commonlib.panels.generic.timeSeries.base.new('Scheduled job duration', targets=[signals.jobs.scheduledJobDuration.asTarget()])
75+
+ g.panel.timeSeries.options.legend.withAsTable(true)
76+
+ g.panel.timeSeries.options.legend.withPlacement('right')
77+
+ g.panel.timeSeries.panelOptions.withDescription('Time spent in scheduled jobs broken out by job name.')
78+
+ g.panel.timeSeries.standardOptions.withUnit('s'),
7179

7280
sidekiqJobCount:
73-
commonlib.panels.generic.stat.info.new('Sidekiq jobs', targets=[signals.jobs.sidekiqJobCount.asTarget()])
81+
commonlib.panels.generic.timeSeries.base.new('Sidekiq jobs', targets=[signals.jobs.sidekiqJobCount.asTarget()])
7482
+ g.panel.stat.panelOptions.withDescription('The amount of sidekiq jobs ran over an interval.')
7583
+ g.panel.stat.standardOptions.withUnit('none'),
7684

discourse-mixin/prometheus_rules_out/prometheus_alerts.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)