From 12a3a2b6b06c276fed75b9eb95ab890dbc7c2b26 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 6 Aug 2015 22:36:14 +0300
Subject: [PATCH 1/4] Modify annotations editor.

---
 zabbix/partials/annotations.editor.html | 37 +++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/zabbix/partials/annotations.editor.html b/zabbix/partials/annotations.editor.html
index 1e9caba..2b98557 100644
--- a/zabbix/partials/annotations.editor.html
+++ b/zabbix/partials/annotations.editor.html
@@ -4,9 +4,42 @@
       <tip>Example: Lack of free swap space</tip>
     </h5>
     <div class="editor-option">
-      <input type="text" class="span10"
-             ng-model="currentAnnotation.query"
+      <label class="small">Name</label>
+      <input type="text" class="tight-form-input input-large"
+             ng-model="currentAnnotation.group"
              placeholder="Lack of free swap space">
+      <div class="tight-form">
+        <ul class="tight-form-list" role="menu">
+          <!-- Host Group -->
+          <li class="tight-form-item input-small" style="width: 5em">Group</li>
+          <li>
+            <input type="text" class="tight-form-input input-large"
+                   ng-model="currentAnnotation.group"
+                   placeholder="Lack of free swap space">
+          </li>
+          <!-- Host -->
+          <li class="tight-form-item input-small" style="width: 3em">Host</li>
+          <li>
+            <input type="text" class="tight-form-input input-large"
+                   ng-model="currentAnnotation.host"
+                   placeholder="Lack of free swap space">
+          </li>
+          <!-- Trigger filter -->
+          <li class="tight-form-item">
+            Trigger
+            <i class="fa fa-question-circle"
+               bs-tooltip="'Filtering hosts by regex. Select All in items and specify regex for host names.'"></i>
+          </li>
+          <li>
+            <input type="text" class="tight-form-input input-large"
+                   ng-model="currentAnnotation.trigger"
+                   spellcheck='false'
+                   placeholder="Trigger filter (regex)"
+                   ng-blur="targetBlur()">
+          </li>
+        </ul>
+        <div class="clearfix"></div>
+      </div>
     </div>
   </div>
 </div>

From ad83ecfe69a71d11b016e96c13fbc03f90d7f78a Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 15 Aug 2015 22:32:14 +0300
Subject: [PATCH 2/4] iss #61 - Improved annotations editor. Able to specify
 Group and Host for triggers search.

