Skip to content
This repository was archived by the owner on Dec 1, 2018. It is now read-only.

Commit 01e90a0

Browse files
vmarmolvmarmol
committed
Merge pull request #73 from vishh/kubelet_api
Fix heapster controller spec.
2 parents c48eaf7 + 95f9cf4 commit 01e90a0

File tree

3 files changed

+74
-58
lines changed

3 files changed

+74
-58
lines changed

‎deploy/heapster-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ desiredState:
1313
containers:
1414
-
1515
name: "heapster"
16-
image: "kubernetes/heapster:v0.6"
16+
image: "kubernetes/heapster:v0.5"
1717
env:
1818
-
1919
name: "INFLUXDB_HOST"

‎influx-grafana/grafana/kubernetes-dashboard.json

+72-56
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"timezone": "browser",
88
"editable": true,
99
"hideControls": false,
10+
"sharedCrosshair": false,
1011
"rows": [
1112
{
1213
"title": "test",
@@ -66,7 +67,8 @@
6667
"steppedLine": false,
6768
"tooltip": {
6869
"value_type": "cumulative",
69-
"query_as_alias": true
70+
"query_as_alias": true,
71+
"shared": false
7072
},
7173
"targets": [
7274
{
@@ -86,14 +88,15 @@
8688
}
8789
],
8890
"aliasColors": {},
89-
"title": "All 'containers' CPU usage",
91+
"title": "All 'containers' CPU usage - Stacked",
9092
"datasource": null,
9193
"renderer": "png",
9294
"annotate": {
9395
"enable": false
9496
},
9597
"id": 1,
96-
"seriesOverrides": []
98+
"seriesOverrides": [],
99+
"links": []
97100
},
98101
{
99102
"span": 6,
@@ -145,8 +148,9 @@
145148
"nullPointMode": "connected",
146149
"steppedLine": false,
147150
"tooltip": {
148-
"value_type": "individual",
149-
"query_as_alias": true
151+
"value_type": "cumulative",
152+
"query_as_alias": true,
153+
"shared": false
150154
},
151155
"targets": [
152156
{
@@ -166,14 +170,15 @@
166170
}
167171
],
168172
"aliasColors": {},
169-
"title": "All 'containers' Memory usage",
173+
"title": "All 'containers' Memory usage - Stacked",
170174
"datasource": null,
171175
"renderer": "png",
172176
"annotate": {
173177
"enable": false
174178
},
175179
"id": 2,
176-
"seriesOverrides": []
180+
"seriesOverrides": [],
181+
"links": []
177182
}
178183
],
179184
"notice": false
@@ -194,7 +199,7 @@
194199
"scale": 1,
195200
"y_formats": [
196201
"ns",
197-
"bytes"
202+
"ns"
198203
],
199204
"grid": {
200205
"max": null,
@@ -236,34 +241,37 @@
236241
"steppedLine": false,
237242
"tooltip": {
238243
"value_type": "cumulative",
239-
"query_as_alias": true
244+
"query_as_alias": true,
245+
"shared": false
240246
},
241247
"targets": [
242248
{
243249
"target": "randomWalk('random walk')",
244250
"function": "derivative",
245251
"column": "cpu_cumulative_usage",
246252
"series": "stats",
247-
"query": "select container_name, derivative(cpu_cumulative_usage) from \"stats\" where $timeFilter group by time($interval), container_name order asc",
253+
"query": "select container_name, derivative(cpu_cumulative_usage) from \"stats\" where $timeFilter and labels =~ /name:heapster/ group by time($interval), container_name order asc",
248254
"condition_filter": true,
249-
"condition_key": "pod",
250-
"condition_op": "=",
251-
"condition_value": "'heapster'",
252-
"interval": "2s",
255+
"interval": "5s",
253256
"groupby_field_add": true,
254257
"groupby_field": "container_name",
255-
"alias": ""
258+
"alias": "",
259+
"condition": "labels =~ /name:heapster/",
260+
"rawQuery": false,
261+
"fill": ""
256262
}
257263
],
258264
"aliasColors": {},
259-
"title": "Pod 'heapster' CPU usage",
265+
"title": "Label 'name:heapster' CPU usage",
260266
"datasource": null,
261267
"renderer": "png",
262268
"annotate": {
263269
"enable": false
264270
},
265271
"id": 3,
266-
"seriesOverrides": []
272+
"seriesOverrides": [],
273+
"links": [],
274+
"interval": ""
267275
},
268276
{
269277
"span": 6,
@@ -310,55 +318,54 @@
310318
"interactive": true,
311319
"legend_counts": true,
312320
"timezone": "browser",
313-
"percentage": true,
321+
"percentage": false,
314322
"zerofill": true,
315323
"nullPointMode": "connected",
316324
"steppedLine": false,
317325
"tooltip": {
318-
"value_type": "cumulative",
319-
"query_as_alias": true
326+
"value_type": "individual",
327+
"query_as_alias": true,
328+
"shared": false
320329
},
321330
"targets": [
322331
{
323332
"target": "randomWalk('random walk')",
324333
"function": "mean",
325334
"column": "memory_usage",
326335
"series": "stats",
327-
"query": "select container_name, mean(memory_usage) from \"stats\" where $timeFilter group by time($interval), container_name order asc",
336+
"query": "select mean(memory_usage) from \"stats\" where $timeFilter and labels =~ /name:heapster/ group by time($interval) order asc",
328337
"condition_filter": true,
329-
"condition_key": "pod",
330-
"condition_op": "=",
331-
"condition_value": "'heapster'",
332338
"interval": "2s",
333339
"groupby_field_add": true,
334-
"groupby_field": "container_name",
335-
"alias": "total"
340+
"groupby_field": "",
341+
"alias": "total",
342+
"condition": "labels =~ /name:heapster/"
336343
},
337344
{
338345
"target": "randomWalk('random walk2')",
339346
"function": "mean",
340347
"column": "memory_working_set",
341348
"series": "stats",
342-
"query": "select container_name, mean(memory_working_set) from \"stats\" where $timeFilter group by time($interval), container_name order asc",
349+
"query": "select mean(memory_working_set) from \"stats\" where $timeFilter and labels =~ /name:heapster/ group by time($interval) order asc",
343350
"condition_filter": true,
344-
"condition_key": "pod",
345-
"condition_op": "=",
346-
"condition_value": "'heapster'",
347351
"interval": "2s",
348352
"groupby_field_add": true,
349-
"groupby_field": "container_name",
350-
"alias": "hot"
353+
"groupby_field": "",
354+
"alias": "hot",
355+
"condition": "labels =~ /name:heapster/"
351356
}
352357
],
353358
"aliasColors": {},
354-
"title": "Pod 'heapster' memory usage",
359+
"title": "Labels 'name:heapster' memory usage",
355360
"datasource": null,
356361
"renderer": "png",
357362
"annotate": {
358363
"enable": false
359364
},
360365
"id": 4,
361-
"seriesOverrides": []
366+
"seriesOverrides": [],
367+
"links": [],
368+
"interval": "2s"
362369
}
363370
],
364371
"notice": false
@@ -420,35 +427,36 @@
420427
"nullPointMode": "connected",
421428
"steppedLine": false,
422429
"tooltip": {
423-
"value_type": "individual",
424-
"query_as_alias": true
430+
"value_type": "cumulative",
431+
"query_as_alias": true,
432+
"shared": false
425433
},
426434
"targets": [
427435
{
428436
"target": "randomWalk('random walk')",
429437
"function": "derivative",
430438
"column": "cpu_cumulative_usage",
431439
"series": "stats",
432-
"query": "select container_name, derivative(cpu_cumulative_usage) from \"stats\" where $timeFilter group by time($interval), container_name order asc",
440+
"query": "select container_name, derivative(cpu_cumulative_usage) from \"stats\" where $timeFilter and labels =~ /name:influxGrafana/ group by time($interval), container_name order asc",
433441
"condition_filter": true,
434-
"condition_key": "labels",
435-
"condition_op": "=",
436-
"condition_value": "'name:influxGrafana'",
437442
"interval": "2s",
438443
"groupby_field_add": true,
439444
"groupby_field": "container_name",
440-
"alias": ""
445+
"alias": "",
446+
"condition": "labels =~ /name:influxGrafana/"
441447
}
442448
],
443449
"aliasColors": {},
444-
"title": "Labels 'influx-grafana' CPU usage",
450+
"title": "Labels 'name:influx-grafana' CPU usage",
445451
"datasource": null,
446452
"renderer": "png",
447453
"annotate": {
448454
"enable": false
449455
},
450456
"id": 5,
451-
"seriesOverrides": []
457+
"seriesOverrides": [],
458+
"interval": "",
459+
"links": []
452460
},
453461
{
454462
"span": 6,
@@ -500,8 +508,9 @@
500508
"nullPointMode": "connected",
501509
"steppedLine": false,
502510
"tooltip": {
503-
"value_type": "individual",
504-
"query_as_alias": true
511+
"value_type": "cumulative",
512+
"query_as_alias": true,
513+
"shared": false
505514
},
506515
"targets": [
507516
{
@@ -532,14 +541,15 @@
532541
}
533542
],
534543
"aliasColors": {},
535-
"title": "Labels 'influx-grafana' memory usage",
544+
"title": "Labels 'name:influx-grafana' memory usage",
536545
"datasource": null,
537546
"renderer": "png",
538547
"annotate": {
539548
"enable": false
540549
},
541550
"id": 6,
542-
"seriesOverrides": []
551+
"seriesOverrides": [],
552+
"links": []
543553
}
544554
],
545555
"notice": false
@@ -603,7 +613,8 @@
603613
"steppedLine": false,
604614
"tooltip": {
605615
"value_type": "individual",
606-
"query_as_alias": true
616+
"query_as_alias": true,
617+
"shared": false
607618
},
608619
"targets": [
609620
{
@@ -622,15 +633,16 @@
622633
}
623634
],
624635
"aliasColors": {},
625-
"title": "Cluster CPU usage - stacked",
636+
"title": "Cluster CPU usage - Stacked",
626637
"datasource": null,
627638
"renderer": "png",
628639
"annotate": {
629640
"enable": false
630641
},
631642
"id": 7,
632643
"seriesOverrides": [],
633-
"interval": "2s"
644+
"interval": "2s",
645+
"links": []
634646
},
635647
{
636648
"span": 6,
@@ -685,7 +697,8 @@
685697
"steppedLine": false,
686698
"tooltip": {
687699
"value_type": "individual",
688-
"query_as_alias": true
700+
"query_as_alias": true,
701+
"shared": false
689702
},
690703
"targets": [
691704
{
@@ -704,14 +717,15 @@
704717
}
705718
],
706719
"aliasColors": {},
707-
"title": "Cluster memory usage - stacked",
720+
"title": "Cluster memory usage - Stacked",
708721
"datasource": null,
709722
"renderer": "png",
710723
"annotate": {
711724
"enable": false
712725
},
713726
"id": 8,
714-
"seriesOverrides": []
727+
"seriesOverrides": [],
728+
"links": []
715729
}
716730
],
717731
"notice": false
@@ -759,8 +773,10 @@
759773
"enable": false
760774
},
761775
"annotations": {
762-
"enable": false
776+
"enable": false,
777+
"list": []
763778
},
764779
"refresh": false,
765-
"version": 6
766-
}
780+
"version": 6,
781+
"hideAllLegends": false
782+
}

‎influx-grafana/grafana/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ if [ ! -f /.dashboard_configured ]; then
2020
/set_dashboard.sh
2121
fi
2222

23-
echo "=> Grafana for heapster version: 0.2!"
23+
echo "=> Grafana for heapster version: v0.3!"
2424
echo "=> Starting and running Nginx..."
2525
/usr/sbin/nginx

0 commit comments

Comments
 (0)