Skip to content

Commit 14b6a89

Browse files
paigerube14paigerube14
committed
wrong namespace var
1 parent af68357 commit 14b6a89

File tree

5 files changed

+202
-6
lines changed

5 files changed

+202
-6
lines changed

‎assets/container-scenarios/panels.libsonnet‎

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,72 @@ local queries = import 'queries.libsonnet';
247247
},
248248
},
249249
overrides: [
250+
{
251+
"matcher": {
252+
"id": "byName",
253+
"options": "kubernetes_objects_count.Deployment"
254+
},
255+
"properties": [
256+
{
257+
"id": "custom.hidden"
258+
}
259+
]
260+
},
261+
{
262+
"matcher": {
263+
"id": "byName",
264+
"options": "kubernetes_objects_count.ConfigMap"
265+
},
266+
"properties": [
267+
{
268+
"id": "custom.hidden"
269+
}
270+
]
271+
},
272+
{
273+
"matcher": {
274+
"id": "byName",
275+
"options": "kubernetes_objects_count.Build"
276+
},
277+
"properties": [
278+
{
279+
"id": "custom.hidden"
280+
}
281+
]
282+
},
283+
{
284+
"matcher": {
285+
"id": "byName",
286+
"options": "_type"
287+
},
288+
"properties": [
289+
{
290+
"id": "custom.hidden"
291+
}
292+
]
293+
},
294+
{
295+
"matcher": {
296+
"id": "byName",
297+
"options": "kubernetes_objects"
298+
},
299+
"properties": [
300+
{
301+
"id": "custom.hidden"
302+
}
303+
]
304+
},
305+
{
306+
"matcher": {
307+
"id": "byName",
308+
"options": "_id"
309+
},
310+
"properties": [
311+
{
312+
"id": "custom.hidden"
313+
}
314+
]
315+
},
250316
{
251317
matcher: {
252318
id: 'byName',
@@ -472,7 +538,7 @@ local queries = import 'queries.libsonnet';
472538
type: 'raw_data',
473539
},
474540
],
475-
query: 'run_uuid.keyword: $run_uuid AND type.keyword: unrecovered AND metricName.keyword: affected_pods_recovery AND namespace.keyword: openshift-etcd',
541+
query: 'run_uuid.keyword: $run_uuid AND type.keyword: unrecovered AND metricName.keyword: affected_pods_recovery AND namespace.keyword: $namespace',
476542
refId: 'A',
477543
timeField: 'timestamp',
478544
},

‎assets/container-scenarios/variables.libsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
self.datasourceVariable('Alerts', 'Alerts', 'grafana-opensearch-datasource', '/.*Alerts*./'),
5454
self.queryVariable('platform', 'platform', '{"find": "terms", "field": "cloud_infrastructure.keyword"}', '${Datasource}'),
5555
self.queryVariable('cloud_type', 'cloud_type', '{"find": "terms", "field": "cloud_type.keyword", "query": "cloud_infrastructure.keyword: $platform"}', '${Datasource}'),
56-
self.queryVariable('namespace', 'namespace', '{"find": "terms", "field": "scenarios.parameters.namespace.keyword", "query": "cloud_infrastructure.keyword: $platform AND cloud_type.keyword: $cloud_type AND scenarios.scenario: /tmp/container_scenario.yaml"}', '${Datasource}', true, true),
57-
self.queryVariable('networkType', 'networkType', '{"find": "terms", "field": "network_plugins.keyword", "query": "cloud_infrastructure.keyword: $platform AND cloud_type.keyword: $cloud_type"}', '${Datasource}'),
56+
self.queryVariable('namespace', 'namespace', '{"find": "terms", "field": "scenarios.parameters.scenarios.namespace.keyword", "query": "cloud_infrastructure.keyword: $platform AND cloud_type.keyword: $cloud_type AND scenarios.scenario: /tmp/container_scenario.yaml"}', '${Datasource}', true, true),
57+
z self.queryVariable('networkType', 'networkType', '{"find": "terms", "field": "network_plugins.keyword", "query": "cloud_infrastructure.keyword: $platform AND cloud_type.keyword: $cloud_type"}', '${Datasource}'),
5858
self.queryVariable('node_count', 'node_count', '{"find": "terms", "field": "node_summary_infos.count", "query": "cloud_infrastructure.keyword: $platform AND scenarios.scenario: /tmp/container_scenario.yaml AND cloud_type.keyword: $cloud_type"}', '${Datasource}'),
5959
self.queryVariable('major_version', 'major_version', '{"find": "terms", "field": "major_version.keyword", "query": "cloud_infrastructure.keyword: $platform AND network_plugins.keyword: $networkType AND scenarios.scenario: /tmp/container_scenario.yaml AND cloud_type.keyword: $cloud_type" }', '${Datasource}', true, true),
6060
self.queryVariable('run_uuid', 'run_uuid', '{"find": "terms", "field": "run_uuid.keyword", "query": "cloud_infrastructure.keyword: $platform AND network_plugins.keyword: $networkType AND scenarios.scenario: /tmp/container_scenario.yaml AND major_version.keyword: $major_version AND cloud_type.keyword: $cloud_type AND node_summary_infos.count: $node_count"}', '${Datasource}', true, true),

