Merge branch 'master' of github.com:grafana/grafana

.gitignore

@@ -31,6 +31,7 @@ public/css/*.min.css
 
 conf/custom.ini
 fig.yml
+docker-compose.yml
 profile.cov
 /grafana
 .notouch

docker/build_fig.sh

@@ -7,7 +7,7 @@ template_dir=templates
 grafana_config_file=conf.tmp
 grafana_config=config
 
-fig_file=fig.yml
+fig_file=docker-compose.yml
 fig_config=fig
 
 if [ "$#" == 0 ]; then

docs/sources/installation/debian.md

@@ -122,8 +122,8 @@ To configure Grafana add a configuration file named `custom.ini` to the
 `conf` folder and override any of the settings defined in
 `conf/defaults.ini`.
 
-Start Grafana by executing `./grafana-server web`. The `grafana-server` binary needs
-the working directory to be the root install directory (where the binary
-and the `public` folder is located).
+Start Grafana by executing `./bin/grafana-server web`. The `grafana-server`
+binary needs the working directory to be the root install directory (where the
+binary and the `public` folder is located).
 
 

public/app/plugins/datasource/elasticsearch/partials/query.options.html

@@ -1,48 +1,38 @@
 <section class="grafana-metric-options">
-	<div class="tight-form">
-		<ul class="tight-form-list">
-			<li class="tight-form-item tight-form-item-icon">
+	<div class="gf-form-group">
+		<div class="gf-form">
+			<span class="gf-form-label">
 				<i class="fa fa-wrench"></i>
-			</li>
-			<li class="tight-form-item">
-				Group by time interval
-			</li>
-			<li>
-				<input type="text" class="input-medium tight-form-input" ng-model="ctrl.panelCtrl.panel.interval" ng-blur="ctrl.panelCtrl.refresh();"
+			</span>
+			<span class="gf-form-label">Group by time interval</span>
+
+			<input type="text" class="gf-form-input max-width-10" ng-model="ctrl.panelCtrl.panel.interval" ng-blur="ctrl.panelCtrl.refresh();"
 							 spellcheck='false' placeholder="example: >10s">
-			</li>
-			<li class="tight-form-item">
+
+			<span class="gf-form-label">
 				<i class="fa fa-question-circle" bs-tooltip="'Set a low limit by having a greater sign: example: >60s'" data-placement="right"></i>
-			</li>
-		</ul>
-		<div class="clearfix"></div>
-	</div>
-	<div class="tight-form last">
-		<ul class="tight-form-list">
-			<li class="tight-form-item tight-form-item-icon">
-				<i class="fa fa-info-circle"></i>
-			</li>
-			<li class="tight-form-item">
-				<a ng-click="ctrl.panelCtrl.toggleEditorHelp(1);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
-					alias patterns
-				</a>
-			</li>
-		</ul>
-		<div class="clearfix"></div>
+			</span>
+		</div>
+			<div class="gf-form">
+				<span class="gf-form-label">
+					<i class="fa fa-info-circle"></i>
+				</span>
+				<span class="gf-form-label width-23">
+					<a ng-click="ctrl.panelCtrl.toggleEditorHelp(1);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+						alias patterns
+					</a>
+				</span>
+		</div>
 	</div>
 </section>
 
-<div class="editor-row">
-	<div class="pull-left" style="margin-top: 30px;">
-		<div class="grafana-info-box span6" ng-if="ctrl.panelCtrl.editorHelpIndex === 1">
-			<h5>Alias patterns</h5>
-			<ul ng-non-bindable>
-				<li>{{term fieldname}} = replaced with value of term group by</li>
-				<li>{{metric}} = replaced with metric name (ex. Average, Min, Max)</li>
-				<li>{{field}} = replaced with the metric field name</li>
-			</ul>
-		</div>
+<div class="pull-left">
+	<div class="grafana-info-box" style="border: 0;"  ng-if="ctrl.panelCtrl.editorHelpIndex === 1">
+		<h5>Alias patterns</h5>
+		<ul ng-non-bindable>
+			<li>{{term fieldname}} = replaced with value of term group by</li>
+			<li>{{metric}} = replaced with metric name (ex. Average, Min, Max)</li>
+			<li>{{field}} = replaced with the metric field name</li>
+		</ul>
 	</div>
 </div>
-
-

public/app/plugins/panel/dashlist/editor.html

@@ -1,57 +1,35 @@
-
-<div class="editor-row">
-	<div class="section" style="margin-bottom: 20px">
-		<div class="tight-form last">
-			<ul class="tight-form-list">
-				<li class="tight-form-item" style="width: 110px">
-					<strong>Mode</strong>
-				</li>
-				<li>
-					<select class="input-small tight-form-input last" ng-model="ctrl.panel.mode" ng-options="f for f in ctrl.modes" ng-change="ctrl.refresh()"></select>
-				</li>
-			</ul>
-			<div class="clearfix"></div>
+<div class="gf-form-group">
+	<div class="gf-form-inline">
+		<div class="gf-form">
+			<span class="gf-form-label width-10">Mode</span>
+			<div class="gf-form-select-wrapper max-width-10">
+				<select class="gf-form-input" ng-model="ctrl.panel.mode" ng-options="f for f in ctrl.modes" ng-change="ctrl.refresh()"></select>
+			</div>
 		</div>
 	</div>
-	<div class="section" style="margin-bottom: 20px" ng-if="ctrl.panel.mode === 'search'">
-		<div class="tight-form last">
-			<ul class="tight-form-list">
-				<li class="tight-form-item" style="width: 110px">
-					<strong>Search options</strong>
-				</li>
-				<li class="tight-form-item">
-					Query
-				</li>
-				<li>
-					<input type="text" class="input-medium tight-form-input" placeholder="title query"
-					ng-model="ctrl.panel.query" ng-change="ctrl.refresh()" ng-model-onblur>
-				</li>
-				<li class="tight-form-item">
-					Tags
-				</li>
-				<li>
-					<bootstrap-tagsinput ng-model="ctrl.panel.tags" tagclass="label label-tag" placeholder="add tags" on-tags-updated="ctrl.refresh()">
-					</bootstrap-tagsinput>
-				</li>
-			</ul>
-			<div class="clearfix"></div>
+
+	<div class="gf-form-inline" ng-if="ctrl.panel.mode === 'search'">
+		<div class="gf-form">
+			<span class="gf-form-label width-10">Search options</span>
+			<span class="gf-form-label">Query</span>
+
+			<input type="text" class="gf-form-input" placeholder="title query"
+				ng-model="ctrl.panel.query" ng-change="ctrl.refresh()" ng-model-onblur>
+
+		</div>
+
+		<div class="gf-form">
+			<span class="gf-form-label">Tags</span>
+
+			<bootstrap-tagsinput ng-model="ctrl.panel.tags" tagclass="label label-tag" placeholder="add tags" on-tags-updated="ctrl.refresh()">
+			</bootstrap-tagsinput>
 		</div>
 	</div>
-</div>
 
-<div class="editor-row">
-	<div class="section" style="margin-bottom: 20px">
-		<div class="tight-form last">
-			<ul class="tight-form-list">
-				<li class="tight-form-item" style="width: 110px">
-					<strong>Limit number to</strong>
-				</li>
-				<li>
-					<input class="input-small tight-form-input last" type="number" ng-model="ctrl.panel.limit" ng-model-onblur ng-change="ctrl.refresh()">
-				</li>
-			</ul>
-			<div class="clearfix"></div>
+	<div class="gf-form-inline">
+		<div class="gf-form">
+			<span class="gf-form-label width-10">Limit number to</span>
+			<input class="gf-form-input" type="number" ng-model="ctrl.panel.limit" ng-model-onblur ng-change="ctrl.refresh()">
 		</div>
 	</div>
 </div>
-

public/sass/components/_infobox.scss

@@ -2,7 +2,7 @@
   content: "\f05a";
   font-family:'FontAwesome';
   position: absolute;
-  top: -8px;
+  top: -13px;
   left: -8px;
   font-size: 20px;
   color: $blue;
@@ -10,7 +10,7 @@
 
 .grafana-info-box {
   position: relative;
-  padding: 5px 15px;
+  padding: 5px 20px;
   background-color: $tight-form-bg;
   border: 1px solid $tight-form-border;
   h5 {