From e4ef4b99917d0e8cd34dfb19514d0cdd884abc33 Mon Sep 17 00:00:00 2001 From: Vivek Patel Date: Mon, 13 Feb 2023 19:53:28 +0530 Subject: [PATCH] Fix discovery search result Fix aggregation filter(left side menu filter) matches, added minimum match criteria to match exact string match for search result. --- extra/server-discovery/docker-compose.yaml | 2 +- extra/server-discovery/searcher/rest/es.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/extra/server-discovery/docker-compose.yaml b/extra/server-discovery/docker-compose.yaml index 836f045e8..6e1cbf7ca 100644 --- a/extra/server-discovery/docker-compose.yaml +++ b/extra/server-discovery/docker-compose.yaml @@ -64,7 +64,7 @@ services: expose: - "5601" environment: - OPENSEARCH_HOSTS: '["http://project_name-opensearch:9200","http://project_name-opensearch-node2:9200"]' + OPENSEARCH_HOSTS: '["http://127.0.0.1:9200"]' DISABLE_SECURITY_DASHBOARDS_PLUGIN: 'true' # disables security dashboards plugin in OpenSearch Dashboards networks: diff --git a/extra/server-discovery/searcher/rest/es.go b/extra/server-discovery/searcher/rest/es.go index 94651f545..24071ae60 100644 --- a/extra/server-discovery/searcher/rest/es.go +++ b/extra/server-discovery/searcher/rest/es.go @@ -5,6 +5,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/davecgh/go-spew/spew" "github.com/elastic/go-elasticsearch/v7" "github.com/elastic/go-elasticsearch/v7/esapi" "github.com/go-chi/jwtauth" @@ -408,10 +409,12 @@ func esSearch(ctx context.Context, log *zap.Logger, esc *elasticsearch.Client, p // query.Aggregations = (Aggregations{}).encodeTerms(p.aggregations) // } + // spew.Dump("query: ", query) if err = json.NewEncoder(&buf).Encode(query); err != nil { err = fmt.Errorf("could not encode query: %q", err) return } + spew.Dump("buf: ", buf) log.Debug("searching ", zap.String("for", p.title),