‎assets/node-scenarios/panels.libsonnet‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,72 @@ local queries = import 'queries.libsonnet';
3434
],
3535
},
3636
},
37-
overrides: [],
37+
overrides: [{
38+
"matcher": {
39+
"id": "byName",
40+
"options": "kubernetes_objects_count.Deployment"
41+
},
42+
"properties": [
43+
{
44+
"id": "custom.hidden"
45+
}
46+
]
47+
},
48+
{
49+
"matcher": {
50+
"id": "byName",
51+
"options": "kubernetes_objects_count.ConfigMap"
52+
},
53+
"properties": [
54+
{
55+
"id": "custom.hidden"
56+
}
57+
]
58+
},
59+
{
60+
"matcher": {
61+
"id": "byName",
62+
"options": "kubernetes_objects_count.Build"
63+
},
64+
"properties": [
65+
{
66+
"id": "custom.hidden"
67+
}
68+
]
69+
},
70+
{
71+
"matcher": {
72+
"id": "byName",
73+
"options": "_type"
74+
},
75+
"properties": [
76+
{
77+
"id": "custom.hidden"
78+
}
79+
]
80+
},
81+
{
82+
"matcher": {
83+
"id": "byName",
84+
"options": "kubernetes_objects"
85+
},
86+
"properties": [
87+
{
88+
"id": "custom.hidden"
89+
}
90+
]
91+
},
92+
{
93+
"matcher": {
94+
"id": "byName",
95+
"options": "_id"
96+
},
97+
"properties": [
98+
{
99+
"id": "custom.hidden"
100+
}
101+
]
102+
}],
38103
},
39104
gridPos: { h: 10, w: 24, x: 0, y: 1 },
40105
id: 2,

‎assets/pod-scenarios/panels.libsonnet‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,72 @@ local queries = import 'queries.libsonnet';
3333
],
3434
},
3535
},
36-
overrides: [],
36+
overrides: [{
37+
"matcher": {
38+
"id": "byName",
39+
"options": "kubernetes_objects_count.Deployment"
40+
},
41+
"properties": [
42+
{
43+
"id": "custom.hidden"
44+
}
45+
]
46+
},
47+
{
48+
"matcher": {
49+
"id": "byName",
50+
"options": "kubernetes_objects_count.ConfigMap"
51+
},
52+
"properties": [
53+
{
54+
"id": "custom.hidden"
55+
}
56+
]
57+
},
58+
{
59+
"matcher": {
60+
"id": "byName",
61+
"options": "kubernetes_objects_count.Build"
62+
},
63+
"properties": [
64+
{
65+
"id": "custom.hidden"
66+
}
67+
]
68+
},
69+
{
70+
"matcher": {
71+
"id": "byName",
72+
"options": "_type"
73+
},
74+
"properties": [
75+
{
76+
"id": "custom.hidden"
77+
}
78+
]
79+
},
80+
{
81+
"matcher": {
82+
"id": "byName",
83+
"options": "kubernetes_objects"
84+
},
85+
"properties": [
86+
{
87+
"id": "custom.hidden"
88+
}
89+
]
90+
},
91+
{
92+
"matcher": {
93+
"id": "byName",
94+
"options": "_id"
95+
},
96+
"properties": [
97+
{
98+
"id": "custom.hidden"
99+
}
100+
]
101+
}],
37102
},
38103
gridPos: { h: 10, w: 24, x: 0, y: 1 },
39104
id: 2,

‎assets/pod-scenarios/variables.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
self.datasourceVariable('Alerts', 'Alerts', 'grafana-opensearch-datasource', '/.*Alerts*./'),
5454
self.queryVariable('platform', 'platform', '{"find": "terms", "field": "cloud_infrastructure.keyword"}', '${Datasource}'),
5555
self.queryVariable('cloud_type', 'cloud_type', '{"find": "terms", "field": "cloud_type.keyword", "query": "cloud_infrastructure.keyword: $platform"}', '${Datasource}'),
56-
self.queryVariable('namespace', 'namespace', '{"find": "terms", "field": "scenarios.parameters.namespace.keyword", "query": "cloud_infrastructure.keyword: $platform AND cloud_type.keyword: $cloud_type AND scenarios.scenario: /tmp/pod_scenario.yaml"}', '${Datasource}', true, true),
56+
self.queryVariable('namespace', 'namespace', '{"find": "terms", "field": "scenarios.parameters.config.namespace_pattern.keyword", "query": "cloud_infrastructure.keyword: $platform AND cloud_type.keyword: $cloud_type AND scenarios.scenario: /tmp/pod_scenario.yaml"}', '${Datasource}', true, true),
5757
self.queryVariable('networkType', 'networkType', '{"find": "terms", "field": "network_plugins.keyword", "query": "cloud_infrastructure.keyword: $platform AND cloud_type.keyword: $cloud_type"}', '${Datasource}'),
5858
self.queryVariable('node_count', 'node_count', '{"find": "terms", "field": "node_summary_infos.count", "query": "cloud_infrastructure.keyword: $platform AND scenarios.scenario: /tmp/pod_scenario.yaml AND cloud_type.keyword: $cloud_type"}', '${Datasource}'),
5959
self.queryVariable('major_version', 'major_version', '{"find": "terms", "field": "major_version.keyword", "query": "cloud_infrastructure.keyword: $platform AND network_plugins.keyword: $networkType AND scenarios.scenario: /tmp/pod_scenario.yaml AND cloud_type.keyword: $cloud_type" }', '${Datasource}', true, true),

0 commit comments

Comments
 (0)