remove report if null value

1 files changed, 4 insertions, 2 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeReports.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeReports.java
index 2b3024f6cee..d3ab6464822 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeReports.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeReports.java
@@ -77,10 +77,12 @@ public class NodeReports {
         return new TreeMap<>(reports);
     }
 
-    /** Set or overwrite the reports of {@code this} that are found in {@code override}. */
+    /** Apply the override to this.  null value means removing report. */
     public void updateFromRawMap(Map<String, JsonNode> override) {
         override.forEach((reportId, jsonNode) -> {
-            if (jsonNode != null) {
+            if (jsonNode == null) {
+                reports.remove(reportId);
+            } else {
                 reports.put(reportId, jsonNode);
             }
         });