[icinga-checkins] icinga.org: icingaweb2-module-logstash/master: Disable field query from Elasticsearch

git at icinga.org git at icinga.org
Fri Feb 5 14:05:47 CET 2016


Module: icingaweb2-module-logstash
Branch: master
Commit: 1eda75b7d088cf3d3538ed1b56e1b3d622bf2f61
URL:    https://git.icinga.org/?p=icingaweb2-module-logstash.git;a=commit;h=1eda75b7d088cf3d3538ed1b56e1b3d622bf2f61

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Jun 23 16:46:06 2015 +0200

Disable field query from Elasticsearch

It will conflict with our IcingaStatus

---

 application/controllers/EventController.php |    4 ++--
 library/Logstash/Search.php                 |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 70e5f66..d18afb8 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -53,8 +53,8 @@ class Logstash_EventController extends Controller
         if ($this->view->query) {
             $search->setQueryString($this->view->query);
 
-            if (isset($fields))
-                $search->setFields($fields);
+            //if (isset($fields))
+            //    $search->setFields($fields);
 
             if ($this->view->filter)
                 $search->setFilterQueryString($this->view->filter);
diff --git a/library/Logstash/Search.php b/library/Logstash/Search.php
index 72b07e3..c5a2501 100644
--- a/library/Logstash/Search.php
+++ b/library/Logstash/Search.php
@@ -8,7 +8,6 @@ use Icinga\Data\Sortable;
 use Icinga\Data\QueryInterface;
 use Icinga\Exception\ProgrammingError;
 use Exception;
-use Icinga\Data\DataArray\ArrayDatasource;
 
 use Icinga\Module\Logstash\Curl;
 
@@ -68,6 +67,7 @@ class Search extends ElasticsearchBackend implements QueryInterface
             );
         }
 
+        /*
         if (count($this->fields) > 0) {
             $fields = $this->fields;
             if (count($this->icinga_status_fields) > 0) {
@@ -75,7 +75,7 @@ class Search extends ElasticsearchBackend implements QueryInterface
             }
             $post['fields'] = array_unique($fields);
         }
-
+        */
 
         if ($this->size)
             $post['size'] = $this->size;



More information about the icinga-checkins mailing list