Reformat JSON files

8 files changed, 73 insertions, 76 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
index 8df0e066cf4..cdf87b8147c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
@@ -77,11 +77,11 @@ public class ClusterDeploymentMetricsRetrieverTest {
     }
 
     private String containerMetrics() throws IOException {
-        return Files.readString(Path.of("src/test/resources/metrics/container_metrics"));
+        return Files.readString(Path.of("src/test/resources/metrics/container_metrics.json"));
     }
 
     private String contentMetrics() throws IOException {
-        return Files.readString(Path.of("src/test/resources/metrics/content_metrics"));
+        return Files.readString(Path.of("src/test/resources/metrics/content_metrics.json"));
     }
 
     // Same tolerance value as used internally in MetricsAggregator.isZero
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
index 3c53d85c56e..6834fbf29a1 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
@@ -72,7 +72,7 @@ public class ClusterProtonMetricsRetrieverTest {
     }
 
     private String nodeMetrics(String extension) throws IOException {
-        return Files.readString(Path.of("src/test/resources/metrics/node_metrics" + extension));
+        return Files.readString(Path.of("src/test/resources/metrics/node_metrics" + extension + ".json"));
     }
 
     // Same tolerance value as used internally in MetricsAggregator.isZero
diff --git a/configserver/src/test/resources/metrics/container_metrics b/configserver/src/test/resources/metrics/container_metrics
deleted file mode 100644
index 48e00f69897..00000000000
--- a/configserver/src/test/resources/metrics/container_metrics
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "services": [
-      {
-        "name":"vespa.container",
-        "timestamp": 1557306075,
-        "metrics": [
-            {
-              "values": {
-                  "queries.rate": 23.0,
-                  "query_latency.sum": 2000,
-                  "document.count": 300000,
-                  "feed.rate": 23.0,
-                  "write_latency.sum": 2000
-              },
-              "dimensions": {
-                  "clustertype": "container",
-                  "clusterid": "container_cluster_id"
-              }
-            },
-            {
-             "values": {
-                  "query_latency.count": 43.0,
-                  "query_latency.sum": 3000,
-                  "feed.latency.count": 43.0,
-                  "feed.latency.sum": 3000
-
-              },
-              "dimensions": {
-                  "clustertype": "container",
-                  "clusterid": "container_cluster_id"
-                }
-            }
-          ]
-      },
-
-      {
-      "name":"vespa.qrserver",
-      "timestamp": 1557306075,
-      "metrics": [
-          {
-           "values": {
-                "query_latency.count": 43.0,
-                "query_latency.sum": 3000
-            },
-            "dimensions": {
-              "clustertype": "container",
-              "clusterid": "container_cluster_id"
-            }
-          }
-        ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/configserver/src/test/resources/metrics/container_metrics.json b/configserver/src/test/resources/metrics/container_metrics.json
new file mode 100644
index 00000000000..f8ea5591c24
--- /dev/null
+++ b/configserver/src/test/resources/metrics/container_metrics.json
@@ -0,0 +1,51 @@
+{
+  "services": [
+    {
+      "name": "vespa.container",
+      "timestamp": 1557306075,
+      "metrics": [
+        {
+          "values": {
+            "queries.rate": 23.0,
+            "query_latency.sum": 2000,
+            "document.count": 300000,
+            "feed.rate": 23.0,
+            "write_latency.sum": 2000
+          },
+          "dimensions": {
+            "clustertype": "container",
+            "clusterid": "container_cluster_id"
+          }
+        },
+        {
+          "values": {
+            "query_latency.count": 43.0,
+            "query_latency.sum": 3000,
+            "feed.latency.count": 43.0,
+            "feed.latency.sum": 3000
+          },
+          "dimensions": {
+            "clustertype": "container",
+            "clusterid": "container_cluster_id"
+          }
+        }
+      ]
+    },
+    {
+      "name": "vespa.qrserver",
+      "timestamp": 1557306075,
+      "metrics": [
+        {
+          "values": {
+            "query_latency.count": 43.0,
+            "query_latency.sum": 3000
+          },
+          "dimensions": {
+            "clustertype": "container",
+            "clusterid": "container_cluster_id"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/configserver/src/test/resources/metrics/content_metrics b/configserver/src/test/resources/metrics/content_metrics
deleted file mode 100644
index 4a1deced181..00000000000
--- a/configserver/src/test/resources/metrics/content_metrics
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "services": [
-        {
-        "name":"vespa.distributor",
-        "timestamp": 1557306075,
-        "metrics": [
-            {
-             "values": {
-                  "vds.distributor.docsstored.average": 3000
-
-              },
-              "dimensions": {
-                  "clustertype": "content",
-                  "clusterid": "content_cluster_id"
-                }
-            }
-          ]
-      }
-  ]
-}
\ No newline at end of file
diff --git a/configserver/src/test/resources/metrics/content_metrics.json b/configserver/src/test/resources/metrics/content_metrics.json
new file mode 100644
index 00000000000..932577c95b0
--- /dev/null
+++ b/configserver/src/test/resources/metrics/content_metrics.json
@@ -0,0 +1,19 @@
+{
+  "services": [
+    {
+      "name": "vespa.distributor",
+      "timestamp": 1557306075,
+      "metrics": [
+        {
+          "values": {
+            "vds.distributor.docsstored.average": 3000
+          },
+          "dimensions": {
+            "clustertype": "content",
+            "clusterid": "content_cluster_id"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/configserver/src/test/resources/metrics/node_metrics_1 b/configserver/src/test/resources/metrics/node_metrics_1.json
index 4c75f0c4c02..4c75f0c4c02 100644
--- a/configserver/src/test/resources/metrics/node_metrics_1
+++ b/configserver/src/test/resources/metrics/node_metrics_1.json
diff --git a/configserver/src/test/resources/metrics/node_metrics_2 b/configserver/src/test/resources/metrics/node_metrics_2.json
index d916cec54fd..d916cec54fd 100644
--- a/configserver/src/test/resources/metrics/node_metrics_2
+++ b/configserver/src/test/resources/metrics/node_metrics_2.json