Updated producer and schemas based on the new schema changes.

[osm/MON.git] / core / models / read_metric_data_resp.json

diff --git a/core/models/read_metric_data_resp.json b/core/models/read_metric_data_resp.json
index 0d5b31b..43f809f 100644 (file)
--- a/core/models/read_metric_data_resp.json
+++ b/core/models/read_metric_data_resp.json
@@ -1,23 +1,61 @@
+/* Copyright© 2017 Intel Research and Development Ireland Limited
+  # This file is part of OSM Monitoring module
+  # All Rights Reserved to Intel Corporation
+
+  # Licensed under the Apache License, Version 2.0 (the "License"); you may
+  # not use this file except in compliance with the License. You may obtain
+  # a copy of the License at
+
+  #         http://www.apache.org/licenses/LICENSE-2.0
+
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  # License for the specific language governing permissions and limitations
+  # under the License.
+
+  # For those usages not covered by the Apache License, Version 2.0 please
+  # contact: prithiv.mohan@intel.com or adrian.hoban@intel.com
+  
+  # This is the message bus schema for read_metric_data response */
+
 {
   "schema_version": { "type": "string" },
-  "schema_type": "metric_data_response",
-  "metrics_name": { "type": "string" },
+  "schema_type": {"type": "string" },
+  "metric_name": { "type": "string" },
   "metric_uuid": { "type": "string" },
   "correlation_id": { "type": "integer" },
   "resource_uuid": { "type": "string" },
   "tenant_uuid": { "type": "string" },
   "metrics_data":
   {
-    "time_series": { "type": "array" },
-    "metrics_series": { "type": "array" },
-    "unit": { "type": "string" }
+    "time_series": [{
+                      "type": "array",
+                      "properties":
+                      { "time_stamp":
+                        { "type": "integer" }}}
+    ]
   },
+    "metrics_series": [{
+                      "type": "array",
+                      "properties":
+                      { "data":
+                        { "type":
+                            ["integer",
+                            "string",
+                            "decimal"
+                            ]
+                        }
+                      }
+                    }
+                  ],
+  "unit": { "type": "string" },
   "required": [ "schema_version",
                 "schema_type",
                 "metric_name",
                 "metric_uuid",
                 "resource_uuid",
-                "tenant_uuid",
+                "correlation_id",
                 "time_series",
                 "metrics_series" ]
 }