Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

Commit ef15b95

Browse files
pracuccipracucci
authored
Merge pull request #156 from grafana/fix-setmember-usage
Fixed std.setMember() usage
2 parents 586f0cc + ea59729 commit ef15b95

File tree

8 files changed

+46
-46
lines changed

8 files changed

+46
-46
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ workflows:
1010
jobs:
1111
lint:
1212
docker:
13-
- image: grafana/cortex-jsonnet-build-image:e6474c5
13+
- image: grafana/cortex-jsonnet-build-image:387f7ca
1414
steps:
1515
- checkout
1616
- run: make lint
1717

1818
build:
1919
docker:
20-
- image: grafana/cortex-jsonnet-build-image:e6474c5
20+
- image: grafana/cortex-jsonnet-build-image:387f7ca
2121
steps:
2222
- checkout
2323
- run: make build-mixin

‎build-image/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM alpine:3.11 AS jsonnet-builder
33
RUN apk add --no-cache git make g++
44
RUN git clone https://github.com/google/jsonnet && \
5-
git -C jsonnet checkout v0.14.0 && \
5+
git -C jsonnet checkout v0.15.0 && \
66
make -C jsonnet 2LDFLAGS=-static && \
77
cp jsonnet/jsonnet /usr/bin && \
88
cp jsonnet/jsonnetfmt /usr/bin

‎cortex-mixin/alerts.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
prometheusAlerts+::
33
(import 'alerts/alerts.libsonnet') +
44

