diff --git a/website/static/billing-api/api_index.html b/website/static/billing-api/api_index.html index c8dafb0c6..00102ee83 100644 --- a/website/static/billing-api/api_index.html +++ b/website/static/billing-api/api_index.html @@ -567,7 +567,7 @@

Index

diff --git a/website/static/billing-api/cloud-resources.html b/website/static/billing-api/cloud-resources.html index 1eb6fadd9..3f920272a 100644 --- a/website/static/billing-api/cloud-resources.html +++ b/website/static/billing-api/cloud-resources.html @@ -728,7 +728,7 @@

getExternalCloudResources

diff --git a/website/static/billing-api/common_data_formats.html b/website/static/billing-api/common_data_formats.html index 0dd7b9760..9233b82b7 100644 --- a/website/static/billing-api/common_data_formats.html +++ b/website/static/billing-api/common_data_formats.html @@ -519,7 +519,7 @@

Paging

diff --git a/website/static/billing-api/index.html b/website/static/billing-api/index.html index 4cb1f6486..3c989963c 100644 --- a/website/static/billing-api/index.html +++ b/website/static/billing-api/index.html @@ -1241,7 +1241,7 @@
Lis Expires: 0 Strict-Transport-Security: max-age=31536000 ; includeSubDomains X-Frame-Options: DENY -Content-Length: 3377 +Content-Length: 3374 { "_embedded" : { @@ -1672,13 +1672,13 @@
Lis "apiVersion" : "v3", "kind" : "meshChargeback", "metadata" : { - "name" : "2024-07-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-07-24T12:34:21.345111200Z", + "name" : "2024-08-01Z/testPartner:testWorkspace:testProject", + "createdOn" : "2024-08-01T11:24:20.886902600Z", "finalized" : true }, "spec" : { "projectIdentifier" : "testProject", - "period" : "2024-07-01Z", + "period" : "2024-08-01Z", "tags" : { "paymentIdentifier" : [ "123" ] }, @@ -1686,8 +1686,8 @@
Lis }, "status" : { "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "lineItems" : [ { "reportCategory" : "BILLING", @@ -1727,27 +1727,27 @@
Lis }, "_links" : { "self" : { - "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" + "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject" } } }, { "apiVersion" : "v3", "kind" : "meshChargeback", "metadata" : { - "name" : "2024-06-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-07-24T12:34:21.347343100Z", + "name" : "2024-07-01Z/testPartner:testWorkspace:testProject", + "createdOn" : "2024-08-01T11:24:20.888950Z", "finalized" : true }, "spec" : { "projectIdentifier" : "testProject", - "period" : "2024-06-01Z", + "period" : "2024-07-01Z", "tags" : { }, "workspaceIdentifier" : "testWorkspace" }, "status" : { "timeframe" : { - "from" : "2024-06-01T00:00:00Z", - "to" : "2024-07-01T00:00:00Z" + "from" : "2024-07-01T00:00:00Z", + "to" : "2024-08-01T00:00:00Z" }, "lineItems" : [ ], "netAmounts" : [ { @@ -1759,7 +1759,7 @@
Lis }, "_links" : { "self" : { - "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-06-01Z/testPartner%3AtestWorkspace%3AtestProject" + "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" } } } ] @@ -1806,7 +1806,7 @@
Get mes
Example Request
-
GET /api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
+
GET /api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json
 Host: mesh-billing-url
@@ -1815,7 +1815,7 @@
Get mes
Example Curl Request
-
$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
+
$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json'
@@ -2027,13 +2027,13 @@
Get mes "apiVersion" : "v3", "kind" : "meshChargeback", "metadata" : { - "name" : "2024-07-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-07-24T12:34:21.345111200Z", + "name" : "2024-08-01Z/testPartner:testWorkspace:testProject", + "createdOn" : "2024-08-01T11:24:20.886902600Z", "finalized" : true }, "spec" : { "projectIdentifier" : "testProject", - "period" : "2024-07-01Z", + "period" : "2024-08-01Z", "tags" : { "paymentIdentifier" : [ "123" ] }, @@ -2041,8 +2041,8 @@
Get mes }, "status" : { "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "lineItems" : [ { "reportCategory" : "BILLING", @@ -2082,7 +2082,7 @@
Get mes }, "_links" : { "self" : { - "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" + "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject" } } }
@@ -2648,7 +2648,7 @@

diff --git a/website/static/billing-api/mesh_chargeback.html b/website/static/billing-api/mesh_chargeback.html index 6a3466aed..47d80a1b2 100644 --- a/website/static/billing-api/mesh_chargeback.html +++ b/website/static/billing-api/mesh_chargeback.html @@ -584,7 +584,7 @@
List meshChargebacks
Expires: 0 Strict-Transport-Security: max-age=31536000 ; includeSubDomains X-Frame-Options: DENY -Content-Length: 3377 +Content-Length: 3374 { "_embedded" : { @@ -592,13 +592,13 @@
List meshChargebacks
"apiVersion" : "v3", "kind" : "meshChargeback", "metadata" : { - "name" : "2024-07-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-07-24T12:34:21.345111200Z", + "name" : "2024-08-01Z/testPartner:testWorkspace:testProject", + "createdOn" : "2024-08-01T11:24:20.886902600Z", "finalized" : true }, "spec" : { "projectIdentifier" : "testProject", - "period" : "2024-07-01Z", + "period" : "2024-08-01Z", "tags" : { "paymentIdentifier" : [ "123" ] }, @@ -606,8 +606,8 @@
List meshChargebacks
}, "status" : { "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "lineItems" : [ { "reportCategory" : "BILLING", @@ -647,27 +647,27 @@
List meshChargebacks
}, "_links" : { "self" : { - "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" + "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject" } } }, { "apiVersion" : "v3", "kind" : "meshChargeback", "metadata" : { - "name" : "2024-06-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-07-24T12:34:21.347343100Z", + "name" : "2024-07-01Z/testPartner:testWorkspace:testProject", + "createdOn" : "2024-08-01T11:24:20.888950Z", "finalized" : true }, "spec" : { "projectIdentifier" : "testProject", - "period" : "2024-06-01Z", + "period" : "2024-07-01Z", "tags" : { }, "workspaceIdentifier" : "testWorkspace" }, "status" : { "timeframe" : { - "from" : "2024-06-01T00:00:00Z", - "to" : "2024-07-01T00:00:00Z" + "from" : "2024-07-01T00:00:00Z", + "to" : "2024-08-01T00:00:00Z" }, "lineItems" : [ ], "netAmounts" : [ { @@ -679,7 +679,7 @@
List meshChargebacks
}, "_links" : { "self" : { - "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-06-01Z/testPartner%3AtestWorkspace%3AtestProject" + "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" } } } ] @@ -726,7 +726,7 @@
Get meshChargeback
Example Request
-
GET /api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
+
GET /api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json
 Host: mesh-billing-url
@@ -735,7 +735,7 @@
Get meshChargeback
Example Curl Request
-
$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
+
$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json'
@@ -947,13 +947,13 @@
Get meshChargeback
"apiVersion" : "v3", "kind" : "meshChargeback", "metadata" : { - "name" : "2024-07-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-07-24T12:34:21.345111200Z", + "name" : "2024-08-01Z/testPartner:testWorkspace:testProject", + "createdOn" : "2024-08-01T11:24:20.886902600Z", "finalized" : true }, "spec" : { "projectIdentifier" : "testProject", - "period" : "2024-07-01Z", + "period" : "2024-08-01Z", "tags" : { "paymentIdentifier" : [ "123" ] }, @@ -961,8 +961,8 @@
Get meshChargeback
}, "status" : { "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "lineItems" : [ { "reportCategory" : "BILLING", @@ -1002,7 +1002,7 @@
Get meshChargeback
}, "_links" : { "self" : { - "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" + "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject" } } }
@@ -1013,7 +1013,7 @@
Get meshChargeback
diff --git a/website/static/billing-api/mesh_objects.html b/website/static/billing-api/mesh_objects.html index f78a69d2f..8c42d1f9f 100644 --- a/website/static/billing-api/mesh_objects.html +++ b/website/static/billing-api/mesh_objects.html @@ -728,7 +728,7 @@
List meshTenantUsageReports
"kind" : "meshTenantUsageReport", "metadata" : { "name" : "gcp1.gcp-ffm:project:2018-01-01Z", - "lastModified" : "2024-07-24T12:34:23.204005100Z", + "lastModified" : "2024-08-01T11:24:23.604971800Z", "finalized" : true }, "spec" : { @@ -741,8 +741,8 @@
List meshTenantUsageReports
"status" : { "projectIdentifier" : "testProject", "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "netAmounts" : [ { "currency" : "EUR", @@ -973,7 +973,7 @@
Get meshTenantUsageReport
"kind" : "meshTenantUsageReport", "metadata" : { "name" : "gcp1.gcp-ffm:project:2018-01-01Z", - "lastModified" : "2024-07-24T12:34:23.204005100Z", + "lastModified" : "2024-08-01T11:24:23.604971800Z", "finalized" : true }, "spec" : { @@ -986,8 +986,8 @@
Get meshTenantUsageReport
"status" : { "projectIdentifier" : "testProject", "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "netAmounts" : [ { "currency" : "EUR", @@ -1151,7 +1151,7 @@
List meshChargebacks
Expires: 0 Strict-Transport-Security: max-age=31536000 ; includeSubDomains X-Frame-Options: DENY -Content-Length: 3377 +Content-Length: 3374 { "_embedded" : { @@ -1159,13 +1159,13 @@
List meshChargebacks
"apiVersion" : "v3", "kind" : "meshChargeback", "metadata" : { - "name" : "2024-07-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-07-24T12:34:21.345111200Z", + "name" : "2024-08-01Z/testPartner:testWorkspace:testProject", + "createdOn" : "2024-08-01T11:24:20.886902600Z", "finalized" : true }, "spec" : { "projectIdentifier" : "testProject", - "period" : "2024-07-01Z", + "period" : "2024-08-01Z", "tags" : { "paymentIdentifier" : [ "123" ] }, @@ -1173,8 +1173,8 @@
List meshChargebacks
}, "status" : { "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "lineItems" : [ { "reportCategory" : "BILLING", @@ -1214,27 +1214,27 @@
List meshChargebacks
}, "_links" : { "self" : { - "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" + "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject" } } }, { "apiVersion" : "v3", "kind" : "meshChargeback", "metadata" : { - "name" : "2024-06-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-07-24T12:34:21.347343100Z", + "name" : "2024-07-01Z/testPartner:testWorkspace:testProject", + "createdOn" : "2024-08-01T11:24:20.888950Z", "finalized" : true }, "spec" : { "projectIdentifier" : "testProject", - "period" : "2024-06-01Z", + "period" : "2024-07-01Z", "tags" : { }, "workspaceIdentifier" : "testWorkspace" }, "status" : { "timeframe" : { - "from" : "2024-06-01T00:00:00Z", - "to" : "2024-07-01T00:00:00Z" + "from" : "2024-07-01T00:00:00Z", + "to" : "2024-08-01T00:00:00Z" }, "lineItems" : [ ], "netAmounts" : [ { @@ -1246,7 +1246,7 @@
List meshChargebacks
}, "_links" : { "self" : { - "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-06-01Z/testPartner%3AtestWorkspace%3AtestProject" + "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" } } } ] @@ -1293,7 +1293,7 @@
Get meshChargeback
Example Request
-
GET /api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
+
GET /api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json
 Host: mesh-billing-url
@@ -1302,7 +1302,7 @@
Get meshChargeback
Example Curl Request
-
$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
+
$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json'
@@ -1514,13 +1514,13 @@
Get meshChargeback
"apiVersion" : "v3", "kind" : "meshChargeback", "metadata" : { - "name" : "2024-07-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-07-24T12:34:21.345111200Z", + "name" : "2024-08-01Z/testPartner:testWorkspace:testProject", + "createdOn" : "2024-08-01T11:24:20.886902600Z", "finalized" : true }, "spec" : { "projectIdentifier" : "testProject", - "period" : "2024-07-01Z", + "period" : "2024-08-01Z", "tags" : { "paymentIdentifier" : [ "123" ] }, @@ -1528,8 +1528,8 @@
Get meshChargeback
}, "status" : { "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "lineItems" : [ { "reportCategory" : "BILLING", @@ -1569,7 +1569,7 @@
Get meshChargeback
}, "_links" : { "self" : { - "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" + "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject" } } }
@@ -1848,7 +1848,7 @@
Put meshResourceUsageReports
diff --git a/website/static/billing-api/mesh_resource_usage_report.html b/website/static/billing-api/mesh_resource_usage_report.html index 0c8cc8e55..d2ec51f09 100644 --- a/website/static/billing-api/mesh_resource_usage_report.html +++ b/website/static/billing-api/mesh_resource_usage_report.html @@ -710,7 +710,7 @@
Put meshResourceUsageReports
diff --git a/website/static/billing-api/mesh_tenant_usage_reports.html b/website/static/billing-api/mesh_tenant_usage_reports.html index 89e06d57e..327d2b6fc 100644 --- a/website/static/billing-api/mesh_tenant_usage_reports.html +++ b/website/static/billing-api/mesh_tenant_usage_reports.html @@ -605,7 +605,7 @@
List meshTenantUsageReports
"kind" : "meshTenantUsageReport", "metadata" : { "name" : "gcp1.gcp-ffm:project:2018-01-01Z", - "lastModified" : "2024-07-24T12:34:23.204005100Z", + "lastModified" : "2024-08-01T11:24:23.604971800Z", "finalized" : true }, "spec" : { @@ -618,8 +618,8 @@
List meshTenantUsageReports
"status" : { "projectIdentifier" : "testProject", "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "netAmounts" : [ { "currency" : "EUR", @@ -850,7 +850,7 @@
Get meshTenantUsageReport
"kind" : "meshTenantUsageReport", "metadata" : { "name" : "gcp1.gcp-ffm:project:2018-01-01Z", - "lastModified" : "2024-07-24T12:34:23.204005100Z", + "lastModified" : "2024-08-01T11:24:23.604971800Z", "finalized" : true }, "spec" : { @@ -863,8 +863,8 @@
Get meshTenantUsageReport
"status" : { "projectIdentifier" : "testProject", "timeframe" : { - "from" : "2024-07-01T00:00:00Z", - "to" : "2024-08-01T00:00:00Z" + "from" : "2024-08-01T00:00:00Z", + "to" : "2024-09-01T00:00:00Z" }, "netAmounts" : [ { "currency" : "EUR", @@ -887,7 +887,7 @@
Get meshTenantUsageReport
diff --git a/website/static/billing-api/meshmetering-openapi-docs.json b/website/static/billing-api/meshmetering-openapi-docs.json index fb29a0e65..067a94702 100644 --- a/website/static/billing-api/meshmetering-openapi-docs.json +++ b/website/static/billing-api/meshmetering-openapi-docs.json @@ -159,7 +159,7 @@ }, "examples" : { "meshChargebackList" : { - "value" : "{\n \"_embedded\" : {\n \"meshChargebacks\" : [ {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-07-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-07-24T12:34:21.345111200Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-07-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-06-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-07-24T12:34:21.347343100Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-06-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-06-01T00:00:00Z\",\n \"to\" : \"2024-07-01T00:00:00Z\"\n },\n \"lineItems\" : [ ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 0,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 0\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-06-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 2,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}" + "value" : "{\n \"_embedded\" : {\n \"meshChargebacks\" : [ {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-08-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-08-01T11:24:20.886902600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-08-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-07-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-08-01T11:24:20.888950Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-07-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"lineItems\" : [ ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 0,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 0\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 2,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}" } } } @@ -275,7 +275,7 @@ }, "examples" : { "meshTenantUsageReportsList" : { - "value" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-07-24T12:34:23.204005100Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 1,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}" + "value" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-08-01T11:24:23.604971800Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 1,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}" } } } @@ -287,7 +287,7 @@ } ] } }, - "/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" : { + "/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject" : { "get" : { "tags" : [ "api" ], "operationId" : "meshChargeback", @@ -311,7 +311,7 @@ }, "examples" : { "meshChargeback" : { - "value" : "{\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-07-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-07-24T12:34:21.345111200Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-07-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}" + "value" : "{\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-08-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-08-01T11:24:20.886902600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-08-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}" } } } @@ -347,7 +347,7 @@ }, "examples" : { "meshTenantUsageReport" : { - "value" : "{\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-07-24T12:34:23.204005100Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n}" + "value" : "{\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-08-01T11:24:23.604971800Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n}" } } } @@ -762,6 +762,43 @@ } } }, + "meshTenantUsageReportsList" : { + "title" : "meshTenantUsageReportsList", + "required" : [ "_embedded", "_links", "page" ], + "type" : "object", + "properties" : { + "_links" : { + "type" : "object", + "description" : "Currently only contains the self link and <> links." + }, + "_embedded" : { + "required" : [ "meshTenantUsageReports" ], + "type" : "object", + "properties" : { + "meshTenantUsageReports" : { + "type" : "array", + "description" : "List of <>.", + "items" : { + "oneOf" : [ { + "type" : "object" + }, { + "type" : "boolean" + }, { + "type" : "string" + }, { + "type" : "number" + } ] + } + } + }, + "description" : "Contains the actual content of the paged response." + }, + "page" : { + "type" : "object", + "description" : "See <>." + } + } + }, "meshChargeback" : { "title" : "meshChargeback", "required" : [ "_links", "apiVersion", "kind", "metadata", "spec", "status" ], @@ -928,43 +965,6 @@ "description" : "All fields in this section provide detailed content of the meshChargeback." } } - }, - "meshTenantUsageReportsList" : { - "title" : "meshTenantUsageReportsList", - "required" : [ "_embedded", "_links", "page" ], - "type" : "object", - "properties" : { - "_links" : { - "type" : "object", - "description" : "Currently only contains the self link and <> links." - }, - "_embedded" : { - "required" : [ "meshTenantUsageReports" ], - "type" : "object", - "properties" : { - "meshTenantUsageReports" : { - "type" : "array", - "description" : "List of <>.", - "items" : { - "oneOf" : [ { - "type" : "object" - }, { - "type" : "boolean" - }, { - "type" : "string" - }, { - "type" : "number" - } ] - } - } - }, - "description" : "Contains the actual content of the paged response." - }, - "page" : { - "type" : "object", - "description" : "See <>." - } - } } }, "securitySchemes" : { diff --git a/website/static/billing-api/meshmetering-postman-collection-original.json b/website/static/billing-api/meshmetering-postman-collection-original.json index e40b68f35..7f0515419 100644 --- a/website/static/billing-api/meshmetering-postman-collection-original.json +++ b/website/static/billing-api/meshmetering-postman-collection-original.json @@ -200,7 +200,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"_embedded\" : {\n \"meshChargebacks\" : [ {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-07-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-07-24T12:34:21.345111200Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-07-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-06-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-07-24T12:34:21.347343100Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-06-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-06-01T00:00:00Z\",\n \"to\" : \"2024-07-01T00:00:00Z\"\n },\n \"lineItems\" : [ ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 0,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 0\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-06-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 2,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}", + "body" : "{\n \"_embedded\" : {\n \"meshChargebacks\" : [ {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-08-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-08-01T11:24:20.886902600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-08-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-07-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-08-01T11:24:20.888950Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-07-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"lineItems\" : [ ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 0,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 0\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 2,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}", "code" : 200 } ] }, { @@ -329,19 +329,19 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-07-24T12:34:23.204005100Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 1,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}", + "body" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-08-01T11:24:23.604971800Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 1,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}", "code" : 200 } ] }, { "id" : "meshChargeback", - "name" : "/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject", + "name" : "/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject", "variable" : [ ], "event" : [ ], "request" : { "url" : { "protocol" : "https", "host" : "localhost", - "path" : "/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject", + "path" : "/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject", "port" : "8080" }, "method" : "GET", @@ -359,7 +359,7 @@ "url" : { "protocol" : "https", "host" : "localhost", - "path" : "/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject", + "path" : "/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject", "port" : "8080" }, "method" : "GET", @@ -376,7 +376,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-07-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-07-24T12:34:21.345111200Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-07-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}", + "body" : "{\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-08-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-08-01T11:24:20.886902600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-08-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}", "code" : 200 } ] }, { @@ -423,7 +423,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-07-24T12:34:23.204005100Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n}", + "body" : "{\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-08-01T11:24:23.604971800Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n}", "code" : 200 } ] }, { diff --git a/website/static/billing-api/meshmetering-postman-collection.json b/website/static/billing-api/meshmetering-postman-collection.json index 8fdc9f4d9..0fa9ce439 100644 --- a/website/static/billing-api/meshmetering-postman-collection.json +++ b/website/static/billing-api/meshmetering-postman-collection.json @@ -194,7 +194,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"_embedded\" : {\n \"meshChargebacks\" : [ {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-07-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-07-24T12:34:21.345111200Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-07-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-06-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-07-24T12:34:21.347343100Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-06-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-06-01T00:00:00Z\",\n \"to\" : \"2024-07-01T00:00:00Z\"\n },\n \"lineItems\" : [ ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 0,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 0\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-06-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 2,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}", + "body" : "{\n \"_embedded\" : {\n \"meshChargebacks\" : [ {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-08-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-08-01T11:24:20.886902600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-08-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-07-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-08-01T11:24:20.888950Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-07-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"lineItems\" : [ ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 0,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 0\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 2,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}", "code" : 200 } ] }, { @@ -321,19 +321,19 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-07-24T12:34:23.204005100Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 1,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}", + "body" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-08-01T11:24:23.604971800Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n }\n },\n \"page\" : {\n \"size\" : 10,\n \"totalElements\" : 1,\n \"totalPages\" : 1,\n \"number\" : 0\n }\n}", "code" : 200 } ] }, { "id" : "meshChargeback", - "name" : "/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject", + "name" : "/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject", "variable" : [ ], "event" : [ ], "request" : { "url" : { - "raw": "{{baseUrl}}/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject", + "raw": "{{baseUrl}}/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject", "host": "{{baseUrl}}", -"path" : "/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" +"path" : "/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject" }, "method" : "GET", "header" : [ { @@ -348,9 +348,9 @@ "name" : "meshChargeback", "originalRequest" : { "url" : { - "raw": "{{baseUrl}}/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject", + "raw": "{{baseUrl}}/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject", "host": "{{baseUrl}}", -"path" : "/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject" +"path" : "/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject" }, "method" : "GET", "header" : [ { @@ -366,7 +366,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-07-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-07-24T12:34:21.345111200Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-07-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-07-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}", + "body" : "{\n \"apiVersion\" : \"v3\",\n \"kind\" : \"meshChargeback\",\n \"metadata\" : {\n \"name\" : \"2024-08-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-08-01T11:24:20.886902600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-08-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"lineItems\" : [ {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test1-localProjectId\",\n \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n \"reportId\" : \"test1-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 1.65,\n \"baseNetAmount\" : 1.65,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n }, {\n \"reportCategory\" : \"BILLING\",\n \"platformTenantId\" : \"test2-localProjectId\",\n \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n \"reportId\" : \"test2-reportId\",\n \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n \"period\" : \"2019-07-01Z\",\n \"netAmount\" : 3.12,\n \"baseNetAmount\" : 3.12,\n \"baseCurrency\" : \"EUR\",\n \"exchangeRate\" : 1,\n \"currency\" : \"EUR\",\n \"sellerId\" : \"Operations\",\n \"sellerProductGroup\" : \"Platform Team\"\n } ],\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 4.77,\n \"baseCurrency\" : \"EUR\",\n \"baseNetAmount\" : 4.77\n } ]\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-08-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}", "code" : 200 } ] }, { @@ -411,7 +411,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-07-24T12:34:23.204005100Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-07-01T00:00:00Z\",\n \"to\" : \"2024-08-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n}", + "body" : "{\n \"apiVersion\" : \"v2\",\n \"kind\" : \"meshTenantUsageReport\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-08-01T11:24:23.604971800Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"period\" : \"2018-01-01Z\",\n \"reportCategory\" : \"BILLING\",\n \"platformType\" : \"Gcp\",\n \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n \"platformTenantId\" : \"project\"\n },\n \"status\" : {\n \"projectIdentifier\" : \"testProject\",\n \"timeframe\" : {\n \"from\" : \"2024-08-01T00:00:00Z\",\n \"to\" : \"2024-09-01T00:00:00Z\"\n },\n \"netAmounts\" : [ {\n \"currency\" : \"EUR\",\n \"amount\" : 128,\n \"baseCurrency\" : \"EUR\",\n \"baseAmount\" : 0\n } ],\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"_links\" : {\n \"self\" : {\n \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n }\n }\n}", "code" : 200 } ] }, { diff --git a/website/static/billing-api/overview.html b/website/static/billing-api/overview.html index 4e168b905..6bc92449c 100644 --- a/website/static/billing-api/overview.html +++ b/website/static/billing-api/overview.html @@ -582,7 +582,7 @@

Data Types

diff --git a/website/static/billing-api/technical_specification.html b/website/static/billing-api/technical_specification.html index a9105e65b..b886a73d0 100644 --- a/website/static/billing-api/technical_specification.html +++ b/website/static/billing-api/technical_specification.html @@ -627,7 +627,7 @@

Versioning