diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json index aebc2bf751d..475f9e6dded 100644 --- a/src/app/dashboards/default.json +++ b/src/app/dashboards/default.json @@ -4,13 +4,180 @@ "filter": { "list": [], "time": { - "from": "now-5m", + "from": "now-6h", "to": "now" } } }, - "rows": [], + "rows": [ + { + "title": "Welcome to Grafana", + "height": "150px", + "editable": true, + "collapse": false, + "collapsable": true, + "panels": [ + { + "error": false, + "span": 12, + "editable": true, + "type": "text", + "loadingEditor": false, + "mode": "markdown", + "content": "####Thank you for trying out Grafana! \n\nGeneral documentation is found in the readme and in the wiki section of the [Github Probject](https://github.com/torkelo/grafana). If you encounter any problem or have an idea for an improvement do not hesitate to open a github issue. \n\nTips: \n\n- Ctrl+S saves the current dashboard\n- Ctrl+F Opens the dashboard finder (searches elastic search)\n- Ctrl+H Hide/show row controls \n- Click and drag graph title to move panel (only works when row controls are enabled)\n\nIf you do not see a graph in the panel bellow the browser cannot access your graphite installation. Please make sure that the graphiteUrl property in config.js is correctly set and accessible.", + "style": {}, + "title": "Welcome to Grafana" + } + ], + "notice": false + }, + { + "title": "test", + "height": "250px", + "editable": true, + "collapse": false, + "collapsable": true, + "panels": [ + { + "span": 12, + "editable": true, + "type": "graphite", + "loadingEditor": false, + "x-axis": true, + "y-axis": true, + "scale": 1, + "y_format": "none", + "y2_format": "none", + "grid": { + "max": null, + "min": 0 + }, + "annotate": { + "enable": false, + "query": "*", + "size": 20, + "field": "_type", + "sort": [ + "_score", + "desc" + ] + }, + "auto_int": true, + "resolution": 100, + "interval": "5m", + "intervals": [ + "auto", + "1s", + "1m", + "5m", + "10m", + "30m", + "1h", + "3h", + "12h", + "1d", + "1w", + "1y" + ], + "lines": true, + "fill": 1, + "linewidth": 1, + "points": false, + "pointradius": 5, + "bars": false, + "stack": true, + "spyable": true, + "zoomlinks": false, + "options": false, + "legend": true, + "interactive": true, + "legend_counts": true, + "timezone": "browser", + "percentage": false, + "zerofill": true, + "nullPointMode": "connected", + "steppedLine": false, + "tooltip": { + "value_type": "cumulative", + "query_as_alias": true + }, + "targets": [ + { + "target": "randomWalk('random walk')" + }, + { + "target": "randomWalk('random walk2')" + }, + { + "target": "randomWalk('random walk3')" + } + ], + "aliasColors": {}, + "aliasYAxis": {}, + "title": "Graphite test" + } + ], + "notice": false + } + ], "editable": true, "failover": false, - "panel_hints": true + "panel_hints": true, + "style": "dark", + "pulldowns": [ + { + "type": "filtering", + "collapse": false, + "notice": false, + "enable": false + } + ], + "nav": [ + { + "type": "timepicker", + "collapse": false, + "notice": false, + "enable": true, + "status": "Stable", + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ], + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "now": true + } + ], + "loader": { + "save_gist": false, + "save_elasticsearch": true, + "save_local": true, + "save_default": true, + "save_temp": true, + "save_temp_ttl_enable": true, + "save_temp_ttl": "30d", + "load_gist": false, + "load_elasticsearch": true, + "load_elasticsearch_size": 20, + "load_local": false, + "hide": false + }, + "refresh": false } \ No newline at end of file diff --git a/src/app/directives/configModal.js b/src/app/directives/configModal.js index ee4280fa922..6be68b3dd10 100644 --- a/src/app/directives/configModal.js +++ b/src/app/directives/configModal.js @@ -21,7 +21,6 @@ function (angular,_) { return; } - // Create a temp scope so we can discard changes to it if needed var tmpScope = scope.$new(); tmpScope.panel = angular.copy(scope.panel); diff --git a/src/app/directives/kibanaPanel.js b/src/app/directives/kibanaPanel.js index 21605fa3056..b4726b4ab83 100644 --- a/src/app/directives/kibanaPanel.js +++ b/src/app/directives/kibanaPanel.js @@ -35,7 +35,7 @@ function (angular) { '' + ''+ - '' + + '' + '{{panel.title}}' + ''+