fix path and re-order (#5)

equinix · Nov 21, 2024 · 0807f89 · 0807f89
1 parent 7c89e0b
commit 0807f89
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 40 deletions.
diff --git a/jsonschema/equinix/access_manager/v1/ChangeEvent.json b/jsonschema/equinix/access_manager/v1/ChangeEvent.json
@@ -2,8 +2,8 @@
     "$id": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/access_manager/v1/ChangeEvent.json",
     "name": "ChangeEvent",
     "examples": [],
-    "package": "equinix.events.access_manager.v1",
-    "datatype": "equinix.events.access_manager.v1.ChangeEvent",
+    "package": "equinix.access_manager.v1",
+    "datatype": "equinix.access_manager.v1.ChangeEvent",
     "cloudeventTypes": [
     ],
     "domain": "Equinix Access Manager ChangeEvent",

diff --git a/jsonschema/equinix/fabric/v1/ChangeAlert.json b/jsonschema/equinix/fabric/v1/ChangeAlert.json
@@ -2,8 +2,8 @@
     "$id": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/ChangeAlert.json",
     "name": "ChangeAlert",
     "examples": [],
-    "package": "equinix.events.fabric.v1",
-    "datatype": "equinix.events.fabric.v1.ChangeAlert",
+    "package": "equinix.fabric.v1",
+    "datatype": "equinix.fabric.v1.ChangeAlert",
     "cloudeventTypes": [],
     "domain": "Equinix Fabric ChangeAlert",
     "$schema": "http://json-schema.org/draft-04/schema#",

diff --git a/jsonschema/equinix/fabric/v1/ChangeEvent.json b/jsonschema/equinix/fabric/v1/ChangeEvent.json
@@ -2,25 +2,9 @@
     "$id": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/ChangeEvent.json",
     "name": "ChangeEvent",
     "examples": [],
-    "package": "equinix.events.fabric.v1",
-    "datatype": "equinix.events.fabric.v1.ChangeEvent",
+    "package": "equinix.fabric.v1",
+    "datatype": "equinix.fabric.v1.ChangeEvent",
     "cloudeventTypes": [
-        "equinix.fabric.router.state.provisioning",
-        "equinix.fabric.router.state.provisioned",
-        "equinix.fabric.router.state.reprovisioning",
-        "equinix.fabric.router.state.deprovisioning",
-        "equinix.fabric.router.state.deprovisioned",
-        "equinix.fabric.router.state.failed",
-        "equinix.fabric.router.state.not_provisioned",
-        "equinix.fabric.router.state.not_deprovisioned",
-        "equinix.fabric.port.state.provisioned",
-        "equinix.fabric.port.state.deprovisioned",
-        "equinix.fabric.port.state.failed",
-        "equinix.fabric.port.status.up",
-        "equinix.fabric.port.status.down",
-        "equinix.fabric.service_token.state.inactive",
-        "equinix.fabric.service_token.state.deleted",
-        "equinix.fabric.service_token.attribute.changed",
         "equinix.fabric.connection.state.pending",
         "equinix.fabric.connection.state.pending_interface_configuration",
         "equinix.fabric.connection.state.provisioning",
@@ -40,7 +24,23 @@
         "equinix.fabric.network.state.provisioning",
         "equinix.fabric.network.state.provisioned",
         "equinix.fabric.network.state.deprovisioning",
-        "equinix.fabric.network.state.deprovisioned"
+        "equinix.fabric.network.state.deprovisioned",
+        "equinix.fabric.port.state.provisioned",
+        "equinix.fabric.port.state.deprovisioned",
+        "equinix.fabric.port.state.failed",
+        "equinix.fabric.port.status.up",
+        "equinix.fabric.port.status.down",
+        "equinix.fabric.router.state.provisioning",
+        "equinix.fabric.router.state.provisioned",
+        "equinix.fabric.router.state.reprovisioning",
+        "equinix.fabric.router.state.deprovisioning",
+        "equinix.fabric.router.state.deprovisioned",
+        "equinix.fabric.router.state.failed",
+        "equinix.fabric.router.state.not_provisioned",
+        "equinix.fabric.router.state.not_deprovisioned",
+        "equinix.fabric.service_token.state.inactive",
+        "equinix.fabric.service_token.state.deleted",
+        "equinix.fabric.service_token.attribute.changed"
     ],
     "domain": "Equinix Fabric ChangeEvent",
     "$schema": "http://json-schema.org/draft-04/schema#",

diff --git a/jsonschema/equinix/fabric/v1/MetricAlert.json b/jsonschema/equinix/fabric/v1/MetricAlert.json
@@ -2,8 +2,8 @@
     "$id": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/MetricAlert.json",
     "name": "MetricAlert",
     "examples": [],
-    "package": "equinix.events.fabric.v1",
-    "datatype": "equinix.events.fabric.v1.MetricAlert",
+    "package": "equinix.fabric.v1",
+    "datatype": "equinix.fabric.v1.MetricAlert",
     "cloudeventTypes": [],
     "domain": "Equinix Fabric MetricAlert",
     "$schema": "http://json-schema.org/draft-04/schema#",

diff --git a/jsonschema/equinix/fabric/v1/MetricEvent.json b/jsonschema/equinix/fabric/v1/MetricEvent.json
@@ -2,24 +2,85 @@
     "$id": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/MetricEvent.json",
     "name": "MetricEvent",
     "examples": [],
-    "package": "equinix.events.fabric.v1",
-    "datatype": "equinix.events.fabric.v1.MetricEvent",
+    "package": "equinix.fabric.v1",
+    "datatype": "equinix.fabric.v1.MetricEvent",
     "cloudeventTypes": [
         "equinix.fabric.metric"
     ],
     "domain": "Equinix Fabric MetricEvent",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$ref": "#/definitions/Data",
     "metricNames": [
-        "equinix.fabric.port.packets_erred_rx.count",
-        "equinix.fabric.port.packets_erred_tx.count",
-        "equinix.fabric.port.packets_dropped_rx.count",
-        "equinix.fabric.port.packets_dropped_tx.count",
-        "equinix.fabric.metro.{:asideMetroCode}_{:zsideMetroCode}.latency",
         "equinix.fabric.connection.bandwidth_rx.usage",
         "equinix.fabric.connection.bandwidth_tx.usage",
+        "equinix.fabric.metro.am_{:metroCode}.latency",
+        "equinix.fabric.metro.at_{:metroCode}.latency",
+        "equinix.fabric.metro.ba_{:metroCode}.latency",
+        "equinix.fabric.metro.bg_{:metroCode}.latency",
+        "equinix.fabric.metro.bl_{:metroCode}.latency",
+        "equinix.fabric.metro.bo_{:metroCode}.latency",
+        "equinix.fabric.metro.bx_{:metroCode}.latency",
+        "equinix.fabric.metro.ca_{:metroCode}.latency",
+        "equinix.fabric.metro.ch_{:metroCode}.latency",
+        "equinix.fabric.metro.cl_{:metroCode}.latency",
+        "equinix.fabric.metro.cu_{:metroCode}.latency",
+        "equinix.fabric.metro.da_{:metroCode}.latency",
+        "equinix.fabric.metro.db_{:metroCode}.latency",
+        "equinix.fabric.metro.dc_{:metroCode}.latency",
+        "equinix.fabric.metro.de_{:metroCode}.latency",
+        "equinix.fabric.metro.dx_{:metroCode}.latency",
+        "equinix.fabric.metro.fr_{:metroCode}.latency",
+        "equinix.fabric.metro.gv_{:metroCode}.latency",
+        "equinix.fabric.metro.he_{:metroCode}.latency",
+        "equinix.fabric.metro.hh_{:metroCode}.latency",
+        "equinix.fabric.metro.hk_{:metroCode}.latency",
+        "equinix.fabric.metro.ho_{:metroCode}.latency",
+        "equinix.fabric.metro.il_{:metroCode}.latency",
+        "equinix.fabric.metro.jh_{:metroCode}.latency",
+        "equinix.fabric.metro.ka_{:metroCode}.latency",
+        "equinix.fabric.metro.kl_{:metroCode}.latency",
+        "equinix.fabric.metro.la_{:metroCode}.latency",
+        "equinix.fabric.metro.ld_{:metroCode}.latency",
+        "equinix.fabric.metro.lm_{:metroCode}.latency",
+        "equinix.fabric.metro.ls_{:metroCode}.latency",
+        "equinix.fabric.metro.ma_{:metroCode}.latency",
+        "equinix.fabric.metro.mb_{:metroCode}.latency",
+        "equinix.fabric.metro.md_{:metroCode}.latency",
+        "equinix.fabric.metro.me_{:metroCode}.latency",
+        "equinix.fabric.metro.mi_{:metroCode}.latency",
+        "equinix.fabric.metro.ml_{:metroCode}.latency",
+        "equinix.fabric.metro.mo_{:metroCode}.latency",
+        "equinix.fabric.metro.mt_{:metroCode}.latency",
+        "equinix.fabric.metro.mu_{:metroCode}.latency",
+        "equinix.fabric.metro.mx_{:metroCode}.latency",
+        "equinix.fabric.metro.ny_{:metroCode}.latency",
+        "equinix.fabric.metro.os_{:metroCode}.latency",
+        "equinix.fabric.metro.ot_{:metroCode}.latency",
+        "equinix.fabric.metro.pa_{:metroCode}.latency",
+        "equinix.fabric.metro.pe_{:metroCode}.latency",
+        "equinix.fabric.metro.ph_{:metroCode}.latency",
+        "equinix.fabric.metro.rj_{:metroCode}.latency",
+        "equinix.fabric.metro.se_{:metroCode}.latency",
+        "equinix.fabric.metro.sg_{:metroCode}.latency",
+        "equinix.fabric.metro.sk_{:metroCode}.latency",
+        "equinix.fabric.metro.sl_{:metroCode}.latency",
+        "equinix.fabric.metro.so_{:metroCode}.latency",
+        "equinix.fabric.metro.sp_{:metroCode}.latency",
+        "equinix.fabric.metro.st_{:metroCode}.latency",
+        "equinix.fabric.metro.sv_{:metroCode}.latency",
+        "equinix.fabric.metro.sy_{:metroCode}.latency",
+        "equinix.fabric.metro.tr_{:metroCode}.latency",
+        "equinix.fabric.metro.ty_{:metroCode}.latency",
+        "equinix.fabric.metro.va_{:metroCode}.latency",
+        "equinix.fabric.metro.wa_{:metroCode}.latency",
+        "equinix.fabric.metro.wi_{:metroCode}.latency",
+        "equinix.fabric.metro.zh_{:metroCode}.latency",
         "equinix.fabric.port.bandwidth_rx.usage",
-        "equinix.fabric.port.bandwidth_tx.usage"
+        "equinix.fabric.port.bandwidth_tx.usage",
+        "equinix.fabric.port.packets_erred_rx.count",
+        "equinix.fabric.port.packets_erred_tx.count",
+        "equinix.fabric.port.packets_dropped_rx.count",
+        "equinix.fabric.port.packets_dropped_tx.count"
     ],
     "definitions": {
         "Data": {

diff --git a/jsonschema/equinix/identity/v1/ChangeEvent.json b/jsonschema/equinix/identity/v1/ChangeEvent.json
@@ -2,8 +2,8 @@
     "$id": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/identity/v1/ChangeEvent.json",
     "name": "ChangeEvent",
     "examples": [],
-    "package": "equinix.events.identity.v1",
-    "datatype": "equinix.events.identity.v1.ChangeEvent",
+    "package": "equinix.identity.v1",
+    "datatype": "equinix.identity.v1.ChangeEvent",
     "cloudeventTypes": [
     ],
     "domain": "Equinix Identity ChangeEvent",

diff --git a/jsonschema/equinix/network_edge/v1/ChangeEvent.json b/jsonschema/equinix/network_edge/v1/ChangeEvent.json
@@ -2,8 +2,8 @@
     "$id": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/network_edge/v1/ChangeEvent.json",
     "name": "ChangeEvent",
     "examples": [],
-    "package": "equinix.events.network_edge.v1",
-    "datatype": "equinix.events.network_edge.v1.ChangeEvent",
+    "package": "equinix.network_edge.v1",
+    "datatype": "equinix.network_edge.v1.ChangeEvent",
     "cloudeventTypes": [
     ],
     "domain": "Equinix Network Edge ChangeEvent",

diff --git a/jsonschema/equinix/resource_manager/v1/ChangeEvent.json b/jsonschema/equinix/resource_manager/v1/ChangeEvent.json
@@ -2,8 +2,8 @@
     "$id": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/resource_manager/v1/ChangeEvent.json",
     "name": "ChangeEvent",
     "examples": [],
-    "package": "equinix.events.resource_manager.v1",
-    "datatype": "equinix.events.resource_manager.v1.ChangeEvent",
+    "package": "equinix.resource_manager.v1",
+    "datatype": "equinix.resource_manager.v1.ChangeEvent",
     "cloudeventTypes": [
     ],
     "domain": "Equinix Resource Manager ChangeEvent",

diff --git a/scripts/generate_readme_event_catalog.py b/scripts/generate_readme_event_catalog.py
@@ -6,7 +6,7 @@ def table_row(schema):
     metrics = ""
     if "metricNames" in schema:
         metricNames = "<br>\n".join(map(lambda x: f"`{x}`", schema["metricNames"]))
-        metrics = f"#### Metric Type(s)\n{metricNames}"
+        metrics = f"#### Metric Name(s)\n{metricNames}"
     return f"""### {schema["domain"]}
 #### DataSchema [JSON]({schema["url"]})
 #### Data Type