Skip to content

Commit 4b44b92

Browse files
postnatipostnati
committed
Ran make fmt
1 parent 3c144b5 commit 4b44b92

File tree

7 files changed

+153
-142
lines changed

7 files changed

+153
-142
lines changed

‎opensearch-mixin/config.libsonnet‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// Agg Lists
2323
groupAggList: std.join(',', this.groupLabels),
2424
groupAggListWithInstance: std.join(',', this.groupLabels + this.instanceLabels),
25-
25+
2626
// Alerts configuration
2727
alertsWarningShardReallocations: 0, // count
2828
alertsWarningShardUnassigned: 0, // count
@@ -34,11 +34,11 @@
3434
alertsCriticalMemoryUsage: 85, // %
3535
alertsWarningRequestLatency: 0.5, // seconds
3636
alertsWarningIndexLatency: 0.5, // seconds
37-
37+
3838
// Signals configuration
3939
signals+: {
4040
clusterOverview: (import './signals/cluster-overview.libsonnet')(this),
4141
nodeOverview: (import './signals/node-overview.libsonnet')(this),
4242
searchAndIndexOverview: (import './signals/search-and-index-overview.libsonnet')(this),
4343
},
44-
}
44+
}

‎opensearch-mixin/dashboards.libsonnet‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ local logslib = import 'logs-lib/logs/main.libsonnet';
4444
+ g.dashboard.withPanels(
4545
g.util.panel.resolveCollapsedFlagOnRows(
4646
g.util.grid.wrapPanels([
47-
this.grafana.rows.nodeHealthRow,
48-
this.grafana.rows.nodeRolesRow,
49-
this.grafana.rows.nodeJVMRow,
50-
this.grafana.rows.threadPoolsRow,
47+
this.grafana.rows.nodeHealthRow,
48+
this.grafana.rows.nodeRolesRow,
49+
this.grafana.rows.nodeJVMRow,
50+
this.grafana.rows.threadPoolsRow,
5151
])
5252
)
5353
) + root.applyCommon(

‎opensearch-mixin/main.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
1515
new(): {
1616
local this = self,
1717
config: config,
18-
18+
1919
signals:
2020
{
2121
[sig]: commonlib.signals.unmarshallJsonMulti(

‎opensearch-mixin/panels.libsonnet‎

Lines changed: 86 additions & 75 deletions
Large diffs are not rendered by default.

‎opensearch-mixin/rows.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ local g = import './g.libsonnet';
88
+ g.panel.row.withPanels([
99
this.grafana.panels.clusterStatusPanel { gridPos+: { w: 5, h: 6 } },
1010
this.grafana.panels.nodeCountPanel { gridPos+: { w: 5, h: 6 } },
11-
this.grafana.panels.dataNodeCountPanel { gridPos+: { w: 5, h: 6 } },
11+
this.grafana.panels.dataNodeCountPanel { gridPos+: { w: 5, h: 6 } },
1212
this.grafana.panels.shardCountPanel { gridPos+: { w: 5, h: 6 } },
1313
this.grafana.panels.activeShardsPercentagePanel { gridPos+: { w: 4, h: 6 } },
1414
]),

‎opensearch-mixin/signals/cluster-overview.libsonnet‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,11 @@ function(this)
267267
sources: {
268268
prometheus: {
269269
expr: 'topk(10, sort_desc((100 * (\n'
270-
+ ' sum by(' + this.groupAggListWithInstance + ') (opensearch_fs_path_total_bytes{%(queriesSelectorGroupOnly)s}) - \n'
271-
+ ' sum by(' + this.groupAggListWithInstance + ') (opensearch_fs_path_free_bytes{%(queriesSelectorGroupOnly)s})\n'
272-
+ ') / \n'
273-
+ 'sum by(' + this.groupAggListWithInstance + ') (opensearch_fs_path_total_bytes{%(queriesSelectorGroupOnly)s})\n'
274-
+ ')))',
270+
+ ' sum by(' + this.groupAggListWithInstance + ') (opensearch_fs_path_total_bytes{%(queriesSelectorGroupOnly)s}) - \n'
271+
+ ' sum by(' + this.groupAggListWithInstance + ') (opensearch_fs_path_free_bytes{%(queriesSelectorGroupOnly)s})\n'
272+
+ ') / \n'
273+
+ 'sum by(' + this.groupAggListWithInstance + ') (opensearch_fs_path_total_bytes{%(queriesSelectorGroupOnly)s})\n'
274+
+ ')))',
275275
legendCustomTemplate: '{{node}}',
276276
},
277277
},
@@ -299,10 +299,10 @@ function(this)
299299
sources: {
300300
prometheus: {
301301
expr: 'topk(10, sort_desc(avg by(index, ' + this.groupAggList + ') (\n'
302-
+ ' opensearch_index_search_fetch_current_number{%(queriesSelectorGroupOnly)s, context="total"} + \n'
303-
+ ' opensearch_index_search_query_current_number{%(queriesSelectorGroupOnly)s, context="total"} + \n'
304-
+ ' opensearch_index_search_scroll_current_number{%(queriesSelectorGroupOnly)s, context="total"}\n'
305-
+ ')))',
302+
+ ' opensearch_index_search_fetch_current_number{%(queriesSelectorGroupOnly)s, context="total"} + \n'
303+
+ ' opensearch_index_search_query_current_number{%(queriesSelectorGroupOnly)s, context="total"} + \n'
304+
+ ' opensearch_index_search_scroll_current_number{%(queriesSelectorGroupOnly)s, context="total"}\n'
305+
+ ')))',
306306
legendCustomTemplate: '{{index}}',
307307
},
308308
},
@@ -315,14 +315,14 @@ function(this)
315315
sources: {
316316
prometheus: {
317317
expr: 'topk(10, sort_desc(sum by(index, ' + this.groupAggList + ') ((\n'
318-
+ ' increase(opensearch_index_search_fetch_time_seconds{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) + \n'
319-
+ ' increase(opensearch_index_search_query_time_seconds{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) + \n'
320-
+ ' increase(opensearch_index_search_scroll_time_seconds{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval)\n'
321-
+ ') / clamp_min(\n'
322-
+ ' increase(opensearch_index_search_fetch_count{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) + \n'
323-
+ ' increase(opensearch_index_search_query_count{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) + \n'
324-
+ ' increase(opensearch_index_search_scroll_count{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval), 1\n'
325-
+ '))))',
318+
+ ' increase(opensearch_index_search_fetch_time_seconds{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) + \n'
319+
+ ' increase(opensearch_index_search_query_time_seconds{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) + \n'
320+
+ ' increase(opensearch_index_search_scroll_time_seconds{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval)\n'
321+
+ ') / clamp_min(\n'
322+
+ ' increase(opensearch_index_search_fetch_count{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) + \n'
323+
+ ' increase(opensearch_index_search_query_count{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) + \n'
324+
+ ' increase(opensearch_index_search_scroll_count{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval), 1\n'
325+
+ '))))',
326326
legendCustomTemplate: '{{index}}',
327327
},
328328
},
@@ -335,13 +335,13 @@ function(this)
335335
sources: {
336336
prometheus: {
337337
expr: 'topk(10, sort_desc(avg by(index, ' + this.groupAggList + ') (\n'
338-
+ ' 100 * (opensearch_index_requestcache_hit_count{%(queriesSelectorGroupOnly)s, context="total"} + \n'
339-
+ ' opensearch_index_querycache_hit_count{%(queriesSelectorGroupOnly)s, context="total"}) / \n'
340-
+ ' clamp_min((opensearch_index_requestcache_hit_count{%(queriesSelectorGroupOnly)s, context="total"} + \n'
341-
+ ' opensearch_index_querycache_hit_count{%(queriesSelectorGroupOnly)s, context="total"} + \n'
342-
+ ' opensearch_index_requestcache_miss_count{%(queriesSelectorGroupOnly)s, context="total"} + \n'
343-
+ ' opensearch_index_querycache_miss_number{%(queriesSelectorGroupOnly)s, context="total"}), 1\n'
344-
+ '))))',
338+
+ ' 100 * (opensearch_index_requestcache_hit_count{%(queriesSelectorGroupOnly)s, context="total"} + \n'
339+
+ ' opensearch_index_querycache_hit_count{%(queriesSelectorGroupOnly)s, context="total"}) / \n'
340+
+ ' clamp_min((opensearch_index_requestcache_hit_count{%(queriesSelectorGroupOnly)s, context="total"} + \n'
341+
+ ' opensearch_index_querycache_hit_count{%(queriesSelectorGroupOnly)s, context="total"} + \n'
342+
+ ' opensearch_index_requestcache_miss_count{%(queriesSelectorGroupOnly)s, context="total"} + \n'
343+
+ ' opensearch_index_querycache_miss_number{%(queriesSelectorGroupOnly)s, context="total"}), 1\n'
344+
+ '))))',
345345
legendCustomTemplate: '{{index}}',
346346
},
347347
},
@@ -370,9 +370,9 @@ function(this)
370370
sources: {
371371
prometheus: {
372372
expr: 'topk(10, sum by(' + this.groupAggListWithInstance + ') (\n'
373-
+ ' increase(opensearch_ingest_total_time_seconds{%(queriesSelectorGroupOnly)s}[$__interval:] offset $__interval) / \n'
374-
+ ' clamp_min(increase(opensearch_ingest_total_count{%(queriesSelectorGroupOnly)s}[$__interval:] offset $__interval), 1)\n'
375-
+ '))',
373+
+ ' increase(opensearch_ingest_total_time_seconds{%(queriesSelectorGroupOnly)s}[$__interval:] offset $__interval) / \n'
374+
+ ' clamp_min(increase(opensearch_ingest_total_count{%(queriesSelectorGroupOnly)s}[$__interval:] offset $__interval), 1)\n'
375+
+ '))',
376376
legendCustomTemplate: '{{node}}',
377377
},
378378
},
@@ -419,9 +419,9 @@ function(this)
419419
sources: {
420420
prometheus: {
421421
expr: 'topk(10, avg by(index, ' + this.groupAggList + ') (\n'
422-
+ ' increase(opensearch_index_indexing_index_time_seconds{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) / \n'
423-
+ ' clamp_min(increase(opensearch_index_indexing_index_count{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval), 1)\n'
424-
+ '))',
422+
+ ' increase(opensearch_index_indexing_index_time_seconds{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval) / \n'
423+
+ ' clamp_min(increase(opensearch_index_indexing_index_count{%(queriesSelectorGroupOnly)s, context="total"}[$__interval:] offset $__interval), 1)\n'
424+
+ '))',
425425
legendCustomTemplate: '{{index}}',
426426
},
427427
},
@@ -444,4 +444,4 @@ function(this)
444444
},
445445
},
446446
},
447-
}
447+
}

