IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-02-24 19:33:08 +01:00
commit f6c49daaa6
6 changed files with 66 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
docker/build_fig.sh
View File

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

6
docs/sources/installation/debian.md
View File

@ -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` folder and override any of the settings defined in
`conf/defaults.ini`. `conf/defaults.ini`.
Start Grafana by executing `./grafana-server web`. The `grafana-server` binary needs Start Grafana by executing `./bin/grafana-server web`. The `grafana-server`
the working directory to be the root install directory (where the binary binary needs the working directory to be the root install directory (where the
and the `public` folder is located). binary and the `public` folder is located).

68
public/app/plugins/datasource/elasticsearch/partials/query.options.html
View File

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

82
public/app/plugins/panel/dashlist/editor.html
View File

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

4
public/sass/components/_infobox.scss
View File

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