Skip to content

Commit 83550ed

Browse files
postnatipostnati
committed
Ran make fmt. Fixed linting errors for prometheus_datasource
1 parent d45236d commit 83550ed

File tree

5 files changed

+50
-35
lines changed

5 files changed

+50
-35
lines changed

‎squid-mixin/config.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
dashboardTimezone: 'default',
1616
dashboardRefresh: '1m',
1717
metricsSource: 'prometheus',
18-
18+
1919
// Logs configuration
2020
enableLokiLogs: true,
2121
extraLogLabels: ['level', 'severity'],

‎squid-mixin/dashboards.libsonnet‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ local logslib = import 'logs-lib/logs/main.libsonnet';
2222
+ g.dashboard.withPanels(
2323
g.util.panel.resolveCollapsedFlagOnRows(
2424
g.util.grid.wrapPanels([
25-
this.grafana.rows.clientRow,
26-
this.grafana.rows.serverRow,
25+
this.grafana.rows.clientRow,
26+
this.grafana.rows.serverRow,
2727
])
2828
)
2929
)
3030
+ root.applyCommon(
3131
vars.multiInstance,
3232
uid + '-overview',
3333
tags,
34-
links {squidOverview+:: {} },
34+
links { squidOverview+:: {} },
3535
annotations,
3636
timezone,
3737
refresh,

‎squid-mixin/dashboards_out/squid-overview.json‎

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

‎squid-mixin/g.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'github.com/grafana/grafonnet/gen/grafonnet-v11.0.0/main.libsonnet'
1+
import 'github.com/grafana/grafonnet/gen/grafonnet-v11.0.0/main.libsonnet'

‎squid-mixin/panels.libsonnet‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
1010
clientRequests:
1111
g.panel.timeSeries.new('Client requests')
1212
+ g.panel.timeSeries.panelOptions.withDescription('The request rate of client.')
13+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
1314
+ g.panel.timeSeries.queryOptions.withTargets([
1415
signals.overview.clientHTTPRequests.asTarget()
1516
+ g.query.prometheus.withInterval('2m')
@@ -23,6 +24,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
2324
clientRequestErrors:
2425
g.panel.timeSeries.new('Client request errors')
2526
+ g.panel.timeSeries.panelOptions.withDescription('The number of client HTTP errors.')
27+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
2628
+ g.panel.timeSeries.queryOptions.withTargets([
2729
signals.overview.clientHTTPErrors.asTarget()
2830
+ g.query.prometheus.withInterval('2m')
@@ -36,6 +38,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
3638
clientCacheHitRatio:
3739
g.panel.timeSeries.new('Client cache hit ratio')
3840
+ g.panel.timeSeries.panelOptions.withDescription('The client cache hit ratio.')
41+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
3942
+ g.panel.timeSeries.queryOptions.withTargets([
4043
signals.overview.clientCacheHitRatio.asTarget()
4144
+ g.query.prometheus.withInterval('2m')
@@ -49,6 +52,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
4952
clientRequestSentThroughput:
5053
g.panel.timeSeries.new('Client request sent throughput')
5154
+ g.panel.timeSeries.panelOptions.withDescription('The throughput of client HTTP data sent.')
55+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
5256
+ g.panel.timeSeries.queryOptions.withTargets([
5357
signals.overview.clientHTTPSentThroughput.asTarget()
5458
+ g.query.prometheus.withInterval('2m')
@@ -62,6 +66,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
6266
clientHTTPReceivedThroughput:
6367
g.panel.timeSeries.new('Client HTTP received throughput')
6468
+ g.panel.timeSeries.panelOptions.withDescription('The throughput of client HTTP data received.')
69+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
6570
+ g.panel.timeSeries.queryOptions.withTargets([
6671
signals.overview.clientHTTPReceivedThroughput.asTarget()
6772
+ g.query.prometheus.withInterval('2m')
@@ -75,6 +80,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
7580
clientCacheHitThroughput:
7681
g.panel.timeSeries.new('Client cache hit throughput')
7782
+ g.panel.timeSeries.panelOptions.withDescription('The throughput of client cache hit.')
83+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
7884
+ g.panel.timeSeries.queryOptions.withTargets([
7985
signals.overview.clientCacheHitThroughput.asTarget()
8086
+ g.query.prometheus.withInterval('2m')
@@ -88,6 +94,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
8894
httpRequestServiceTime:
8995
g.panel.timeSeries.new('HTTP request service time')
9096
+ g.panel.timeSeries.panelOptions.withDescription('HTTP request service time percentiles.')
97+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
9198
+ g.panel.timeSeries.queryOptions.withTargets([
9299
signals.overview.httpRequestsAll50.asTarget(),
93100
signals.overview.httpRequestsAll75.asTarget(),
@@ -101,6 +108,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
101108
cacheHitServiceTime:
102109
g.panel.timeSeries.new('Cache hit service time')
103110
+ g.panel.timeSeries.panelOptions.withDescription('Cache hits service time percentiles.')
111+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
104112
+ g.panel.timeSeries.queryOptions.withTargets([
105113
signals.overview.cacheHits50.asTarget()
106114
+ g.query.prometheus.withIntervalFactor(2),
@@ -117,6 +125,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
117125
cacheMissesServiceTime:
118126
g.panel.timeSeries.new('Cache misses service time')
119127
+ g.panel.timeSeries.panelOptions.withDescription('Cache misses service time percentiles.')
128+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
120129
+ g.panel.timeSeries.queryOptions.withTargets([
121130
signals.overview.cacheMisses50.asTarget()
122131
+ g.query.prometheus.withIntervalFactor(2),
@@ -134,6 +143,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
134143
serverRequests:
135144
g.panel.timeSeries.new('Server requests')
136145
+ g.panel.timeSeries.panelOptions.withDescription('The number of HTTP, FTP, and other server requests.')
146+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
137147
+ g.panel.timeSeries.queryOptions.withTargets([
138148
signals.overview.serverFTPRequests.asTarget()
139149
+ g.query.prometheus.withInterval('2m')
@@ -154,6 +164,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
154164
serverRequestErrors:
155165
g.panel.timeSeries.new('Server request errors')
156166
+ g.panel.timeSeries.panelOptions.withDescription('The number of HTTP, FTP, and other server request errors.')
167+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
157168
+ g.panel.timeSeries.queryOptions.withTargets([
158169
signals.overview.serverFTPErrors.asTarget()
159170
+ g.query.prometheus.withInterval('2m')
@@ -174,6 +185,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
174185
serverRequestSentThroughput:
175186
g.panel.timeSeries.new('Server request sent throughput')
176187
+ g.panel.timeSeries.panelOptions.withDescription('The number of HTTP, FTP, and other server sent throughput.')
188+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
177189
+ g.panel.timeSeries.queryOptions.withTargets([
178190
signals.overview.serverFTPSentThroughput.asTarget()
179191
+ g.query.prometheus.withInterval('2m')
@@ -194,6 +206,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
194206
serverObjectSwap:
195207
g.panel.timeSeries.new('Server object swap')
196208
+ g.panel.timeSeries.panelOptions.withDescription('The number of objects read from disk and the number of objects saved to disk.')
209+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
197210
+ g.panel.timeSeries.queryOptions.withTargets([
198211
signals.overview.swapIns.asTarget()
199212
+ g.query.prometheus.withInterval('2m')
@@ -211,6 +224,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
211224
dnsLookupServiceTime:
212225
g.panel.timeSeries.new('DNS lookup service time')
213226
+ g.panel.timeSeries.panelOptions.withDescription('DNS lookup service time percentiles')
227+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
214228
+ g.panel.timeSeries.queryOptions.withTargets([
215229
signals.overview.dnsLookups50.asTarget()
216230
+ g.query.prometheus.withIntervalFactor(2),
@@ -228,6 +242,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
228242
serverReceivedThroughput:
229243
g.panel.timeSeries.new('Server received throughput')
230244
+ g.panel.timeSeries.panelOptions.withDescription('The number of HTTP, FTP, and other server throughput.')
245+
+ g.panel.timeSeries.queryOptions.withDatasource('prometheus', '${prometheus_datasource}')
231246
+ g.panel.timeSeries.queryOptions.withTargets([
232247
signals.overview.serverFTPReceivedThroughput.asTarget()
233248
+ g.query.prometheus.withInterval('2m')

0 commit comments

Comments
 (0)