From 226786484d9411d6f51912b1ce4a4153d40ae023 Mon Sep 17 00:00:00 2001 From: "github-merge-queue[bot]" <118344674+github-merge-queue[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:12:42 +0000 Subject: [PATCH] docs: update meshStack API docs from latest develop build --- website/static/billing-api/api_index.html | 2 +- .../billing-api/common_data_formats.html | 2 +- website/static/billing-api/index.html | 16 +++++----- .../static/billing-api/mesh_chargeback.html | 12 ++++---- website/static/billing-api/mesh_objects.html | 16 +++++----- .../mesh_resource_usage_report.html | 2 +- .../mesh_tenant_usage_reports.html | 6 ++-- .../meshmetering-openapi-docs.json | 30 +++++++++---------- ...hmetering-postman-collection-original.json | 8 ++--- .../meshmetering-postman-collection.json | 8 ++--- .../meshmetering-swagger-docs.json | 8 ++--- website/static/billing-api/overview.html | 2 +- .../billing-api/technical_specification.html | 2 +- 13 files changed, 57 insertions(+), 57 deletions(-) diff --git a/website/static/billing-api/api_index.html b/website/static/billing-api/api_index.html index 1caf8a578..af6460b79 100644 --- a/website/static/billing-api/api_index.html +++ b/website/static/billing-api/api_index.html @@ -559,7 +559,7 @@

Index

diff --git a/website/static/billing-api/common_data_formats.html b/website/static/billing-api/common_data_formats.html index 7ecbb49d1..299867fd1 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 87edda2c4..a3e13acb5 100644 --- a/website/static/billing-api/index.html +++ b/website/static/billing-api/index.html @@ -1228,7 +1228,7 @@
Lis Expires: 0 Strict-Transport-Security: max-age=31536000 ; includeSubDomains X-Frame-Options: DENY -Content-Length: 3374 +Content-Length: 3377 { "_embedded" : { @@ -1660,7 +1660,7 @@
Lis "apiVersion" : "v3", "metadata" : { "name" : "2024-12-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-12-12T14:24:14.233639Z", + "createdOn" : "2024-12-18T15:57:53.024736400Z", "finalized" : true }, "spec" : { @@ -1722,7 +1722,7 @@
Lis "apiVersion" : "v3", "metadata" : { "name" : "2024-11-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-12-12T14:24:14.235252700Z", + "createdOn" : "2024-12-18T15:57:53.026423600Z", "finalized" : true }, "spec" : { @@ -2008,14 +2008,14 @@
Get mes Expires: 0 Strict-Transport-Security: max-age=31536000 ; includeSubDomains X-Frame-Options: DENY -Content-Length: 1849 +Content-Length: 1852 { "kind" : "meshChargeback", "apiVersion" : "v3", "metadata" : { "name" : "2024-12-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-12-12T14:24:14.233639Z", + "createdOn" : "2024-12-18T15:57:53.024736400Z", "finalized" : true }, "spec" : { @@ -2356,7 +2356,7 @@
-Last updated 2024-12-12 14:22:49 UTC +Last updated 2024-12-18 15:56:31 UTC
diff --git a/website/static/billing-api/mesh_chargeback.html b/website/static/billing-api/mesh_chargeback.html index e1cd13b4c..f42d87ee9 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: 3374 +Content-Length: 3377 { "_embedded" : { @@ -593,7 +593,7 @@
List meshChargebacks
"apiVersion" : "v3", "metadata" : { "name" : "2024-12-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-12-12T14:24:14.233639Z", + "createdOn" : "2024-12-18T15:57:53.024736400Z", "finalized" : true }, "spec" : { @@ -655,7 +655,7 @@
List meshChargebacks
"apiVersion" : "v3", "metadata" : { "name" : "2024-11-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-12-12T14:24:14.235252700Z", + "createdOn" : "2024-12-18T15:57:53.026423600Z", "finalized" : true }, "spec" : { @@ -941,14 +941,14 @@
Get meshChargeback
Expires: 0 Strict-Transport-Security: max-age=31536000 ; includeSubDomains X-Frame-Options: DENY -Content-Length: 1849 +Content-Length: 1852 { "kind" : "meshChargeback", "apiVersion" : "v3", "metadata" : { "name" : "2024-12-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-12-12T14:24:14.233639Z", + "createdOn" : "2024-12-18T15:57:53.024736400Z", "finalized" : true }, "spec" : { @@ -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 f4807b93f..f5b2267e5 100644 --- a/website/static/billing-api/mesh_objects.html +++ b/website/static/billing-api/mesh_objects.html @@ -728,7 +728,7 @@
List meshTenantUsageReports
"apiVersion" : "v2", "metadata" : { "name" : "gcp1.gcp-ffm:project:2018-01-01Z", - "lastModified" : "2024-12-12T14:24:16.999379900Z", + "lastModified" : "2024-12-18T15:57:55.476548100Z", "finalized" : true }, "spec" : { @@ -973,7 +973,7 @@
Get meshTenantUsageReport
"apiVersion" : "v2", "metadata" : { "name" : "gcp1.gcp-ffm:project:2018-01-01Z", - "lastModified" : "2024-12-12T14:24:16.999379900Z", + "lastModified" : "2024-12-18T15:57:55.476548100Z", "finalized" : true }, "spec" : { @@ -1151,7 +1151,7 @@
List meshChargebacks
Expires: 0 Strict-Transport-Security: max-age=31536000 ; includeSubDomains X-Frame-Options: DENY -Content-Length: 3374 +Content-Length: 3377 { "_embedded" : { @@ -1160,7 +1160,7 @@
List meshChargebacks
"apiVersion" : "v3", "metadata" : { "name" : "2024-12-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-12-12T14:24:14.233639Z", + "createdOn" : "2024-12-18T15:57:53.024736400Z", "finalized" : true }, "spec" : { @@ -1222,7 +1222,7 @@
List meshChargebacks
"apiVersion" : "v3", "metadata" : { "name" : "2024-11-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-12-12T14:24:14.235252700Z", + "createdOn" : "2024-12-18T15:57:53.026423600Z", "finalized" : true }, "spec" : { @@ -1508,14 +1508,14 @@
Get meshChargeback
Expires: 0 Strict-Transport-Security: max-age=31536000 ; includeSubDomains X-Frame-Options: DENY -Content-Length: 1849 +Content-Length: 1852 { "kind" : "meshChargeback", "apiVersion" : "v3", "metadata" : { "name" : "2024-12-01Z/testPartner:testWorkspace:testProject", - "createdOn" : "2024-12-12T14:24:14.233639Z", + "createdOn" : "2024-12-18T15:57:53.024736400Z", "finalized" : true }, "spec" : { @@ -1854,7 +1854,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 60848a955..1da8e1915 100644 --- a/website/static/billing-api/mesh_resource_usage_report.html +++ b/website/static/billing-api/mesh_resource_usage_report.html @@ -716,7 +716,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 e1fea2e05..9542b3ab9 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
"apiVersion" : "v2", "metadata" : { "name" : "gcp1.gcp-ffm:project:2018-01-01Z", - "lastModified" : "2024-12-12T14:24:16.999379900Z", + "lastModified" : "2024-12-18T15:57:55.476548100Z", "finalized" : true }, "spec" : { @@ -850,7 +850,7 @@
Get meshTenantUsageReport
"apiVersion" : "v2", "metadata" : { "name" : "gcp1.gcp-ffm:project:2018-01-01Z", - "lastModified" : "2024-12-12T14:24:16.999379900Z", + "lastModified" : "2024-12-18T15:57:55.476548100Z", "finalized" : true }, "spec" : { @@ -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 5c78fd709..94bc69129 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 \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.235252700Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-11-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-11-01T00:00:00Z\",\n \"to\" : \"2024-12-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-11-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 \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.026423600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-11-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-11-01T00:00:00Z\",\n \"to\" : \"2024-12-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-11-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 \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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 \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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}" } } } @@ -311,7 +311,7 @@ }, "examples" : { "meshChargeback" : { - "value" : "{\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}" + "value" : "{\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}" } } } @@ -347,7 +347,7 @@ }, "examples" : { "meshTenantUsageReport" : { - "value" : "{\n \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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 \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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}" } } } @@ -531,17 +531,6 @@ } } }, - "meshObjectsRoot" : { - "title" : "meshObjectsRoot", - "required" : [ "_links" ], - "type" : "object", - "properties" : { - "_links" : { - "type" : "object", - "description" : "All available <> for the authenticated user." - } - } - }, "meshChargeback" : { "title" : "meshChargeback", "required" : [ "_links", "apiVersion", "kind", "metadata", "spec", "status" ], @@ -709,6 +698,17 @@ } } }, + "meshObjectsRoot" : { + "title" : "meshObjectsRoot", + "required" : [ "_links" ], + "type" : "object", + "properties" : { + "_links" : { + "type" : "object", + "description" : "All available <> for the authenticated user." + } + } + }, "meshTenantUsageReportsList" : { "title" : "meshTenantUsageReportsList", "required" : [ "_embedded", "_links", "page" ], diff --git a/website/static/billing-api/meshmetering-postman-collection-original.json b/website/static/billing-api/meshmetering-postman-collection-original.json index 07880cc4b..a55225158 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 \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.235252700Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-11-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-11-01T00:00:00Z\",\n \"to\" : \"2024-12-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-11-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 \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.026423600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-11-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-11-01T00:00:00Z\",\n \"to\" : \"2024-12-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-11-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,7 +329,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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 \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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 } ] }, { @@ -376,7 +376,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}", + "body" : "{\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}", "code" : 200 } ] }, { @@ -423,7 +423,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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 \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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 dd0571c10..688836c39 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 \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.235252700Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-11-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-11-01T00:00:00Z\",\n \"to\" : \"2024-12-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-11-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 \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.026423600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-11-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-11-01T00:00:00Z\",\n \"to\" : \"2024-12-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-11-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,7 +321,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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 \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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 } ] }, { @@ -366,7 +366,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}", + "body" : "{\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}", "code" : 200 } ] }, { @@ -411,7 +411,7 @@ "disabled" : false } ], "cookie" : [ ], - "body" : "{\n \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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 \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-swagger-docs.json b/website/static/billing-api/meshmetering-swagger-docs.json index 5509b0666..649821b4b 100644 --- a/website/static/billing-api/meshmetering-swagger-docs.json +++ b/website/static/billing-api/meshmetering-swagger-docs.json @@ -122,7 +122,7 @@ "200" : { "description" : "", "examples" : { - "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n \"_embedded\" : {\n \"meshChargebacks\" : [ {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.235252700Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-11-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-11-01T00:00:00Z\",\n \"to\" : \"2024-12-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-11-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}" + "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n \"_embedded\" : {\n \"meshChargebacks\" : [ {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n }, {\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.026423600Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-11-01Z\",\n \"tags\" : { },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-11-01T00:00:00Z\",\n \"to\" : \"2024-12-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-11-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}" }, "schema" : { "$ref" : "#/definitions/meshChargebackList" @@ -210,7 +210,7 @@ "200" : { "description" : "", "examples" : { - "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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}" + "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n \"_embedded\" : {\n \"meshTenantUsageReports\" : [ {\n \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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}" }, "schema" : { "$ref" : "#/definitions/meshTenantUsageReportsList" @@ -238,7 +238,7 @@ "200" : { "description" : "", "examples" : { - "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}" + "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n \"kind\" : \"meshChargeback\",\n \"apiVersion\" : \"v3\",\n \"metadata\" : {\n \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n \"finalized\" : true\n },\n \"spec\" : {\n \"projectIdentifier\" : \"testProject\",\n \"period\" : \"2024-12-01Z\",\n \"tags\" : {\n \"paymentIdentifier\" : [ \"123\" ]\n },\n \"workspaceIdentifier\" : \"testWorkspace\"\n },\n \"status\" : {\n \"timeframe\" : {\n \"from\" : \"2024-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n }\n }\n}" }, "schema" : { "$ref" : "#/definitions/meshChargeback" @@ -266,7 +266,7 @@ "200" : { "description" : "", "examples" : { - "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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}" + "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n \"kind\" : \"meshTenantUsageReport\",\n \"apiVersion\" : \"v2\",\n \"metadata\" : {\n \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\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-12-01T00:00:00Z\",\n \"to\" : \"2025-01-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}" }, "schema" : { "$ref" : "#/definitions/meshTenantUsageReport" diff --git a/website/static/billing-api/overview.html b/website/static/billing-api/overview.html index b76ccde16..eb79da64a 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 7d0fdf1c7..4b77ea5b3 100644 --- a/website/static/billing-api/technical_specification.html +++ b/website/static/billing-api/technical_specification.html @@ -627,7 +627,7 @@

Versioning