From acede1d5f919cd83b3598e6519c17cf9f62aae11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 15 Nov 2017 13:45:51 +0100
Subject: [PATCH] graphite: progress on new query editor

---
 docker/blocks/graphite1/Dockerfile               |  5 ++++-
 docker/blocks/graphite1/docker-compose.yaml      |  2 +-
 .../graphite/partials/query.editor.html          | 16 +++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/docker/blocks/graphite1/Dockerfile b/docker/blocks/graphite1/Dockerfile
index 59f770e3273..7bf8b15fa84 100644
--- a/docker/blocks/graphite1/Dockerfile
+++ b/docker/blocks/graphite1/Dockerfile
@@ -1,6 +1,7 @@
 FROM phusion/baseimage:0.9.22
 MAINTAINER Denys Zhdanov <denis.zhdanov@gmail.com>
 
+
 RUN apt-get -y update \
   && apt-get -y upgrade \
   && apt-get -y install vim \
@@ -43,6 +44,8 @@ ARG whisper_version=${version}
 ARG carbon_version=${version}
 ARG graphite_version=${version}
 
+RUN echo "Building Version: $version"
+
 ARG whisper_repo=https://github.com/graphite-project/whisper.git
 ARG carbon_repo=https://github.com/graphite-project/carbon.git
 ARG graphite_repo=https://github.com/graphite-project/graphite-web.git
@@ -80,7 +83,7 @@ RUN mkdir -p /var/log/graphite/ \
   && PYTHONPATH=/opt/graphite/webapp django-admin.py collectstatic --noinput --settings=graphite.settings
 
 # config statsd
-ADD conf/opt/statsd/config_*.js /opt/statsd/
+ADD conf/opt/statsd/config.js /opt/statsd/
 
 # config nginx
 RUN rm /etc/nginx/sites-enabled/default
diff --git a/docker/blocks/graphite1/docker-compose.yaml b/docker/blocks/graphite1/docker-compose.yaml
index 18ffc6de1b2..cd10593f423 100644
--- a/docker/blocks/graphite1/docker-compose.yaml
+++ b/docker/blocks/graphite1/docker-compose.yaml
@@ -2,7 +2,7 @@
     build:
       context: blocks/graphite1
       args:
-        - version=master
+        version: master
     ports:
       - "8080:80"
       - "2003:2003"
diff --git a/public/app/plugins/datasource/graphite/partials/query.editor.html b/public/app/plugins/datasource/graphite/partials/query.editor.html
index 7db918768d0..3b1228a4c67 100755
--- a/public/app/plugins/datasource/graphite/partials/query.editor.html
+++ b/public/app/plugins/datasource/graphite/partials/query.editor.html
@@ -5,9 +5,9 @@
   </div>
 
   <div ng-hide="ctrl.target.textEditor">
-    <div class="gf-form-inline" ng-if="ctrl.queryModel.seriesByTagUsed">
+    <div class="gf-form-inline">
       <div class="gf-form">
-        <label class="gf-form-label width-6 query-keyword">Tags</label>
+        <label class="gf-form-label width-6 query-keyword">Metrics</label>
       </div>
 
       <div ng-repeat="tag in ctrl.queryModel.tags" class="gf-form">
@@ -25,26 +25,28 @@
         </gf-form-dropdown>
         <label class="gf-form-label query-keyword" ng-if="ctrl.showDelimiter($index)">,</label>
       </div>
+
+			<div ng-repeat="segment in ctrl.segments" role="menuitem" class="gf-form">
+        <metric-segment segment="segment" get-options="ctrl.getAltSegments($index)" on-change="ctrl.segmentValueChanged(segment, $index)"></metric-segment>
+      </div>
+
       <div ng-if="ctrl.queryModel.seriesByTagUsed" ng-repeat="segment in ctrl.addTagSegments" role="menuitem" class="gf-form">
         <metric-segment segment="segment"
           get-options="ctrl.getTagsAsSegments()"
           on-change="ctrl.addNewTag(segment)">
         </metric-segment>
       </div>
+
       <div class="gf-form gf-form--grow">
         <div class="gf-form-label gf-form-label--grow"></div>
       </div>
     </div>
 
     <div class="gf-form-inline">
-      <div class="gf-form" ng-if="ctrl.queryModel.seriesByTagUsed">
+      <div class="gf-form">
         <label class="gf-form-label width-6 query-keyword">Functions</label>
       </div>
 
-      <div ng-repeat="segment in ctrl.segments" role="menuitem" class="gf-form">
-        <metric-segment segment="segment" get-options="ctrl.getAltSegments($index)" on-change="ctrl.segmentValueChanged(segment, $index)"></metric-segment>
-      </div>
-
       <div ng-repeat="func in ctrl.queryModel.functions" class="gf-form">
         <span graphite-func-editor class="gf-form-label query-part" ng-hide="func.hidden"></span>
       </div>