4 files changed, 5 insertions, 27 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/horizon/HorizonClient.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/horizon/HorizonClient.java
index 5624fc7e4e6..bd6c2607fc2 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/horizon/HorizonClient.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/horizon/HorizonClient.java
@@ -9,7 +9,7 @@ import java.io.InputStream;
  */
 public interface HorizonClient {
 
-    InputStream getMetrics(Slime query);
+    InputStream getMetrics(byte[] query);
 
     InputStream getUser();
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/horizon/MockHorizonClient.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/horizon/MockHorizonClient.java
index 8afd613fb11..7d7af046810 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/horizon/MockHorizonClient.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/horizon/MockHorizonClient.java
@@ -1,8 +1,6 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.horizon;
 
-import com.yahoo.slime.Slime;
-
 import java.io.InputStream;
 
 /**
@@ -11,7 +9,7 @@ import java.io.InputStream;
 public class MockHorizonClient implements HorizonClient {
 
     @Override
-    public InputStream getMetrics(Slime query) {
+    public InputStream getMetrics(byte[] query) {
         return null;
     }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeHistory.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeHistory.java
index 624e4c61662..cf40ac00d64 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeHistory.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeHistory.java
@@ -17,7 +17,7 @@ public class NodeHistory {
     @JsonProperty("at")
     public Long at;
     @JsonProperty("agent")
-    public Agent agent;
+    public String agent;
     @JsonProperty("event")
     public String event;
 
@@ -25,7 +25,7 @@ public class NodeHistory {
         return at;
     }
 
-    public Agent getAgent() {
+    public String getAgent() {
         return agent;
     }
 
@@ -33,24 +33,4 @@ public class NodeHistory {
         return event;
     }
 
-    public enum Agent {
-        operator,
-        application,
-        system,
-        DirtyExpirer,
-        DynamicProvisioningMaintainer,
-        FailedExpirer,
-        InactiveExpirer,
-        NodeFailer,
-        NodeHealthTracker,
-        ProvisionedExpirer,
-        Rebalancer,
-        ReservationExpirer,
-        RetiringUpgrader,
-        RebuildingOsUpgrader,
-        SpareCapacityMaintainer,
-        SwitchRebalancer,
-        HostEncrypter,
-    }
-
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
index 3b6c86222ac..327175c19ed 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
@@ -228,7 +228,7 @@ enum PathGroup {
     secretStore(Matcher.tenant, "/application/v4/tenant/{tenant}/secret-store/{*}"),
 
     /** Paths used to proxy Horizon metric requests */
-    horizonProxy("/horizion/v1/{*}");
+    horizonProxy("/horizon/v1/{*}");
 
     final List<String> pathSpecs;
     final List<Matcher> matchers;