diff --git a/packages/azure_billing/changelog.yml b/packages/azure_billing/changelog.yml index 59f663bd8d9..2d8827d743a 100644 --- a/packages/azure_billing/changelog.yml +++ b/packages/azure_billing/changelog.yml @@ -1,3 +1,8 @@ +- version: "1.2.0" + changes: + - description: Migrate Azure Billing dashboard visualizations to lens. + type: enhancement + link: https://github.com/elastic/integrations/pull/7219 - version: "1.1.3" changes: - description: Fix mappings of tags and dimensions @@ -10,7 +15,7 @@ link: https://github.com/elastic/integrations/pull/5123 - version: "1.1.1" changes: - - description: Fix documentations formatting (remove extra 'Overview' heading) + - description: Fix documentations formatting (remove extra 'Overview' heading) type: enhancement link: https://github.com/elastic/integrations/pull/4383 - version: "1.1.0" diff --git a/packages/azure_billing/img/azure-billing-overview.png b/packages/azure_billing/img/azure-billing-overview.png index 0dafde72902..76a2335d490 100644 Binary files a/packages/azure_billing/img/azure-billing-overview.png and b/packages/azure_billing/img/azure-billing-overview.png differ diff --git a/packages/azure_billing/kibana/dashboard/azure_billing-d3efeb30-c1c7-11ea-b7e7-0f48178cdb3c.json b/packages/azure_billing/kibana/dashboard/azure_billing-d3efeb30-c1c7-11ea-b7e7-0f48178cdb3c.json index 8f2ac23ba44..94c2ffdcfbf 100644 --- a/packages/azure_billing/kibana/dashboard/azure_billing-d3efeb30-c1c7-11ea-b7e7-0f48178cdb3c.json +++ b/packages/azure_billing/kibana/dashboard/azure_billing-d3efeb30-c1c7-11ea-b7e7-0f48178cdb3c.json @@ -1,5 +1,11 @@ { "attributes": { + "controlGroupInput": { + "chainingSystem": "HIERARCHICAL", + "controlStyle": "oneLine", + "ignoreParentSettingsJSON": "{\"ignoreFilters\":false,\"ignoreQuery\":false,\"ignoreTimerange\":false,\"ignoreValidations\":false}", + "panelsJSON": "{\"3983c316-b2b5-40cb-8a49-1a4b17e7868b\":{\"order\":0,\"width\":\"small\",\"grow\":true,\"type\":\"optionsListControl\",\"explicitInput\":{\"fieldName\":\"azure.billing.department_name\",\"title\":\"Department\",\"id\":\"3983c316-b2b5-40cb-8a49-1a4b17e7868b\",\"enhancements\":{}}},\"37e30ae0-44c5-406d-8211-429d57e67eff\":{\"order\":1,\"width\":\"small\",\"grow\":true,\"type\":\"optionsListControl\",\"explicitInput\":{\"fieldName\":\"azure.billing.account_name\",\"title\":\"Account\",\"id\":\"37e30ae0-44c5-406d-8211-429d57e67eff\",\"enhancements\":{}}},\"0bf3bd17-49f6-4c1b-b4a9-afe2d4577aed\":{\"order\":2,\"width\":\"small\",\"grow\":true,\"type\":\"optionsListControl\",\"explicitInput\":{\"fieldName\":\"azure.subscription_id\",\"title\":\"Subscription\",\"singleSelect\":true,\"id\":\"0bf3bd17-49f6-4c1b-b4a9-afe2d4577aed\",\"enhancements\":{}}},\"caf9e826-fb3c-47bb-a533-8ede2b34b7b7\":{\"order\":3,\"width\":\"small\",\"grow\":true,\"type\":\"optionsListControl\",\"explicitInput\":{\"fieldName\":\"azure.resource.group\",\"title\":\"Resource Group\",\"id\":\"caf9e826-fb3c-47bb-a533-8ede2b34b7b7\",\"enhancements\":{}}},\"ee85a301-febf-4d9c-90b2-d414fcdb73e5\":{\"order\":4,\"width\":\"small\",\"grow\":true,\"type\":\"optionsListControl\",\"explicitInput\":{\"fieldName\":\"azure.resource.name\",\"title\":\"Resource Name\",\"id\":\"ee85a301-febf-4d9c-90b2-d414fcdb73e5\",\"enhancements\":{}}}}" + }, "description": "This dashboard gives an overview of resource costs and forecast", "hits": 0, "kibanaSavedObjectMeta": { @@ -18,149 +24,740 @@ "panelsJSON": [ { "embeddableConfig": { - "enhancements": {} - }, - "gridData": { - "h": 5, - "i": "3202a4c8-ed88-4592-9d39-73846426413b", - "w": 48, - "x": 0, - "y": 0 - }, - "panelIndex": "3202a4c8-ed88-4592-9d39-73846426413b", - "panelRefName": "panel_3202a4c8-ed88-4592-9d39-73846426413b", - "title": "", - "type": "visualization", - "version": "8.0.0-SNAPSHOT" - }, - { - "embeddableConfig": { - "enhancements": {} + "attributes": { + "references": [ + { + "id": "metrics-*", + "name": "indexpattern-datasource-layer-55c730ae-441d-4ba7-9642-4d559fc71334", + "type": "index-pattern" + } + ], + "state": { + "datasourceStates": { + "indexpattern": { + "layers": { + "55c730ae-441d-4ba7-9642-4d559fc71334": { + "columnOrder": [ + "6a63eb28-dbd8-406f-83b1-190909e7997a", + "f925b265-0368-4070-9b44-dfee175035b0" + ], + "columns": { + "6a63eb28-dbd8-406f-83b1-190909e7997a": { + "dataType": "string", + "isBucketed": true, + "label": "Top 5 values of azure.subscription_id", + "operationType": "terms", + "params": { + "missingBucket": false, + "orderBy": { + "columnId": "f925b265-0368-4070-9b44-dfee175035b0", + "type": "column" + }, + "orderDirection": "desc", + "otherBucket": false, + "parentFormat": { + "id": "terms" + }, + "size": 5 + }, + "scale": "ordinal", + "sourceField": "azure.subscription_id" + }, + "f925b265-0368-4070-9b44-dfee175035b0": { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": "Total costs", + "operationType": "sum", + "params": { + "emptyAsNull": true + }, + "scale": "ratio", + "sourceField": "azure.billing.pretax_cost" + } + }, + "incompleteColumns": {} + } + } + } + }, + "filters": [], + "query": { + "language": "kuery", + "query": "" + }, + "visualization": { + "layers": [ + { + "categoryDisplay": "hide", + "groups": [ + "6a63eb28-dbd8-406f-83b1-190909e7997a" + ], + "layerId": "55c730ae-441d-4ba7-9642-4d559fc71334", + "layerType": "data", + "legendDisplay": "show", + "legendSize": "large", + "metric": "f925b265-0368-4070-9b44-dfee175035b0", + "nestedLegend": false, + "numberDisplay": "hidden" + } + ], + "shape": "donut" + } + }, + "title": "", + "type": "lens", + "visualizationType": "lnsPie" + }, + "enhancements": {}, + "hidePanelTitles": false }, "gridData": { "h": 16, - "i": "c18f8802-6189-4966-abe5-30bf2c7c6d63", + "i": "85f7953a-8355-4b7d-b429-daf792f0aa00", "w": 15, "x": 0, - "y": 5 + "y": 0 }, - "panelIndex": "c18f8802-6189-4966-abe5-30bf2c7c6d63", - "panelRefName": "panel_c18f8802-6189-4966-abe5-30bf2c7c6d63", + "panelIndex": "85f7953a-8355-4b7d-b429-daf792f0aa00", "title": "Subscriptions", - "type": "visualization", - "version": "8.0.0-SNAPSHOT" + "type": "lens", + "version": "8.3.0" }, { "embeddableConfig": { - "enhancements": {} + "attributes": { + "references": [ + { + "id": "metrics-*", + "name": "indexpattern-datasource-layer-55c730ae-441d-4ba7-9642-4d559fc71334", + "type": "index-pattern" + } + ], + "state": { + "datasourceStates": { + "indexpattern": { + "layers": { + "55c730ae-441d-4ba7-9642-4d559fc71334": { + "columnOrder": [ + "6a63eb28-dbd8-406f-83b1-190909e7997a", + "f925b265-0368-4070-9b44-dfee175035b0" + ], + "columns": { + "6a63eb28-dbd8-406f-83b1-190909e7997a": { + "dataType": "string", + "isBucketed": true, + "label": "Top 5 values of azure.resource.group", + "operationType": "terms", + "params": { + "missingBucket": false, + "orderBy": { + "columnId": "f925b265-0368-4070-9b44-dfee175035b0", + "type": "column" + }, + "orderDirection": "desc", + "otherBucket": false, + "parentFormat": { + "id": "terms" + }, + "secondaryFields": [], + "size": 5 + }, + "scale": "ordinal", + "sourceField": "azure.resource.group" + }, + "f925b265-0368-4070-9b44-dfee175035b0": { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": "Total costs", + "operationType": "sum", + "params": { + "emptyAsNull": true + }, + "scale": "ratio", + "sourceField": "azure.billing.pretax_cost" + } + }, + "incompleteColumns": {} + } + } + } + }, + "filters": [], + "query": { + "language": "kuery", + "query": "" + }, + "visualization": { + "layers": [ + { + "categoryDisplay": "hide", + "groups": [ + "6a63eb28-dbd8-406f-83b1-190909e7997a" + ], + "layerId": "55c730ae-441d-4ba7-9642-4d559fc71334", + "layerType": "data", + "legendDisplay": "show", + "legendSize": "large", + "metric": "f925b265-0368-4070-9b44-dfee175035b0", + "nestedLegend": false, + "numberDisplay": "percent" + } + ], + "shape": "donut" + } + }, + "title": "", + "type": "lens", + "visualizationType": "lnsPie" + }, + "enhancements": {}, + "hidePanelTitles": false }, "gridData": { "h": 16, - "i": "0a93b125-de04-466e-a1d0-7b56d1b31b52", + "i": "d855962c-ebf7-482c-b66c-8c37f66c479b", "w": 16, "x": 15, - "y": 5 + "y": 0 }, - "panelIndex": "0a93b125-de04-466e-a1d0-7b56d1b31b52", - "panelRefName": "panel_0a93b125-de04-466e-a1d0-7b56d1b31b52", + "panelIndex": "d855962c-ebf7-482c-b66c-8c37f66c479b", "title": "Resource groups", - "type": "visualization", - "version": "8.0.0-SNAPSHOT" + "type": "lens", + "version": "8.3.0" }, { "embeddableConfig": { - "enhancements": {} + "attributes": { + "references": [ + { + "id": "metrics-*", + "name": "indexpattern-datasource-layer-55c730ae-441d-4ba7-9642-4d559fc71334", + "type": "index-pattern" + } + ], + "state": { + "datasourceStates": { + "indexpattern": { + "layers": { + "55c730ae-441d-4ba7-9642-4d559fc71334": { + "columnOrder": [ + "6a63eb28-dbd8-406f-83b1-190909e7997a", + "f925b265-0368-4070-9b44-dfee175035b0" + ], + "columns": { + "6a63eb28-dbd8-406f-83b1-190909e7997a": { + "dataType": "string", + "isBucketed": true, + "label": "Top 5 values of azure.resource.name", + "operationType": "terms", + "params": { + "missingBucket": false, + "orderBy": { + "columnId": "f925b265-0368-4070-9b44-dfee175035b0", + "type": "column" + }, + "orderDirection": "desc", + "otherBucket": false, + "parentFormat": { + "id": "terms" + }, + "secondaryFields": [], + "size": 5 + }, + "scale": "ordinal", + "sourceField": "azure.resource.name" + }, + "f925b265-0368-4070-9b44-dfee175035b0": { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": "Total costs", + "operationType": "sum", + "params": { + "emptyAsNull": true + }, + "scale": "ratio", + "sourceField": "azure.billing.pretax_cost" + } + }, + "incompleteColumns": {} + } + } + } + }, + "filters": [], + "query": { + "language": "kuery", + "query": "" + }, + "visualization": { + "layers": [ + { + "categoryDisplay": "hide", + "groups": [ + "6a63eb28-dbd8-406f-83b1-190909e7997a" + ], + "layerId": "55c730ae-441d-4ba7-9642-4d559fc71334", + "layerType": "data", + "legendDisplay": "show", + "metric": "f925b265-0368-4070-9b44-dfee175035b0", + "nestedLegend": false, + "numberDisplay": "percent" + } + ], + "shape": "donut" + } + }, + "title": "", + "type": "lens", + "visualizationType": "lnsPie" + }, + "enhancements": {}, + "hidePanelTitles": false }, "gridData": { "h": 16, - "i": "f6b54b8f-b9e5-4c20-9e4c-8f83935ca739", + "i": "227b905d-e912-4f72-ae00-bdfde0e180df", "w": 17, "x": 31, - "y": 5 + "y": 0 }, - "panelIndex": "f6b54b8f-b9e5-4c20-9e4c-8f83935ca739", - "panelRefName": "panel_f6b54b8f-b9e5-4c20-9e4c-8f83935ca739", + "panelIndex": "227b905d-e912-4f72-ae00-bdfde0e180df", "title": "Resources", - "type": "visualization", - "version": "8.0.0-SNAPSHOT" + "type": "lens", + "version": "8.3.0" }, { "embeddableConfig": { - "enhancements": {} + "attributes": { + "references": [ + { + "id": "metrics-*", + "name": "indexpattern-datasource-layer-0542e158-84da-47c7-aae6-a492f8cd9913", + "type": "index-pattern" + }, + { + "id": "metrics-*", + "name": "indexpattern-datasource-layer-0dc3a5de-8297-4425-9c43-f5d0f882e5fe", + "type": "index-pattern" + } + ], + "state": { + "datasourceStates": { + "indexpattern": { + "layers": { + "0542e158-84da-47c7-aae6-a492f8cd9913": { + "columnOrder": [ + "034b7608-d122-4932-9d69-616244bcfbba", + "7fce3008-7471-42ec-8cd2-bb4d8a1ab36d" + ], + "columns": { + "034b7608-d122-4932-9d69-616244bcfbba": { + "dataType": "date", + "isBucketed": true, + "label": "azure.billing.usage_date", + "operationType": "date_histogram", + "params": { + "dropPartials": true, + "includeEmptyRows": true, + "interval": "24h" + }, + "scale": "interval", + "sourceField": "azure.billing.usage_date" + }, + "7fce3008-7471-42ec-8cd2-bb4d8a1ab36d": { + "customLabel": true, + "dataType": "number", + "filter": { + "language": "kuery", + "query": "azure.billing.actual_cost: *" + }, + "isBucketed": false, + "label": "Actual costs", + "operationType": "last_value", + "params": { + "format": { + "id": "number", + "params": { + "decimals": 0 + } + }, + "sortField": "@timestamp" + }, + "scale": "ratio", + "sourceField": "azure.billing.actual_cost" + } + }, + "incompleteColumns": {} + }, + "0dc3a5de-8297-4425-9c43-f5d0f882e5fe": { + "columnOrder": [ + "54788367-b900-4bc6-8cbf-2c2e7cd65a15", + "6912e4d6-f28b-4ece-a495-3fe6972c0499" + ], + "columns": { + "54788367-b900-4bc6-8cbf-2c2e7cd65a15": { + "dataType": "date", + "isBucketed": true, + "label": "azure.billing.usage_date", + "operationType": "date_histogram", + "params": { + "dropPartials": true, + "includeEmptyRows": true, + "interval": "24h" + }, + "scale": "interval", + "sourceField": "azure.billing.usage_date" + }, + "6912e4d6-f28b-4ece-a495-3fe6972c0499": { + "customLabel": true, + "dataType": "number", + "filter": { + "language": "kuery", + "query": "azure.billing.forecast_cost: *" + }, + "isBucketed": false, + "label": "Forecast costs", + "operationType": "last_value", + "params": { + "format": { + "id": "number", + "params": { + "decimals": 0 + } + }, + "sortField": "@timestamp" + }, + "scale": "ratio", + "sourceField": "azure.billing.forecast_cost" + } + }, + "incompleteColumns": {} + } + } + } + }, + "filters": [], + "query": { + "language": "kuery", + "query": "" + }, + "visualization": { + "axisTitlesVisibilitySettings": { + "x": true, + "yLeft": false, + "yRight": true + }, + "fillOpacity": 0.7, + "fittingFunction": "None", + "gridlinesVisibilitySettings": { + "x": true, + "yLeft": true, + "yRight": true + }, + "labelsOrientation": { + "x": 0, + "yLeft": 0, + "yRight": 0 + }, + "layers": [ + { + "accessors": [ + "7fce3008-7471-42ec-8cd2-bb4d8a1ab36d" + ], + "layerId": "0542e158-84da-47c7-aae6-a492f8cd9913", + "layerType": "data", + "palette": { + "name": "default", + "type": "palette" + }, + "seriesType": "area", + "xAccessor": "034b7608-d122-4932-9d69-616244bcfbba", + "yConfig": [ + { + "axisMode": "left", + "color": "rgba(25,77,51,1)", + "forAccessor": "7fce3008-7471-42ec-8cd2-bb4d8a1ab36d" + } + ] + }, + { + "accessors": [ + "6912e4d6-f28b-4ece-a495-3fe6972c0499" + ], + "layerId": "0dc3a5de-8297-4425-9c43-f5d0f882e5fe", + "layerType": "data", + "palette": { + "name": "default", + "type": "palette" + }, + "seriesType": "area", + "xAccessor": "54788367-b900-4bc6-8cbf-2c2e7cd65a15", + "yConfig": [ + { + "axisMode": "left", + "color": "rgba(104,188,0,1)", + "forAccessor": "6912e4d6-f28b-4ece-a495-3fe6972c0499" + } + ] + } + ], + "legend": { + "isVisible": true, + "maxLines": 1, + "position": "right", + "shouldTruncate": true, + "showSingleSeries": true + }, + "preferredSeriesType": "bar_stacked", + "tickLabelsVisibilitySettings": { + "x": true, + "yLeft": true, + "yRight": true + }, + "valueLabels": "hide", + "valuesInLegend": true, + "yLeftExtent": { + "mode": "full" + }, + "yRightExtent": { + "mode": "full" + }, + "yTitle": "" + } + }, + "title": "", + "type": "lens", + "visualizationType": "lnsXY" + }, + "enhancements": {}, + "hidePanelTitles": false }, "gridData": { "h": 17, "i": "323f890e-c4d6-4c84-a3d8-f3d4277d3c2f", "w": 48, "x": 0, - "y": 21 + "y": 16 }, "panelIndex": "323f890e-c4d6-4c84-a3d8-f3d4277d3c2f", - "panelRefName": "panel_323f890e-c4d6-4c84-a3d8-f3d4277d3c2f", "title": "Forecast", - "type": "visualization", - "version": "8.0.0-SNAPSHOT" + "type": "lens", + "version": "8.3.0" }, { "embeddableConfig": { - "enhancements": {} + "attributes": { + "references": [ + { + "id": "metrics-*", + "name": "indexpattern-datasource-layer-c5eed79c-ba72-464b-bca3-127247296a65", + "type": "index-pattern" + } + ], + "state": { + "datasourceStates": { + "indexpattern": { + "layers": { + "c5eed79c-ba72-464b-bca3-127247296a65": { + "columnOrder": [ + "55213fc7-2095-427a-a223-0f6e7c74e41e", + "77c34830-ab51-456f-8e09-e79eb3dd38f1" + ], + "columns": { + "55213fc7-2095-427a-a223-0f6e7c74e41e": { + "dataType": "date", + "isBucketed": true, + "label": "azure.billing.usage_start", + "operationType": "date_histogram", + "params": { + "dropPartials": true, + "includeEmptyRows": true, + "interval": "24h" + }, + "scale": "interval", + "sourceField": "azure.billing.usage_start" + }, + "77c34830-ab51-456f-8e09-e79eb3dd38f1": { + "customLabel": true, + "dataType": "number", + "isBucketed": false, + "label": "Usage Details", + "operationType": "sum", + "params": { + "emptyAsNull": true, + "format": { + "id": "number", + "params": { + "decimals": 0 + } + } + }, + "scale": "ratio", + "sourceField": "azure.billing.pretax_cost" + } + }, + "incompleteColumns": {} + } + } + } + }, + "filters": [], + "query": { + "language": "kuery", + "query": "" + }, + "visualization": { + "axisTitlesVisibilitySettings": { + "x": true, + "yLeft": false, + "yRight": true + }, + "fillOpacity": 0.5, + "fittingFunction": "None", + "gridlinesVisibilitySettings": { + "x": true, + "yLeft": true, + "yRight": true + }, + "labelsOrientation": { + "x": 0, + "yLeft": 0, + "yRight": 0 + }, + "layers": [ + { + "accessors": [ + "77c34830-ab51-456f-8e09-e79eb3dd38f1" + ], + "layerId": "c5eed79c-ba72-464b-bca3-127247296a65", + "layerType": "data", + "palette": { + "name": "default", + "type": "palette" + }, + "seriesType": "bar", + "xAccessor": "55213fc7-2095-427a-a223-0f6e7c74e41e", + "yConfig": [ + { + "axisMode": "left", + "color": "rgba(22,165,165,1)", + "forAccessor": "77c34830-ab51-456f-8e09-e79eb3dd38f1" + } + ] + } + ], + "legend": { + "isVisible": true, + "maxLines": 1, + "position": "right", + "shouldTruncate": true, + "showSingleSeries": true + }, + "preferredSeriesType": "bar_stacked", + "tickLabelsVisibilitySettings": { + "x": true, + "yLeft": true, + "yRight": true + }, + "valueLabels": "hide", + "valuesInLegend": true, + "yLeftExtent": { + "mode": "full" + }, + "yRightExtent": { + "mode": "full" + }, + "yTitle": "" + } + }, + "title": "", + "type": "lens", + "visualizationType": "lnsXY" + }, + "enhancements": {}, + "hidePanelTitles": false }, "gridData": { "h": 15, "i": "fb121db4-1343-4e4d-b1a3-e3f3531ae045", "w": 48, "x": 0, - "y": 38 + "y": 33 }, "panelIndex": "fb121db4-1343-4e4d-b1a3-e3f3531ae045", - "panelRefName": "panel_fb121db4-1343-4e4d-b1a3-e3f3531ae045", "title": "Daily usage", - "type": "visualization", - "version": "8.0.0-SNAPSHOT" + "type": "lens", + "version": "8.3.0" } ], "timeRestore": false, "title": "[Azure Billing] Billing overview", "version": 1 }, - "coreMigrationVersion": "8.0.0", + "coreMigrationVersion": "8.3.0", "id": "azure_billing-d3efeb30-c1c7-11ea-b7e7-0f48178cdb3c", "migrationVersion": { - "dashboard": "7.14.0" + "dashboard": "8.3.0" }, "references": [ { - "id": "azure_billing-82a51dd0-c1d7-11ea-b7e7-0f48178cdb3c", - "name": "3202a4c8-ed88-4592-9d39-73846426413b:panel_3202a4c8-ed88-4592-9d39-73846426413b", - "type": "visualization" + "id": "metrics-*", + "name": "85f7953a-8355-4b7d-b429-daf792f0aa00:indexpattern-datasource-layer-55c730ae-441d-4ba7-9642-4d559fc71334", + "type": "index-pattern" + }, + { + "id": "metrics-*", + "name": "d855962c-ebf7-482c-b66c-8c37f66c479b:indexpattern-datasource-layer-55c730ae-441d-4ba7-9642-4d559fc71334", + "type": "index-pattern" + }, + { + "id": "metrics-*", + "name": "227b905d-e912-4f72-ae00-bdfde0e180df:indexpattern-datasource-layer-55c730ae-441d-4ba7-9642-4d559fc71334", + "type": "index-pattern" + }, + { + "id": "metrics-*", + "name": "323f890e-c4d6-4c84-a3d8-f3d4277d3c2f:indexpattern-datasource-layer-0542e158-84da-47c7-aae6-a492f8cd9913", + "type": "index-pattern" + }, + { + "id": "metrics-*", + "name": "323f890e-c4d6-4c84-a3d8-f3d4277d3c2f:indexpattern-datasource-layer-0dc3a5de-8297-4425-9c43-f5d0f882e5fe", + "type": "index-pattern" + }, + { + "id": "metrics-*", + "name": "fb121db4-1343-4e4d-b1a3-e3f3531ae045:indexpattern-datasource-layer-c5eed79c-ba72-464b-bca3-127247296a65", + "type": "index-pattern" }, { - "id": "azure_billing-6ffa7e20-c1da-11ea-b7e7-0f48178cdb3c", - "name": "c18f8802-6189-4966-abe5-30bf2c7c6d63:panel_c18f8802-6189-4966-abe5-30bf2c7c6d63", - "type": "visualization" + "id": "metrics-*", + "name": "controlGroup_3983c316-b2b5-40cb-8a49-1a4b17e7868b:optionsListDataView", + "type": "index-pattern" }, { - "id": "azure_billing-b18053b0-c1da-11ea-b7e7-0f48178cdb3c", - "name": "0a93b125-de04-466e-a1d0-7b56d1b31b52:panel_0a93b125-de04-466e-a1d0-7b56d1b31b52", - "type": "visualization" + "id": "metrics-*", + "name": "controlGroup_37e30ae0-44c5-406d-8211-429d57e67eff:optionsListDataView", + "type": "index-pattern" }, { - "id": "azure_billing-c8016f70-c1da-11ea-b7e7-0f48178cdb3c", - "name": "f6b54b8f-b9e5-4c20-9e4c-8f83935ca739:panel_f6b54b8f-b9e5-4c20-9e4c-8f83935ca739", - "type": "visualization" + "id": "metrics-*", + "name": "controlGroup_0bf3bd17-49f6-4c1b-b4a9-afe2d4577aed:optionsListDataView", + "type": "index-pattern" }, { - "id": "azure_billing-9142aca0-c1c7-11ea-b7e7-0f48178cdb3c", - "name": "323f890e-c4d6-4c84-a3d8-f3d4277d3c2f:panel_323f890e-c4d6-4c84-a3d8-f3d4277d3c2f", - "type": "visualization" + "id": "metrics-*", + "name": "controlGroup_caf9e826-fb3c-47bb-a533-8ede2b34b7b7:optionsListDataView", + "type": "index-pattern" }, { - "id": "azure_billing-05d5b3e0-c1c9-11ea-b7e7-0f48178cdb3c", - "name": "fb121db4-1343-4e4d-b1a3-e3f3531ae045:panel_fb121db4-1343-4e4d-b1a3-e3f3531ae045", - "type": "visualization" + "id": "metrics-*", + "name": "controlGroup_ee85a301-febf-4d9c-90b2-d414fcdb73e5:optionsListDataView", + "type": "index-pattern" } ], - "type": "dashboard", - "updated_at": "2021-08-04T16:30:43.912Z", - "version": "WzM0OTksMV0=" + "type": "dashboard" } \ No newline at end of file diff --git a/packages/azure_billing/kibana/visualization/azure_billing-05d5b3e0-c1c9-11ea-b7e7-0f48178cdb3c.json b/packages/azure_billing/kibana/visualization/azure_billing-05d5b3e0-c1c9-11ea-b7e7-0f48178cdb3c.json deleted file mode 100644 index cc5418cd914..00000000000 --- a/packages/azure_billing/kibana/visualization/azure_billing-05d5b3e0-c1c9-11ea-b7e7-0f48178cdb3c.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "attributes": { - "description": "", - "kibanaSavedObjectMeta": { - "searchSourceJSON": {} - }, - "title": "Usage Details [Azure Billing]", - "uiStateJSON": {}, - "version": 1, - "visState": { - "aggs": [], - "params": { - "axis_formatter": "number", - "axis_position": "left", - "axis_scale": "normal", - "background_color_rules": [ - { - "id": "1f64e4e0-c1c7-11ea-879f-d1f118e66220" - } - ], - "bar_color_rules": [ - { - "id": "20dbcd70-c1c7-11ea-879f-d1f118e66220" - } - ], - "drop_last_bucket": 1, - "gauge_color_rules": [ - { - "id": "22692430-c1c7-11ea-879f-d1f118e66220" - } - ], - "gauge_inner_width": 10, - "gauge_style": "half", - "gauge_width": 10, - "id": "61ca57f0-469d-11e7-af02-69e470af7417", - "index_pattern": "metrics-*", - "interval": "24h", - "isModelInvalid": false, - "series": [ - { - "axis_position": "right", - "chart_type": "bar", - "color": "rgba(22,165,165,1)", - "fill": "0.5", - "formatter": "number", - "id": "d09632c0-c120-11ea-b262-d3ff1f3885f8", - "label": "Usage Details", - "line_width": "2", - "metrics": [ - { - "agg_with": "sum", - "field": "azure.billing.pretax_cost", - "id": "d09632c1-c120-11ea-b262-d3ff1f3885f8", - "order": "desc", - "order_by": "@timestamp", - "size": 1, - "type": "sum" - } - ], - "offset_time": "", - "point_size": 1, - "separate_axis": 0, - "split_color_mode": "kibana", - "split_mode": "everything", - "stacked": "none", - "steps": 0, - "type": "timeseries", - "value_template": "{{value}}" - } - ], - "show_grid": 1, - "show_legend": 1, - "time_field": "azure.billing.usage_start", - "tooltip_mode": "show_all", - "type": "timeseries", - "use_kibana_indexes": false - }, - "title": "Usage Details [Azure Billing]", - "type": "metrics" - } - }, - "coreMigrationVersion": "8.0.0", - "id": "azure_billing-05d5b3e0-c1c9-11ea-b7e7-0f48178cdb3c", - "migrationVersion": { - "visualization": "7.14.0" - }, - "references": [], - "type": "visualization", - "updated_at": "2021-08-04T16:30:43.912Z", - "version": "WzM1MDUsMV0=" -} \ No newline at end of file diff --git a/packages/azure_billing/kibana/visualization/azure_billing-6ffa7e20-c1da-11ea-b7e7-0f48178cdb3c.json b/packages/azure_billing/kibana/visualization/azure_billing-6ffa7e20-c1da-11ea-b7e7-0f48178cdb3c.json deleted file mode 100644 index f7d53366d5c..00000000000 --- a/packages/azure_billing/kibana/visualization/azure_billing-6ffa7e20-c1da-11ea-b7e7-0f48178cdb3c.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "attributes": { - "description": "", - "kibanaSavedObjectMeta": { - "searchSourceJSON": { - "filter": [], - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index", - "query": { - "language": "kuery", - "query": "" - } - } - }, - "title": "Billing subscriptions [Azure Billing]", - "uiStateJSON": {}, - "version": 1, - "visState": { - "aggs": [ - { - "enabled": true, - "id": "1", - "params": { - "customLabel": "Total costs", - "field": "azure.billing.pretax_cost" - }, - "schema": "metric", - "type": "sum" - }, - { - "enabled": true, - "id": "2", - "params": { - "field": "azure.subscription_id", - "missingBucket": false, - "missingBucketLabel": "Missing", - "order": "desc", - "orderBy": "1", - "otherBucket": false, - "otherBucketLabel": "Other", - "size": 5 - }, - "schema": "segment", - "type": "terms" - } - ], - "params": { - "addLegend": true, - "addTooltip": true, - "distinctColors": true, - "isDonut": true, - "labels": { - "last_level": true, - "show": false, - "truncate": 100, - "values": true - }, - "legendPosition": "right", - "palette": { - "name": "kibana_palette", - "type": "palette" - }, - "type": "pie" - }, - "title": "Billing subscriptions [Azure Billing]", - "type": "pie" - } - }, - "coreMigrationVersion": "8.0.0", - "id": "azure_billing-6ffa7e20-c1da-11ea-b7e7-0f48178cdb3c", - "migrationVersion": { - "visualization": "7.14.0" - }, - "references": [ - { - "id": "metrics-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.index", - "type": "index-pattern" - } - ], - "type": "visualization", - "updated_at": "2021-08-04T16:30:43.912Z", - "version": "WzM1MDEsMV0=" -} \ No newline at end of file diff --git a/packages/azure_billing/kibana/visualization/azure_billing-82a51dd0-c1d7-11ea-b7e7-0f48178cdb3c.json b/packages/azure_billing/kibana/visualization/azure_billing-82a51dd0-c1d7-11ea-b7e7-0f48178cdb3c.json deleted file mode 100644 index 6c324c7e55c..00000000000 --- a/packages/azure_billing/kibana/visualization/azure_billing-82a51dd0-c1d7-11ea-b7e7-0f48178cdb3c.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "attributes": { - "description": "", - "kibanaSavedObjectMeta": { - "searchSourceJSON": { - "filter": [], - "query": { - "language": "kuery", - "query": "" - } - } - }, - "title": "Billing Filters [Azure Billing]", - "uiStateJSON": {}, - "version": 1, - "visState": { - "aggs": [], - "params": { - "controls": [ - { - "fieldName": "azure.billing.department_name", - "id": "1594294278147", - "indexPatternRefName": "control_0_index_pattern", - "label": "Department", - "options": { - "dynamicOptions": true, - "multiselect": true, - "order": "desc", - "size": 5, - "type": "terms" - }, - "parent": "", - "type": "list" - }, - { - "fieldName": "azure.billing.account_name", - "id": "1594294329560", - "indexPatternRefName": "control_1_index_pattern", - "label": "Account", - "options": { - "dynamicOptions": true, - "multiselect": true, - "order": "desc", - "size": 5, - "type": "terms" - }, - "parent": "", - "type": "list" - }, - { - "fieldName": "azure.subscription_id", - "id": "1549397251041", - "indexPatternRefName": "control_2_index_pattern", - "label": "Subscription", - "options": { - "dynamicOptions": true, - "multiselect": false, - "order": "desc", - "size": 5, - "type": "terms" - }, - "parent": "", - "type": "list" - }, - { - "fieldName": "azure.resource.group", - "id": "1549512142947", - "indexPatternRefName": "control_3_index_pattern", - "label": "Resource Group", - "options": { - "dynamicOptions": true, - "multiselect": true, - "order": "desc", - "size": 5, - "type": "terms" - }, - "parent": "", - "type": "list" - }, - { - "fieldName": "azure.resource.name", - "id": "1578578146383", - "indexPatternRefName": "control_4_index_pattern", - "label": "Resource Name", - "options": { - "dynamicOptions": true, - "multiselect": true, - "order": "desc", - "size": 5, - "type": "terms" - }, - "parent": "", - "type": "list" - } - ], - "pinFilters": false, - "updateFiltersOnChange": true, - "useTimeFilter": false - }, - "title": "Billing Filters [Azure Billing]", - "type": "input_control_vis" - } - }, - "coreMigrationVersion": "8.0.0", - "id": "azure_billing-82a51dd0-c1d7-11ea-b7e7-0f48178cdb3c", - "migrationVersion": { - "visualization": "7.14.0" - }, - "references": [ - { - "id": "metrics-*", - "name": "control_0_index_pattern", - "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "control_1_index_pattern", - "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "control_2_index_pattern", - "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "control_3_index_pattern", - "type": "index-pattern" - }, - { - "id": "metrics-*", - "name": "control_4_index_pattern", - "type": "index-pattern" - } - ], - "type": "visualization", - "updated_at": "2021-08-04T16:30:43.912Z", - "version": "WzM1MDAsMV0=" -} \ No newline at end of file diff --git a/packages/azure_billing/kibana/visualization/azure_billing-9142aca0-c1c7-11ea-b7e7-0f48178cdb3c.json b/packages/azure_billing/kibana/visualization/azure_billing-9142aca0-c1c7-11ea-b7e7-0f48178cdb3c.json deleted file mode 100644 index 76a66e5b1b0..00000000000 --- a/packages/azure_billing/kibana/visualization/azure_billing-9142aca0-c1c7-11ea-b7e7-0f48178cdb3c.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "attributes": { - "description": "", - "kibanaSavedObjectMeta": { - "searchSourceJSON": {} - }, - "title": "Charges Forecast [Azure Billing]", - "uiStateJSON": {}, - "version": 1, - "visState": { - "aggs": [], - "params": { - "axis_formatter": "number", - "axis_position": "left", - "axis_scale": "normal", - "background_color_rules": [ - { - "id": "1f64e4e0-c1c7-11ea-879f-d1f118e66220" - } - ], - "bar_color_rules": [ - { - "id": "20dbcd70-c1c7-11ea-879f-d1f118e66220" - } - ], - "drop_last_bucket": 1, - "gauge_color_rules": [ - { - "id": "22692430-c1c7-11ea-879f-d1f118e66220" - } - ], - "gauge_inner_width": 10, - "gauge_style": "half", - "gauge_width": 10, - "id": "61ca57f0-469d-11e7-af02-69e470af7417", - "index_pattern": "metrics-*", - "interval": "24h", - "isModelInvalid": false, - "series": [ - { - "axis_position": "right", - "chart_type": "line", - "color": "rgba(25,77,51,1)", - "fill": "0.7", - "formatter": "number", - "hide_in_legend": 0, - "id": "61ca57f1-469d-11e7-af02-69e470af7417", - "label": "Actual costs", - "line_width": 1, - "metrics": [ - { - "agg_with": "avg", - "field": "azure.billing.actual_cost", - "id": "61ca57f2-469d-11e7-af02-69e470af7417", - "order": "desc", - "order_by": "@timestamp", - "size": 1, - "type": "top_hit" - } - ], - "override_index_pattern": 0, - "point_size": 1, - "separate_axis": 0, - "split_color_mode": "kibana", - "split_mode": "everything", - "stacked": "none", - "steps": 1, - "terms_field": "azure.billing.usage_date", - "type": "timeseries", - "value_template": "{{value}}" - }, - { - "axis_position": "right", - "chart_type": "line", - "color": "rgba(104,188,0,1)", - "fill": "0.5", - "formatter": "number", - "id": "d09632c0-c120-11ea-b262-d3ff1f3885f8", - "label": "Forecast costs", - "line_width": "2", - "metrics": [ - { - "agg_with": "avg", - "field": "azure.billing.forecast_cost", - "id": "d09632c1-c120-11ea-b262-d3ff1f3885f8", - "order": "desc", - "order_by": "@timestamp", - "size": 1, - "type": "top_hit" - } - ], - "offset_time": "", - "point_size": 1, - "separate_axis": 0, - "split_color_mode": "kibana", - "split_mode": "everything", - "stacked": "none", - "steps": 0, - "type": "timeseries", - "value_template": "{{value}}" - } - ], - "show_grid": 1, - "show_legend": 1, - "time_field": "azure.billing.usage_date", - "tooltip_mode": "show_all", - "type": "timeseries", - "use_kibana_indexes": false - }, - "title": "Charges Forecast [Azure Billing]", - "type": "metrics" - } - }, - "coreMigrationVersion": "8.0.0", - "id": "azure_billing-9142aca0-c1c7-11ea-b7e7-0f48178cdb3c", - "migrationVersion": { - "visualization": "7.14.0" - }, - "references": [], - "type": "visualization", - "updated_at": "2021-08-04T16:30:43.912Z", - "version": "WzM1MDQsMV0=" -} \ No newline at end of file diff --git a/packages/azure_billing/kibana/visualization/azure_billing-b18053b0-c1da-11ea-b7e7-0f48178cdb3c.json b/packages/azure_billing/kibana/visualization/azure_billing-b18053b0-c1da-11ea-b7e7-0f48178cdb3c.json deleted file mode 100644 index 85642f61995..00000000000 --- a/packages/azure_billing/kibana/visualization/azure_billing-b18053b0-c1da-11ea-b7e7-0f48178cdb3c.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "attributes": { - "description": "", - "kibanaSavedObjectMeta": { - "searchSourceJSON": { - "filter": [], - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index", - "query": { - "language": "kuery", - "query": "" - } - } - }, - "title": "Billing resource groups [Azure Billing]", - "uiStateJSON": {}, - "version": 1, - "visState": { - "aggs": [ - { - "enabled": true, - "id": "1", - "params": { - "customLabel": "Total costs", - "field": "azure.billing.pretax_cost" - }, - "schema": "metric", - "type": "sum" - }, - { - "enabled": true, - "id": "2", - "params": { - "field": "azure.resource.group", - "missingBucket": false, - "missingBucketLabel": "Missing", - "order": "desc", - "orderBy": "1", - "otherBucket": false, - "otherBucketLabel": "Other", - "size": 5 - }, - "schema": "segment", - "type": "terms" - } - ], - "params": { - "addLegend": true, - "addTooltip": true, - "distinctColors": true, - "isDonut": true, - "labels": { - "last_level": true, - "show": false, - "truncate": 100, - "values": true - }, - "legendPosition": "right", - "palette": { - "name": "kibana_palette", - "type": "palette" - }, - "row": true, - "type": "pie" - }, - "title": "Billing resource groups [Azure Billing]", - "type": "pie" - } - }, - "coreMigrationVersion": "8.0.0", - "id": "azure_billing-b18053b0-c1da-11ea-b7e7-0f48178cdb3c", - "migrationVersion": { - "visualization": "7.14.0" - }, - "references": [ - { - "id": "metrics-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.index", - "type": "index-pattern" - } - ], - "type": "visualization", - "updated_at": "2021-08-04T16:30:43.912Z", - "version": "WzM1MDIsMV0=" -} \ No newline at end of file diff --git a/packages/azure_billing/kibana/visualization/azure_billing-c8016f70-c1da-11ea-b7e7-0f48178cdb3c.json b/packages/azure_billing/kibana/visualization/azure_billing-c8016f70-c1da-11ea-b7e7-0f48178cdb3c.json deleted file mode 100644 index 7106b9032ed..00000000000 --- a/packages/azure_billing/kibana/visualization/azure_billing-c8016f70-c1da-11ea-b7e7-0f48178cdb3c.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "attributes": { - "description": "", - "kibanaSavedObjectMeta": { - "searchSourceJSON": { - "filter": [], - "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index", - "query": { - "language": "kuery", - "query": "" - } - } - }, - "title": "Billing resource names [Azure Billing]", - "uiStateJSON": {}, - "version": 1, - "visState": { - "aggs": [ - { - "enabled": true, - "id": "1", - "params": { - "customLabel": "Total costs", - "field": "azure.billing.pretax_cost" - }, - "schema": "metric", - "type": "sum" - }, - { - "enabled": true, - "id": "2", - "params": { - "field": "azure.resource.name", - "missingBucket": false, - "missingBucketLabel": "Missing", - "order": "desc", - "orderBy": "1", - "otherBucket": false, - "otherBucketLabel": "Other", - "size": 5 - }, - "schema": "segment", - "type": "terms" - } - ], - "params": { - "addLegend": true, - "addTooltip": true, - "distinctColors": true, - "isDonut": true, - "labels": { - "last_level": true, - "show": false, - "truncate": 100, - "values": true - }, - "legendPosition": "right", - "palette": { - "name": "kibana_palette", - "type": "palette" - }, - "row": true, - "type": "pie" - }, - "title": "Billing resource names [Azure Billing]", - "type": "pie" - } - }, - "coreMigrationVersion": "8.0.0", - "id": "azure_billing-c8016f70-c1da-11ea-b7e7-0f48178cdb3c", - "migrationVersion": { - "visualization": "7.14.0" - }, - "references": [ - { - "id": "metrics-*", - "name": "kibanaSavedObjectMeta.searchSourceJSON.index", - "type": "index-pattern" - } - ], - "type": "visualization", - "updated_at": "2021-08-04T16:30:43.912Z", - "version": "WzM1MDMsMV0=" -} \ No newline at end of file diff --git a/packages/azure_billing/manifest.yml b/packages/azure_billing/manifest.yml index 0721611d804..63ae560d91d 100644 --- a/packages/azure_billing/manifest.yml +++ b/packages/azure_billing/manifest.yml @@ -1,6 +1,6 @@ name: azure_billing title: Azure Billing Metrics -version: 1.1.3 +version: 1.2.0 description: Collect billing metrics with Elastic Agent. type: integration icons: @@ -18,7 +18,7 @@ categories: - observability - azure conditions: - kibana.version: "^7.15.0 || ^8.0.0" + kibana.version: "^8.3.0" elastic.subscription: "basic" vars: - name: client_id