From 6b214f6c6663b994251c662a0d39b7ee05bbb16e Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Thu, 11 Apr 2013 14:25:49 -0700 Subject: [PATCH] Fix time range in default dashboard --- dashboards/default | 120 ++++++++++++++++++++----------------- panels/histogram/module.js | 10 +--- 2 files changed, 68 insertions(+), 62 deletions(-) diff --git a/dashboards/default b/dashboards/default index 2670afceb50e6..cb0a3a2cdff52 100644 --- a/dashboards/default +++ b/dashboards/default @@ -5,7 +5,7 @@ "title": "Options", "height": "50px", "editable": true, - "collapse": true, + "collapse": false, "collapsable": true, "panels": [ { @@ -28,7 +28,7 @@ "2d", "5d" ], - "timespan": "15m", + "timespan": "6h", "timefield": "@timestamp", "index": "\"logstash-\"yyyy.mm.dd", "defaultindex": "NOINDEX", @@ -37,39 +37,7 @@ "enable": false, "interval": 30, "min": 3 - }, - "time": { - "from": "04/03/2013 08:58:07", - "to": "04/03/2013 09:13:07" } - } - ] - }, - { - "title": "Query Control", - "height": "50px", - "editable": true, - "collapse": false, - "collapsable": true, - "panels": [ - { - "loading": false, - "error": false, - "span": 7, - "editable": true, - "group": [ - "default" - ], - "type": "stringquery", - "label": "Search", - "query": "", - "size": 100, - "sort": [ - "_score", - "desc" - ], - "multi": false, - "multi_arrange": "horizontal" }, { "loading": false, @@ -96,36 +64,46 @@ "elasticsearch_saveto": "kibana-int", "temp": true, "temp_ttl": "30d" - }, + } + ] + }, + { + "title": "Query", + "height": "50px", + "editable": true, + "collapse": false, + "collapsable": true, + "panels": [ { "loading": false, "error": false, - "span": 2, + "span": 12, "editable": true, "group": [ "default" ], - "type": "hits", + "type": "stringquery", + "label": "Search", "query": "*", - "style": { - "font-size": "24pt", - "font-weight": "bold" - }, - "run_query": false, - "title": "Hits" + "size": 100, + "sort": [ + "_score", + "desc" + ], + "multi": false, + "multi_arrange": "horizontal" } ] }, { "title": "Graph", - "height": "150px", + "height": "350px", "editable": true, "collapse": false, "collapsable": true, "panels": [ { "loading": false, - "error": false, "span": 12, "editable": true, "group": [ @@ -134,11 +112,11 @@ "type": "histogram", "query": [ { - "query": "", - "label": "" + "query": "*", + "label": "*" } ], - "interval": "30s", + "interval": "5m", "show": [ "points", "lines", @@ -150,9 +128,43 @@ "spyable": true, "zoomlinks": true, "index": [ - "logstash-2013.04.03" + "logstash-2013.04.11" + ], + "fill": 0, + "linewidth": 2, + "bars": true, + "stack": true, + "points": false, + "lines": false, + "legend": true, + "x-axis": true, + "y-axis": true + }, + { + "loading": false, + "span": 0, + "editable": true, + "group": [ + "default" ], - "fill": 1 + "type": "hits", + "query": [ + { + "query": "*", + "label": "*" + } + ], + "style": { + "font-size": "9pt" + }, + "aggregate": false, + "arrangement": "horizontal", + "chart": true, + "counters": true, + "count_pos": "above", + "index": [ + "logstash-2013.04.11" + ] } ] }, @@ -179,7 +191,7 @@ "@timestamp", "desc" ], - "query": "" + "query": "*" }, { "loading": false, @@ -190,7 +202,7 @@ "default" ], "type": "table", - "query": "", + "query": "*", "interval": "1y", "show": [ "bars", @@ -218,11 +230,11 @@ ], "sortable": true, "index": [ - "logstash-2013.04.03" + "logstash-2013.04.11" ] } ] } ], "editable": true -} \ No newline at end of file +} diff --git a/panels/histogram/module.js b/panels/histogram/module.js index d1f2ef91c1684..42f3287a547d1 100644 --- a/panels/histogram/module.js +++ b/panels/histogram/module.js @@ -249,7 +249,7 @@ angular.module('kibana.histogram', []) }, selection: { mode: "x", - color: '#666' + color: '#999' }, grid: { backgroundColor: '#fff', @@ -258,13 +258,7 @@ angular.module('kibana.histogram', []) color: "#eee", hoverable: true, }, - colors: ['#86B22D', - '#BF6730', - '#1D7373', - '#BFB930', - '#BF3030', - '#77207D' - ] + colors: ['#86B22D','#BF6730','#1D7373','#BFB930','#BF3030','#77207D'] }) // Work around for missing legend at initialization