From 940bc597904f0c4f21e0bfd19083cfe8784c24dd Mon Sep 17 00:00:00 2001
From: Chelsea Holland Komlo <me@chelseakomlo.com>
Date: Wed, 20 Dec 2017 17:52:41 -0500
Subject: [PATCH] Fixes #3679

code review fixups; add changelog
---
 CHANGELOG.md             | 5 +++++
 nomad/search_endpoint.go | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a828d589e..ca29ae618 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.8 (Unreleased)
+
+BUG FIXES:
+ * core: Fix search endpoint forwarding for multi-region clusters [GH-3679]
+
 ## 0.7.1 (December 19, 2017)
 
 __BACKWARDS INCOMPATIBILITIES:__
diff --git a/nomad/search_endpoint.go b/nomad/search_endpoint.go
index 512ef3e04..9eb892dd3 100644
--- a/nomad/search_endpoint.go
+++ b/nomad/search_endpoint.go
@@ -119,7 +119,7 @@ func (s *Search) PrefixSearch(args *structs.SearchRequest, reply *structs.Search
 	if done, err := s.srv.forward("Search.PrefixSearch", args, args, reply); done {
 		return err
 	}
-	defer metrics.MeasureSince([]string{"nomad", "search", "prefixsearch"}, time.Now())
+	defer metrics.MeasureSince([]string{"nomad", "search", "prefix_search"}, time.Now())
 
 	aclObj, err := s.srv.ResolveToken(args.AuthToken)
 	if err != nil {