From ce6c67f9bc4d1a1c42302dd2359c021b64bcd562 Mon Sep 17 00:00:00 2001 From: Andrew MacDonald Date: Tue, 23 Feb 2016 16:06:56 -0800 Subject: [PATCH 1/4] Fix the path to grafana-webserver in the Debian install docs. --- docs/sources/installation/debian.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index ec6e30b35f1..b5c72f3182c 100644 --- a/docs/sources/installation/debian.md +++ b/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). From be92c8bde11f75fac4d9e17c1f5210e8e7c92916 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Wed, 24 Feb 2016 09:56:57 +0100 Subject: [PATCH 2/4] chore(docker): rename fig.yml to docker-compose.yml Support for the old fig.yml file standard has been removed in newer versions of docker-compose. --- .gitignore | 1 + docker/build_fig.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1c8a89215da..fd04dcd1523 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ public/css/*.min.css conf/custom.ini fig.yml +docker-compose.yml profile.cov /grafana .notouch diff --git a/docker/build_fig.sh b/docker/build_fig.sh index aca4f68413f..8588c1c474a 100755 --- a/docker/build_fig.sh +++ b/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 From 59d2fe8aa49a2e47db4c8e3fcd6a6ccdf2f40eaf Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 24 Feb 2016 08:59:54 +0100 Subject: [PATCH 3/4] ux(dashlist_options): tight-form -> gf-form --- public/app/plugins/panel/dashlist/editor.html | 82 +++++++------------ 1 file changed, 30 insertions(+), 52 deletions(-) diff --git a/public/app/plugins/panel/dashlist/editor.html b/public/app/plugins/panel/dashlist/editor.html index c3b99faa369..ccbb37830ff 100644 --- a/public/app/plugins/panel/dashlist/editor.html +++ b/public/app/plugins/panel/dashlist/editor.html @@ -1,57 +1,35 @@ - -
-
-
-
    -
  • - Mode -
    • -
  • - -
    • -
-
+
+
+
+ Mode +
+ +
-
-
-
    -
  • - Search options -
    • -
  • - Query -
    • -
  • - -
    • -
  • - Tags -
    • -
  • - - -
    • -
-
+ +
+
+ Search options + Query + + + +
+ +
+ Tags + + + +
+
+ +
+
+ Limit number to +
- -
-
-
-
    -
  • - Limit number to -
    • -
  • - -
    • -
-
-
-
-
- From 0525bf5d4eaaa32af41eacf04527a857defea85b Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 24 Feb 2016 10:41:43 +0100 Subject: [PATCH 4/4] ux(table): tight-form -> gf-form --- .../elasticsearch/partials/query.options.html | 68 ++++++++----------- public/sass/components/_infobox.scss | 4 +- 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/public/app/plugins/datasource/elasticsearch/partials/query.options.html b/public/app/plugins/datasource/elasticsearch/partials/query.options.html index bac22df7136..13e39fa4695 100644 --- a/public/app/plugins/datasource/elasticsearch/partials/query.options.html +++ b/public/app/plugins/datasource/elasticsearch/partials/query.options.html @@ -1,48 +1,38 @@
-
-
    -
  • +
    +
    + -
    • -
  • - Group by time interval -
    • -
  • - + Group by time interval + + -
    • -
  • + + -
    • -
-
-
-
- -
+ +
+
+ + + + + + alias patterns + + +
-
-
-
-
Alias patterns
-
    -
  • {{term fieldname}} = replaced with value of term group by
    • -
  • {{metric}} = replaced with metric name (ex. Average, Min, Max)
    • -
  • {{field}} = replaced with the metric field name
    • -
-
+
+
+
Alias patterns
+
    +
  • {{term fieldname}} = replaced with value of term group by
    • +
  • {{metric}} = replaced with metric name (ex. Average, Min, Max)
    • +
  • {{field}} = replaced with the metric field name
    • +
- - diff --git a/public/sass/components/_infobox.scss b/public/sass/components/_infobox.scss index 02ec05fba53..c4dbb2820e1 100644 --- a/public/sass/components/_infobox.scss +++ b/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 {