5-
(if std.setMember('blocks', $._config.storage_engine)
5+
(if std.member($._config.storage_engine, 'blocks')
66
then
77
(import 'alerts/blocks.libsonnet') +
88
(import 'alerts/compactor.libsonnet')

‎cortex-mixin/dashboards.libsonnet‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
(import 'dashboards/scaling.libsonnet') +
88
(import 'dashboards/writes.libsonnet') +
99

10-
(if std.setMember('blocks', $._config.storage_engine)
10+
(if std.member($._config.storage_engine, 'blocks')
1111
then
1212
(import 'dashboards/compactor.libsonnet') +
1313
(import 'dashboards/compactor-resources.libsonnet') +
1414
(import 'dashboards/object-store.libsonnet')
1515
else {}) +
1616

17-
(if std.setMember('chunks', $._config.storage_engine)
17+
(if std.member($._config.storage_engine, 'chunks')
1818
then import 'dashboards/chunks.libsonnet'
1919
else {}) +
2020

21-
(if std.setMember('blocks', $._config.storage_engine)
22-
&& std.setMember('chunks', $._config.storage_engine)
21+
(if std.member($._config.storage_engine, 'blocks')
22+
&& std.member($._config.storage_engine, 'chunks')
2323
then import 'dashboards/comparison.libsonnet'
2424
else {}) +
2525

‎cortex-mixin/dashboards/queries.libsonnet‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
6666
)
6767
)
6868
.addRowIf(
69-
std.setMember('chunks', $._config.storage_engine),
69+
std.member($._config.storage_engine, 'chunks'),
7070
$.row('Querier - Chunks storage - Index Cache')
7171
.addPanel(
7272
$.panel('Total entries') +
@@ -101,7 +101,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
101101
)
102102
)
103103
.addRowIf(
104-
std.setMember('chunks', $._config.storage_engine),
104+
std.member($._config.storage_engine, 'chunks'),
105105
$.row('Querier - Chunks storage - Store')
106106
.addPanel(
107107
$.panel('Index Lookups per Query') +
@@ -125,7 +125,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
125125
)
126126
)
127127
.addRowIf(
128-
std.setMember('chunks', $._config.storage_engine),
128+
std.member($._config.storage_engine, 'chunks'),
129129
$.row('Querier - Blocks storage')
130130
.addPanel(
131131
$.panel('Number of store-gateways hit per Query') +
@@ -144,7 +144,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
144144
)
145145
)
146146
.addRowIf(
147-
std.setMember('blocks', $._config.storage_engine),
147+
std.member($._config.storage_engine, 'blocks'),
148148
$.row('Store-gateway - Blocks')
149149
.addPanel(
150150
$.panel('Blocks queried / sec') +
@@ -165,7 +165,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
165165
)
166166
)
167167
.addRowIf(
168-
std.setMember('blocks', $._config.storage_engine),
168+
std.member($._config.storage_engine, 'blocks'),
169169
$.row('')
170170
.addPanel(
171171
$.panel('Series fetch duration (per request)') +
@@ -181,7 +181,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
181181
)
182182
)
183183
.addRowIf(
184-
std.setMember('blocks', $._config.storage_engine),
184+
std.member($._config.storage_engine, 'blocks'),
185185
$.row('')
186186
.addPanel(
187187
$.panel('Blocks currently loaded') +

‎cortex-mixin/dashboards/reads-resources.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
5353
)
5454
)
5555
.addRowIf(
56-
std.setMember('blocks', $._config.storage_engine),
56+
std.member($._config.storage_engine, 'blocks'),
5757
$.row('Store-gateway')
5858
.addPanel(
5959
$.containerCPUUsagePanel('CPU', 'store-gateway'),

‎cortex-mixin/dashboards/reads.libsonnet‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
6060
)
6161
)
6262
.addRowIf(
63-
std.setMember('blocks', $._config.storage_engine),
63+
std.member($._config.storage_engine, 'blocks'),
6464
$.row('Store-gateway')
6565
.addPanel(
6666
$.panel('QPS') +
@@ -72,7 +72,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
7272
)
7373
)
7474
.addRowIf(
75-
std.setMember('chunks', $._config.storage_engine),
75+
std.member($._config.storage_engine, 'chunks'),
7676
$.row('Memcached - Chunks storage - Index')
7777
.addPanel(
7878
$.panel('QPS') +
@@ -84,7 +84,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
8484
)
8585
)
8686
.addRowIf(
87-
std.setMember('chunks', $._config.storage_engine),
87+
std.member($._config.storage_engine, 'chunks'),
8888
$.row('Memcached - Chunks storage - Chunks')
8989
.addPanel(
9090
$.panel('QPS') +
@@ -96,7 +96,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
9696
)
9797
)
9898
.addRowIf(
99-
std.setMember('blocks', $._config.storage_engine),
99+
std.member($._config.storage_engine, 'blocks'),
100100
$.row('Memcached – Blocks Storage – Index header (Store-gateway)')
101101
.addPanel(
102102
$.panel('QPS') +
@@ -115,20 +115,20 @@ local utils = import 'mixin-utils/utils.libsonnet';
115115
)
116116
)
117117
.addRowIf(
118-
std.setMember('blocks', $._config.storage_engine),
118+
std.member($._config.storage_engine, 'blocks'),
119119
$.thanosMemcachedCache('Memcached – Blocks Storage – Chunks (Store-gateway)', $._config.job_names.store_gateway, 'store-gateway', 'chunks-cache')
120120
)
121121
.addRowIf(
122-
std.setMember('blocks', $._config.storage_engine),
122+
std.member($._config.storage_engine, 'blocks'),
123123
$.thanosMemcachedCache('Memcached – Blocks Storage – Metadada (Store-gateway)', $._config.job_names.store_gateway, 'store-gateway', 'metadata-cache')
124124
)
125125
.addRowIf(
126-
std.setMember('blocks', $._config.storage_engine),
126+
std.member($._config.storage_engine, 'blocks'),
127127
$.thanosMemcachedCache('Memcached – Blocks Storage – Metadada (Querier)', $._config.job_names.querier, 'querier', 'metadata-cache')
128128
)
129129
.addRowIf(
130-
std.setMember('chunks', $._config.storage_engine) &&
131-
std.setMember('cassandra', $._config.chunk_index_backend + $._config.chunk_store_backend),
130+
std.member($._config.storage_engine, 'chunks') &&
131+
std.member($._config.chunk_index_backend + $._config.chunk_store_backend, 'cassandra'),
132132
$.row('Cassandra')
133133
.addPanel(
134134
$.panel('QPS') +
@@ -140,8 +140,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
140140
)
141141
)
142142
.addRowIf(
143-
std.setMember('chunks', $._config.storage_engine) &&
144-
std.setMember('bigtable', $._config.chunk_index_backend + $._config.chunk_store_backend),
143+
std.member($._config.storage_engine, 'chunks') &&
144+
std.member($._config.chunk_index_backend + $._config.chunk_store_backend, 'bigtable'),
145145
$.row('BigTable')
146146
.addPanel(
147147
$.panel('QPS') +
@@ -153,8 +153,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
153153
),
154154
)
155155
.addRowIf(
156-
std.setMember('chunks', $._config.storage_engine) &&
157-
std.setMember('dynamodb', $._config.chunk_index_backend + $._config.chunk_store_backend),
156+
std.member($._config.storage_engine, 'chunks') &&
157+
std.member($._config.chunk_index_backend + $._config.chunk_store_backend, 'dynamodb'),
158158
$.row('DynamoDB')
159159
.addPanel(
160160
$.panel('QPS') +
@@ -166,8 +166,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
166166
),
167167
)
168168
.addRowIf(
169-
std.setMember('chunks', $._config.storage_engine) &&
170-
std.setMember('gcs', $._config.chunk_store_backend),
169+
std.member($._config.storage_engine, 'chunks') &&
170+
std.member($._config.chunk_store_backend, 'gcs'),
171171
$.row('GCS')
172172
.addPanel(
173173
$.panel('QPS') +
@@ -180,20 +180,20 @@ local utils = import 'mixin-utils/utils.libsonnet';
180180
)
181181
// Object store metrics for the store-gateway.
182182
.addRowIf(
183-
std.setMember('blocks', $._config.storage_engine),
183+
std.member($._config.storage_engine, 'blocks'),
184184
$.objectStorePanels1('Store-gateway - Blocks Object Store', 'store-gateway'),
185185
)
186186
.addRowIf(
187-
std.setMember('blocks', $._config.storage_engine),
187+
std.member($._config.storage_engine, 'blocks'),
188188
$.objectStorePanels2('', 'store-gateway'),
189189
)
190190
// Object store metrics for the querier.
191191
.addRowIf(
192-
std.setMember('blocks', $._config.storage_engine),
192+
std.member($._config.storage_engine, 'blocks'),
193193
$.objectStorePanels1('Querier - Blocks Object Store', 'querier'),
194194
)
195195
.addRowIf(
196-
std.setMember('blocks', $._config.storage_engine),
196+
std.member($._config.storage_engine, 'blocks'),
197197
$.objectStorePanels2('', 'querier'),
198198
),
199199
}

‎cortex-mixin/dashboards/writes.libsonnet‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
8686
)
8787
)
8888
.addRowIf(
89-
std.setMember('chunks', $._config.storage_engine),
89+
std.member($._config.storage_engine, 'chunks'),
9090
$.row('Memcached')
9191
.addPanel(
9292
$.panel('QPS') +
@@ -98,8 +98,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
9898
)
9999
)
100100
.addRowIf(
101-
std.setMember('chunks', $._config.storage_engine) &&
102-
std.setMember('cassandra', $._config.chunk_index_backend + $._config.chunk_store_backend),
101+
std.member($._config.storage_engine, 'chunks') &&
102+
std.member($._config.chunk_index_backend + $._config.chunk_store_backend, 'cassandra'),
103103
$.row('Cassandra')
104104
.addPanel(
105105
$.panel('QPS') +
@@ -111,8 +111,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
111111
)
112112
)
113113
.addRowIf(
114-
std.setMember('chunks', $._config.storage_engine) &&
115-
std.setMember('bigtable', $._config.chunk_index_backend + $._config.chunk_store_backend),
114+
std.member($._config.storage_engine, 'chunks') &&
115+
std.member($._config.chunk_index_backend + $._config.chunk_store_backend, 'bigtable'),
116116
$.row('BigTable')
117117
.addPanel(
118118
$.panel('QPS') +
@@ -124,8 +124,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
124124
)
125125
)
126126
.addRowIf(
127-
std.setMember('chunks', $._config.storage_engine) &&
128-
std.setMember('dynamodb', $._config.chunk_index_backend + $._config.chunk_store_backend),
127+
std.member($._config.storage_engine, 'chunks') &&
128+
std.member($._config.chunk_index_backend + $._config.chunk_store_backend, 'dynamodb'),
129129
$.row('DynamoDB')
130130
.addPanel(
131131
$.panel('QPS') +
@@ -137,8 +137,8 @@ local utils = import 'mixin-utils/utils.libsonnet';
137137
)
138138
)
139139
.addRowIf(
140-
std.setMember('chunks', $._config.storage_engine) &&
141-
std.setMember('gcs', $._config.chunk_store_backend),
140+
std.member($._config.storage_engine, 'chunks') &&
141+
std.member($._config.chunk_store_backend, 'gcs'),
142142
$.row('GCS')
143143
.addPanel(
144144
$.panel('QPS') +
@@ -150,7 +150,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
150150
)
151151
)
152152
.addRowIf(
153-
std.setMember('blocks', $._config.storage_engine),
153+
std.member($._config.storage_engine, 'blocks'),
154154
$.row('Ingester - Blocks storage - Shipper')
155155
.addPanel(
156156
$.successFailurePanel(
@@ -165,7 +165,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
165165
)
166166
)
167167
.addRowIf(
168-
std.setMember('blocks', $._config.storage_engine),
168+
std.member($._config.storage_engine, 'blocks'),
169169
$.row('Ingester - Blocks storage - TSDB Head')
170170
.addPanel(
171171
$.successFailurePanel(
@@ -180,7 +180,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
180180
)
181181
)
182182
.addRowIf(
183-
std.setMember('blocks', $._config.storage_engine),
183+
std.member($._config.storage_engine, 'blocks'),
184184
$.row('Ingester - Blocks storage - TSDB WAL')
185185
.addPanel(
186186
$.successFailurePanel(

0 commit comments

Comments
 (0)