‎opensearch-mixin/signals/search-and-index-overview.libsonnet‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ function(this)
6464
sources: {
6565
prometheus: {
6666
expr: 'avg by (job,opensearch_cluster,index) (\n'
67-
+ ' increase(opensearch_index_search_query_time_seconds{%(queriesSelector)s}[$__interval:] offset $__interval) / \n'
68-
+ ' clamp_min(increase(opensearch_index_search_query_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
69-
+ ')',
67+
+ ' increase(opensearch_index_search_query_time_seconds{%(queriesSelector)s}[$__interval:] offset $__interval) / \n'
68+
+ ' clamp_min(increase(opensearch_index_search_query_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
69+
+ ')',
7070
legendCustomTemplate: '{{index}} - query',
7171
},
7272
},
@@ -79,9 +79,9 @@ function(this)
7979
sources: {
8080
prometheus: {
8181
expr: 'avg by (job,opensearch_cluster,index) (\n'
82-
+ ' increase(opensearch_index_search_fetch_time_seconds{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval) / \n'
83-
+ ' clamp_min(increase(opensearch_index_search_fetch_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
84-
+ ')',
82+
+ ' increase(opensearch_index_search_fetch_time_seconds{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval) / \n'
83+
+ ' clamp_min(increase(opensearch_index_search_fetch_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
84+
+ ')',
8585
legendCustomTemplate: '{{index}} - fetch',
8686
},
8787
},
@@ -94,9 +94,9 @@ function(this)
9494
sources: {
9595
prometheus: {
9696
expr: 'avg by (job,opensearch_cluster,index) (\n'
97-
+ ' increase(opensearch_index_search_scroll_time_seconds{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval) / \n'
98-
+ ' clamp_min(increase(opensearch_index_search_scroll_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
99-
+ ')',
97+
+ ' increase(opensearch_index_search_scroll_time_seconds{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval) / \n'
98+
+ ' clamp_min(increase(opensearch_index_search_scroll_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
99+
+ ')',
100100
legendCustomTemplate: '{{index}} - scroll',
101101
},
102102
},
@@ -109,10 +109,10 @@ function(this)
109109
sources: {
110110
prometheus: {
111111
expr: 'avg by(job,opensearch_cluster,index) (\n'
112-
+ ' 100 * (opensearch_index_requestcache_hit_count{%(queriesSelector)s, context="total"}) / \n'
113-
+ ' clamp_min(opensearch_index_requestcache_hit_count{%(queriesSelector)s, context="total"} + \n'
114-
+ ' opensearch_index_requestcache_miss_count{%(queriesSelector)s, context="total"}, 1)\n'
115-
+ ')',
112+
+ ' 100 * (opensearch_index_requestcache_hit_count{%(queriesSelector)s, context="total"}) / \n'
113+
+ ' clamp_min(opensearch_index_requestcache_hit_count{%(queriesSelector)s, context="total"} + \n'
114+
+ ' opensearch_index_requestcache_miss_count{%(queriesSelector)s, context="total"}, 1)\n'
115+
+ ')',
116116
legendCustomTemplate: '{{index}} - request',
117117
},
118118
},
@@ -125,10 +125,10 @@ function(this)
125125
sources: {
126126
prometheus: {
127127
expr: 'avg by(job,opensearch_cluster,index) (\n'
128-
+ ' 100 * (opensearch_index_querycache_hit_count{%(queriesSelector)s, context="total"}) / \n'
129-
+ ' clamp_min(opensearch_index_querycache_hit_count{%(queriesSelector)s, context="total"} + \n'
130-
+ ' opensearch_index_querycache_miss_number{%(queriesSelector)s, context="total"}, 1)\n'
131-
+ ')',
128+
+ ' 100 * (opensearch_index_querycache_hit_count{%(queriesSelector)s, context="total"}) / \n'
129+
+ ' clamp_min(opensearch_index_querycache_hit_count{%(queriesSelector)s, context="total"} + \n'
130+
+ ' opensearch_index_querycache_miss_number{%(queriesSelector)s, context="total"}, 1)\n'
131+
+ ')',
132132
legendCustomTemplate: '{{index}} - query',
133133
},
134134
},
@@ -228,9 +228,9 @@ function(this)
228228
sources: {
229229
prometheus: {
230230
expr: 'avg by(' + this.groupAggList + ') (\n'
231-
+ ' increase(opensearch_index_indexing_index_time_seconds{%(queriesSelector)s, context=~"total"}[$__interval:] offset $__interval) / \n'
232-
+ ' clamp_min(increase(opensearch_index_indexing_index_count{%(queriesSelector)s, context=~"total"}[$__interval:] offset $__interval), 1)\n'
233-
+ ')',
231+
+ ' increase(opensearch_index_indexing_index_time_seconds{%(queriesSelector)s, context=~"total"}[$__interval:] offset $__interval) / \n'
232+
+ ' clamp_min(increase(opensearch_index_indexing_index_count{%(queriesSelector)s, context=~"total"}[$__interval:] offset $__interval), 1)\n'
233+
+ ')',
234234
},
235235
},
236236
},
@@ -285,9 +285,9 @@ function(this)
285285
sources: {
286286
prometheus: {
287287
expr: 'avg by(' + this.groupAggList + ',index) (\n'
288-
+ ' increase(opensearch_index_flush_total_time_seconds{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval) / \n'
289-
+ ' clamp_min(increase(opensearch_index_flush_total_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
290-
+ ')',
288+
+ ' increase(opensearch_index_flush_total_time_seconds{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval) / \n'
289+
+ ' clamp_min(increase(opensearch_index_flush_total_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
290+
+ ')',
291291
legendCustomTemplate: '{{index}}',
292292
},
293293
},
@@ -308,7 +308,7 @@ function(this)
308308
},
309309
},
310310
},
311-
311+
312312
merge_stopped_time: {
313313
name: 'Merge stopped time increase',
314314
description: 'Merge stopped time increase (boolean >0).',
@@ -379,9 +379,9 @@ function(this)
379379
sources: {
380380
prometheus: {
381381
expr: 'avg by(job,opensearch_cluster,index) (\n'
382-
+ ' increase(opensearch_index_refresh_total_time_seconds{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval) / \n'
383-
+ ' clamp_min(increase(opensearch_index_refresh_total_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
384-
+ ')',
382+
+ ' increase(opensearch_index_refresh_total_time_seconds{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval) / \n'
383+
+ ' clamp_min(increase(opensearch_index_refresh_total_count{%(queriesSelector)s, context="total"}[$__interval:] offset $__interval), 1)\n'
384+
+ ')',
385385
legendCustomTemplate: '{{index}}',
386386
},
387387
},

0 commit comments

Comments
 (0)