Update expectorate tests

oxidecomputer · Jun 19, 2024 · 13048c1 · 13048c1
1 parent a410171
commit 13048c1
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 42 deletions.
diff --git a/openapi/nexus.json b/openapi/nexus.json
@@ -9372,7 +9372,7 @@
             "description": "The timeseries is viewable to all without limitation.",
             "type": "string",
             "enum": [
-              "none"
+              "viewable_to_all"
             ]
           }
         ]
@@ -12582,7 +12582,6 @@
         "type": "object",
         "properties": {
           "description": {
-            "default": "",
             "type": "string"
           },
           "field_type": {
@@ -12596,6 +12595,7 @@
           }
         },
         "required": [
+          "description",
           "field_type",
           "name",
           "source"
@@ -17930,12 +17930,7 @@
         "type": "object",
         "properties": {
           "authz_scope": {
-            "default": "fleet",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/AuthzScope"
-              }
-            ]
+            "$ref": "#/components/schemas/AuthzScope"
           },
           "created": {
             "type": "string",
@@ -17945,15 +17940,7 @@
             "$ref": "#/components/schemas/DatumType"
           },
           "description": {
-            "default": {
-              "metric": "",
-              "target": ""
-            },
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/TimeseriesDescription"
-              }
-            ]
+            "$ref": "#/components/schemas/TimeseriesDescription"
           },
           "field_schema": {
             "type": "array",
@@ -17966,25 +17953,23 @@
             "$ref": "#/components/schemas/TimeseriesName"
           },
           "units": {
-            "default": "count",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/Units"
-              }
-            ]
+            "$ref": "#/components/schemas/Units"
           },
           "version": {
-            "default": 1,
             "type": "integer",
             "format": "uint8",
             "minimum": 1
           }
         },
         "required": [
+          "authz_scope",
           "created",
           "datum_type",
+          "description",
           "field_schema",
-          "timeseries_name"
+          "timeseries_name",
+          "units",
+          "version"
         ]
       },
       "TimeseriesSchemaResultsPage": {

diff --git a/oximeter/collector/tests/output/self-stat-schema.json b/oximeter/collector/tests/output/self-stat-schema.json
@@ -1,91 +1,120 @@
 {
   "oximeter_collector:collections": {
     "timeseries_name": "oximeter_collector:collections",
+    "description": {
+      "target": "",
+      "metric": ""
+    },
     "field_schema": [
       {
         "name": "base_route",
         "field_type": "string",
-        "source": "metric"
+        "source": "metric",
+        "description": ""
       },
       {
         "name": "collector_id",
         "field_type": "uuid",
-        "source": "target"
+        "source": "target",
+        "description": ""
       },
       {
         "name": "collector_ip",
         "field_type": "ip_addr",
-        "source": "target"
+        "source": "target",
+        "description": ""
       },
       {
         "name": "collector_port",
         "field_type": "u16",
-        "source": "target"
+        "source": "target",
+        "description": ""
       },
       {
         "name": "producer_id",
         "field_type": "uuid",
-        "source": "metric"
+        "source": "metric",
+        "description": ""
       },
       {
         "name": "producer_ip",
         "field_type": "ip_addr",
-        "source": "metric"
+        "source": "metric",
+        "description": ""
       },
       {
         "name": "producer_port",
         "field_type": "u16",
-        "source": "metric"
+        "source": "metric",
+        "description": ""
       }
     ],
     "datum_type": "cumulative_u64",
-    "created": "2024-06-04T20:49:05.675711686Z"
+    "version": 1,
+    "authz_scope": "fleet",
+    "units": "count",
+    "created": "2024-06-19T18:42:39.343957406Z"
   },
   "oximeter_collector:failed_collections": {
     "timeseries_name": "oximeter_collector:failed_collections",
+    "description": {
+      "target": "",
+      "metric": ""
+    },
     "field_schema": [
       {
         "name": "base_route",
         "field_type": "string",
-        "source": "metric"
+        "source": "metric",
+        "description": ""
       },
       {
         "name": "collector_id",
         "field_type": "uuid",
-        "source": "target"
+        "source": "target",
+        "description": ""
       },
       {
         "name": "collector_ip",
         "field_type": "ip_addr",
-        "source": "target"
+        "source": "target",
+        "description": ""
       },
       {
         "name": "collector_port",
         "field_type": "u16",
-        "source": "target"
+        "source": "target",
+        "description": ""
       },
       {
         "name": "producer_id",
         "field_type": "uuid",
-        "source": "metric"
+        "source": "metric",
+        "description": ""
       },
       {
         "name": "producer_ip",
         "field_type": "ip_addr",
-        "source": "metric"
+        "source": "metric",
+        "description": ""
       },
       {
         "name": "producer_port",
         "field_type": "u16",
-        "source": "metric"
+        "source": "metric",
+        "description": ""
       },
       {
         "name": "reason",
         "field_type": "string",
-        "source": "metric"
+        "source": "metric",
+        "description": ""
       }
     ],
     "datum_type": "cumulative_u64",
-    "created": "2024-06-04T20:49:05.676050088Z"
+    "version": 1,
+    "authz_scope": "fleet",
+    "units": "count",
+    "created": "2024-06-19T18:42:39.344007227Z"
   }
 }