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

Commit

Permalink
Merge pull request #73 from vishh/kubelet_api
Browse files Browse the repository at this point in the history 
Fix heapster controller spec.
  • Loading branch information
@vmarmol
vmarmol committed Jan 22, 2015
2 parents c48eaf7 + 95f9cf4 commit 01e90a0
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 58 deletions.
2 changes: 1 addition & 1 deletion deploy/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ desiredState:
containers:
-
name: "heapster"
image: "kubernetes/heapster:v0.6"
image: "kubernetes/heapster:v0.5"
env:
-
name: "INFLUXDB_HOST"
Expand Down
128 changes: 72 additions & 56 deletions influx-grafana/grafana/kubernetes-dashboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"timezone": "browser",
"editable": true,
"hideControls": false,
"sharedCrosshair": false,
"rows": [
{
"title": "test",
Expand Down Expand Up @@ -66,7 +67,8 @@
"steppedLine": false,
"tooltip": {
"value_type": "cumulative",
"query_as_alias": true
"query_as_alias": true,
"shared": false
},
"targets": [
{
Expand All @@ -86,14 +88,15 @@
}
],
"aliasColors": {},
"title": "All 'containers' CPU usage",
"title": "All 'containers' CPU usage - Stacked",
"datasource": null,
"renderer": "png",
"annotate": {
"enable": false
},
"id": 1,
"seriesOverrides": []
"seriesOverrides": [],
"links": []
},
{
"span": 6,
Expand Down Expand Up @@ -145,8 +148,9 @@
"nullPointMode": "connected",
"steppedLine": false,
"tooltip": {
"value_type": "individual",
"query_as_alias": true
"value_type": "cumulative",
"query_as_alias": true,
"shared": false
},
"targets": [
{
Expand All @@ -166,14 +170,15 @@
}
],
"aliasColors": {},
"title": "All 'containers' Memory usage",
"title": "All 'containers' Memory usage - Stacked",
"datasource": null,
"renderer": "png",
"annotate": {
"enable": false
},
"id": 2,
"seriesOverrides": []
"seriesOverrides": [],
"links": []
}
],
"notice": false
Expand All @@ -194,7 +199,7 @@
"scale": 1,
"y_formats": [
"ns",
"bytes"
"ns"
],
"grid": {
"max": null,
Expand Down Expand Up @@ -236,34 +241,37 @@
"steppedLine": false,
"tooltip": {
"value_type": "cumulative",
"query_as_alias": true
"query_as_alias": true,
"shared": false
},
"targets": [
{
"target": "randomWalk('random walk')",
"function": "derivative",
"column": "cpu_cumulative_usage",
"series": "stats",
"query": "select container_name, derivative(cpu_cumulative_usage) from \"stats\" where $timeFilter group by time($interval), container_name order asc",
"query": "select container_name, derivative(cpu_cumulative_usage) from \"stats\" where $timeFilter and labels =~ /name:heapster/ group by time($interval), container_name order asc",
"condition_filter": true,
"condition_key": "pod",
"condition_op": "=",
"condition_value": "'heapster'",
"interval": "2s",
"interval": "5s",
"groupby_field_add": true,
"groupby_field": "container_name",
"alias": ""
"alias": "",
"condition": "labels =~ /name:heapster/",
"rawQuery": false,
"fill": ""
}
],
"aliasColors": {},
"title": "Pod 'heapster' CPU usage",
"title": "Label 'name:heapster' CPU usage",
"datasource": null,
"renderer": "png",
"annotate": {
"enable": false
},
"id": 3,
"seriesOverrides": []
"seriesOverrides": [],
"links": [],
"interval": ""
},
{
"span": 6,
Expand Down Expand Up @@ -310,55 +318,54 @@
"interactive": true,
"legend_counts": true,
"timezone": "browser",
"percentage": true,
"percentage": false,
"zerofill": true,
"nullPointMode": "connected",
"steppedLine": false,
"tooltip": {
"value_type": "cumulative",
"query_as_alias": true
"value_type": "individual",
"query_as_alias": true,
"shared": false
},
"targets": [
{
"target": "randomWalk('random walk')",
"function": "mean",
"column": "memory_usage",
"series": "stats",
"query": "select container_name, mean(memory_usage) from \"stats\" where $timeFilter group by time($interval), container_name order asc",
"query": "select mean(memory_usage) from \"stats\" where $timeFilter and labels =~ /name:heapster/ group by time($interval) order asc",
"condition_filter": true,
"condition_key": "pod",
"condition_op": "=",
"condition_value": "'heapster'",
"interval": "2s",
"groupby_field_add": true,
"groupby_field": "container_name",
"alias": "total"
"groupby_field": "",
"alias": "total",
"condition": "labels =~ /name:heapster/"
},
{
"target": "randomWalk('random walk2')",
"function": "mean",
"column": "memory_working_set",
"series": "stats",
"query": "select container_name, mean(memory_working_set) from \"stats\" where $timeFilter group by time($interval), container_name order asc",
"query": "select mean(memory_working_set) from \"stats\" where $timeFilter and labels =~ /name:heapster/ group by time($interval) order asc",
"condition_filter": true,
"condition_key": "pod",
"condition_op": "=",
"condition_value": "'heapster'",
"interval": "2s",
"groupby_field_add": true,
"groupby_field": "container_name",
"alias": "hot"
"groupby_field": "",
"alias": "hot",
"condition": "labels =~ /name:heapster/"
}
],
"aliasColors": {},
"title": "Pod 'heapster' memory usage",
"title": "Labels 'name:heapster' memory usage",
"datasource": null,
"renderer": "png",
"annotate": {
"enable": false
},
"id": 4,
"seriesOverrides": []
"seriesOverrides": [],
"links": [],
"interval": "2s"
}
],
"notice": false
Expand Down Expand Up @@ -420,35 +427,36 @@
"nullPointMode": "connected",
"steppedLine": false,
"tooltip": {
"value_type": "individual",
"query_as_alias": true
"value_type": "cumulative",
"query_as_alias": true,
"shared": false
},
"targets": [
{
"target": "randomWalk('random walk')",
"function": "derivative",
"column": "cpu_cumulative_usage",
"series": "stats",
"query": "select container_name, derivative(cpu_cumulative_usage) from \"stats\" where $timeFilter group by time($interval), container_name order asc",
"query": "select container_name, derivative(cpu_cumulative_usage) from \"stats\" where $timeFilter and labels =~ /name:influxGrafana/ group by time($interval), container_name order asc",
"condition_filter": true,
"condition_key": "labels",
"condition_op": "=",
"condition_value": "'name:influxGrafana'",
"interval": "2s",
"groupby_field_add": true,
"groupby_field": "container_name",
"alias": ""
"alias": "",
"condition": "labels =~ /name:influxGrafana/"
}
],
"aliasColors": {},
"title": "Labels 'influx-grafana' CPU usage",
"title": "Labels 'name:influx-grafana' CPU usage",
"datasource": null,
"renderer": "png",
"annotate": {
"enable": false
},
"id": 5,
"seriesOverrides": []
"seriesOverrides": [],
"interval": "",
"links": []
},
{
"span": 6,
Expand Down Expand Up @@ -500,8 +508,9 @@
"nullPointMode": "connected",
"steppedLine": false,
"tooltip": {
"value_type": "individual",
"query_as_alias": true
"value_type": "cumulative",
"query_as_alias": true,
"shared": false
},
"targets": [
{
Expand Down Expand Up @@ -532,14 +541,15 @@
}
],
"aliasColors": {},
"title": "Labels 'influx-grafana' memory usage",
"title": "Labels 'name:influx-grafana' memory usage",
"datasource": null,
"renderer": "png",
"annotate": {
"enable": false
},
"id": 6,
"seriesOverrides": []
"seriesOverrides": [],
"links": []
}
],
"notice": false
Expand Down Expand Up @@ -603,7 +613,8 @@
"steppedLine": false,
"tooltip": {
"value_type": "individual",
"query_as_alias": true
"query_as_alias": true,
"shared": false
},
"targets": [
{
Expand All @@ -622,15 +633,16 @@
}
],
"aliasColors": {},
"title": "Cluster CPU usage - stacked",
"title": "Cluster CPU usage - Stacked",
"datasource": null,
"renderer": "png",
"annotate": {
"enable": false
},
"id": 7,
"seriesOverrides": [],
"interval": "2s"
"interval": "2s",
"links": []
},
{
"span": 6,
Expand Down Expand Up @@ -685,7 +697,8 @@
"steppedLine": false,
"tooltip": {
"value_type": "individual",
"query_as_alias": true
"query_as_alias": true,
"shared": false
},
"targets": [
{
Expand All @@ -704,14 +717,15 @@
}
],
"aliasColors": {},
"title": "Cluster memory usage - stacked",
"title": "Cluster memory usage - Stacked",
"datasource": null,
"renderer": "png",
"annotate": {
"enable": false
},
"id": 8,
"seriesOverrides": []
"seriesOverrides": [],
"links": []
}
],
"notice": false
Expand Down Expand Up @@ -759,8 +773,10 @@
"enable": false
},
"annotations": {
"enable": false
"enable": false,
"list": []
},
"refresh": false,
"version": 6
}
"version": 6,
"hideAllLegends": false
}
2 changes: 1 addition & 1 deletion influx-grafana/grafana/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ if [ ! -f /.dashboard_configured ]; then
/set_dashboard.sh
fi

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

0 comments on commit 01e90a0

Please sign in to comment.