---
 zabbix/datasource.js                    |  8 +++++++-
 zabbix/partials/annotations.editor.html | 22 ++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index ec0798a..a036043 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -301,11 +301,17 @@ function (angular, _, kbn) {
       var params = {
         output: ['triggerid', 'description'],
         search: {
-          'description': annotation.query
+          'description': annotation.trigger
         },
         searchWildcardsEnabled: true,
         expandDescription: true
       };
+      if (annotation.host) {
+        params.host = annotation.host;
+      }
+      else if (annotation.group) {
+        params.group = annotation.group;
+      }
 
       return this.zabbixAPI.performZabbixAPIRequest('trigger.get', params)
         .then(function (result) {
diff --git a/zabbix/partials/annotations.editor.html b/zabbix/partials/annotations.editor.html
index 2b98557..eef6f78 100644
--- a/zabbix/partials/annotations.editor.html
+++ b/zabbix/partials/annotations.editor.html
@@ -1,37 +1,31 @@
 <div class="editor-row">
   <div class="section">
     <h5>Zabbix trigger
-      <tip>Example: Lack of free swap space</tip>
     </h5>
     <div class="editor-option">
-      <label class="small">Name</label>
-      <input type="text" class="tight-form-input input-large"
-             ng-model="currentAnnotation.group"
-             placeholder="Lack of free swap space">
       <div class="tight-form">
         <ul class="tight-form-list" role="menu">
           <!-- Host Group -->
-          <li class="tight-form-item input-small" style="width: 5em">Group</li>
+          <li class="tight-form-item input-small" style="width: 4em">Group</li>
           <li>
-            <input type="text" class="tight-form-input input-large"
-                   ng-model="currentAnnotation.group"
-                   placeholder="Lack of free swap space">
+            <input type="text" class="tight-form-input input-medium"
+                   ng-model="currentAnnotation.group">
           </li>
           <!-- Host -->
           <li class="tight-form-item input-small" style="width: 3em">Host</li>
           <li>
-            <input type="text" class="tight-form-input input-large"
-                   ng-model="currentAnnotation.host"
-                   placeholder="Lack of free swap space">
+            <input type="text" class="tight-form-input input-medium"
+                   ng-model="currentAnnotation.host">
           </li>
           <!-- Trigger filter -->
-          <li class="tight-form-item">
+          <li class="tight-form-item input-small">
             Trigger
             <i class="fa fa-question-circle"
-               bs-tooltip="'Filtering hosts by regex. Select All in items and specify regex for host names.'"></i>
+               bs-tooltip="'Zabbix trigger name or regex for search. Example: Lack of free swap space'"></i>
           </li>
           <li>
             <input type="text" class="tight-form-input input-large"
+                   style="width: 20em"
                    ng-model="currentAnnotation.trigger"
                    spellcheck='false'
                    placeholder="Trigger filter (regex)"

From 3793de5ed9a10bbab28c1ebe4fb3c18f96c0d163 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 16 Aug 2015 13:48:02 +0300
Subject: [PATCH 3/4] iss #61 - Support templated variables in annotations.

---
 zabbix/datasource.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zabbix/datasource.js b/zabbix/datasource.js
index a036043..23060e6 100644
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -307,10 +307,10 @@ function (angular, _, kbn) {
         expandDescription: true
       };
       if (annotation.host) {
-        params.host = annotation.host;
+        params.host = templateSrv.replace(annotation.host);
       }
       else if (annotation.group) {
-        params.group = annotation.group;
+        params.group = templateSrv.replace(annotation.group);
       }
 
       return this.zabbixAPI.performZabbixAPIRequest('trigger.get', params)

From a27f3fa1654dd7517f171de39d6663dab362635d Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 16 Aug 2015 15:08:13 +0300
Subject: [PATCH 4/4] iss #61 - Redesign annotations editor.

---
 zabbix/partials/annotations.editor.html | 51 +++++++++----------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/zabbix/partials/annotations.editor.html b/zabbix/partials/annotations.editor.html
index eef6f78..1a95b36 100644
--- a/zabbix/partials/annotations.editor.html
+++ b/zabbix/partials/annotations.editor.html
@@ -2,39 +2,24 @@
   <div class="section">
     <h5>Zabbix trigger
     </h5>
-    <div class="editor-option">
-      <div class="tight-form">
-        <ul class="tight-form-list" role="menu">
-          <!-- Host Group -->
-          <li class="tight-form-item input-small" style="width: 4em">Group</li>
-          <li>
-            <input type="text" class="tight-form-input input-medium"
-                   ng-model="currentAnnotation.group">
-          </li>
-          <!-- Host -->
-          <li class="tight-form-item input-small" style="width: 3em">Host</li>
-          <li>
-            <input type="text" class="tight-form-input input-medium"
-                   ng-model="currentAnnotation.host">
-          </li>
-          <!-- Trigger filter -->
-          <li class="tight-form-item input-small">
-            Trigger
-            <i class="fa fa-question-circle"
-               bs-tooltip="'Zabbix trigger name or regex for search. Example: Lack of free swap space'"></i>
-          </li>
-          <li>
-            <input type="text" class="tight-form-input input-large"
-                   style="width: 20em"
-                   ng-model="currentAnnotation.trigger"
-                   spellcheck='false'
-                   placeholder="Trigger filter (regex)"
-                   ng-blur="targetBlur()">
-          </li>
-        </ul>
-        <div class="clearfix"></div>
-      </div>
-    </div>
+  </div>
+</div>
+
+<div class="editor-row">
+  <div class="editor-option">
+    <label class="small">Group</label>
+    <input type="text" class="input-medium" ng-model='currentAnnotation.group'></input>
+  </div>
+  <div class="editor-option">
+    <label class="small">Host</label>
+    <input type="text" class="input-medium" ng-model='currentAnnotation.host'></input>
+  </div>
+  <div class="editor-option">
+    <label class="small">Trigger
+      <tip>Trigger name for search. Wildcards are supports. Examples: Lack of free swap space, Lack of*.
+      </tip>
+    </label>
+    <input type="text" style="width: 25em" ng-model='currentAnnotation.trigger' placeholder="Trigger name"></input>
   </div>
 </div>