From 3ed031109e3214ccd09548fb3b19aa776f1ed558 Mon Sep 17 00:00:00 2001 From: Anna U <104845867+aurbiztondo-splunk@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:45:47 +0100 Subject: [PATCH] Revert "OD5829: Minor fix to APM bundled metrics (#1040)" (#1041) This reverts commit 6466edfa146d6b086c32f4f179c08508ebffffbb. --- signalfx-org-metrics/metrics.yaml | 73 ++++++++++++------------------- 1 file changed, 27 insertions(+), 46 deletions(-) diff --git a/signalfx-org-metrics/metrics.yaml b/signalfx-org-metrics/metrics.yaml index e8f2473d..c6a6e0d1 100644 --- a/signalfx-org-metrics/metrics.yaml +++ b/signalfx-org-metrics/metrics.yaml @@ -1128,9 +1128,9 @@ sf.org.numApmApiCalls: title: sf.org.numApmApiCalls sf.org.numApmBundledMetrics: - brief: Number of APM Bundled Metrics for your org + brief: APM Bundled Metrics limit for your org description: | - Number of APM Bundled Metrics for your org. + APM Bundled Metrics limit for your org. * Dimension(s): `orgId` * Data resolution: 10 minutes @@ -1138,9 +1138,9 @@ sf.org.numApmBundledMetrics: title: sf.org.numApmBundledMetrics sf.org.numApmBundledMetricsByToken: - brief: Number of APM Bundled Metrics for your org, for a token + brief: APM Bundled Metrics limit for your org, for a token description: | - Number of APM Bundled Metrics for your org for a specific token. + APM Bundled Metrics limit for your org for a specific token. * Dimension(s): `orgId`, `tokenId` * Data resolution: 10 minutes @@ -1178,16 +1178,6 @@ sf.org.numBackfillCallsByToken: * Data resolution: 1 second metric_type: counter title: sf.org.numBackfillCallsByToken - -sf.org.numComputationsStarted: - brief: Rate at which you're starting new jobs - description: | - Number of computations started, use it to know the rate at which you're starting new jobs. - - * Dimension(s): `orgId` - * Data resolution: 10 seconds - metric_type: counter - title: sf.org.numComputationsStarted sf.org.numBadDimensionMetricTimeSeriesCreateCalls: brief: Number of bad calls to create MTS due to an error with dimensions @@ -1335,9 +1325,8 @@ sf.org.numDatapointsDroppedBatchSizeByToken: brief: Number of data points dropped because a single request contained more than 100,000 data points, by token. description: | Number of data points dropped because a single request contained more than 100,000 data points, per token. In this scenario, Observability Cloud drops data points because it perceives sending more than 100,000 data points in a single request as excessive. - - * Dimension(s): `orgId`, `tokenId` - * Data resolution: 40 seconds + * Dimension(s): `orgId`, `tokenId` + * Data resolution: 40 seconds metric_type: counter title: sf.org.numDatapointsDroppedBatchSizeByToken @@ -1464,10 +1453,9 @@ sf.org.numDimensionObjectsCreated: brief: Number of dimensions created description: | Total number of dimensions created. - - * Dimension(s): `orgId` - * Data resolution: 10 seconds - + * Dimension(s): `orgId` + * Data resolution: 10 seconds + metric_type: gauge title: sf.org.numDimensionObjectsCreated @@ -1475,10 +1463,9 @@ sf.org.numDimensionObjectsCreatedByToken: brief: Number of dimensions created by token description: | Total number of dimensions created by token. + * Dimension(s): `orgId`, `tokenId` + * Data resolution: 40 seconds - * Dimension(s): `orgId`, `tokenId` - * Data resolution: 40 seconds - metric_type: gauge title: sf.org.numDimensionObjectsCreatedByToken @@ -1486,9 +1473,8 @@ sf.org.numEventSearches: brief: Number of event searches description: | Number of event searches. - - * Dimension(s): `orgId` - * Data resolution: 10 seconds + * Dimension(s): `orgId` + * Data resolution: 10 seconds metric_type: counter title: sf.org.numEventSearches @@ -1497,9 +1483,9 @@ sf.org.numEventSearchesThrottled: brief: Number of event searches that were throttled description: | Number of event searches that were throttled. - - * Dimension(s): `orgId` - * Data resolution: 10 seconds + * Dimension(s): `orgId` + * Data resolution: 10 seconds + metric_type: counter title: sf.org.numEventSearchesThrottled @@ -1591,10 +1577,9 @@ sf.org.numHostMetaDataEventsDroppedThrottle: brief: Number of host metadata events dropped due to throttling description: | Number of host metadata events dropped because of throttling. + * Dimension(s): `orgId` + * Data resolution: 40 seconds - * Dimension(s): `orgId` - * Data resolution: 40 seconds - metric_type: counter title: sf.org.numHostMetaDataEventsDroppedThrottle @@ -1602,9 +1587,8 @@ sf.org.numHostMetaDataEventsDroppedThrottleByToken: brief: Number of host metadata events dropped due to throttling by token description: | Number of host metadata events dropped because of throttling, per token. - - * Dimension(s): `orgId, tokenId` - * Data resolution: 40 seconds + * Dimension(s): `orgId`, `tokenId` + * Data resolution: 40 seconds metric_type: counter title: sf.org.numHostMetaDataEventsDroppedThrottleByToken @@ -1726,10 +1710,9 @@ sf.org.numLogsReceivedByToken: brief: Number of logs received by token description: | Number of logs received by token. - - * Dimension(s): `orgId, tokenId` + * Dimension(s): `orgId`, `tokenId` * Data resolution: 10 seconds - + metric_type: counter title: sf.org.numLogsReceivedByToken @@ -1802,10 +1785,9 @@ sf.org.numMetricObjectsCreatedByToken: brief: Number of metric objects created by token description: | Number of metric objects created by token. + * Dimension(s): `tokenId`, `orgId` + * Data resolution: 40 seconds - * Dimension(s): `tokenId`, `orgId` - * Data resolution: 40 seconds - metric_type: gauge title: sf.org.numMetricObjectsCreatedByToken @@ -1834,9 +1816,8 @@ sf.org.numProcessDataEventsDroppedThrottleByToken: brief: Number of data ingest process events dropped due to throttling by token description: | Per token, number of data ingest process events dropped due to throttling, because you exceeded your system limits. - - * Dimension(s): `orgId, tokenIn` - * Data resolution: 40 seconds + * Dimension(s): `orgId`, `tokenId` + * Data resolution: 40 seconds metric_type: counter title: sf.org.numProcessDataEventsDroppedThrottleByToken @@ -1888,7 +1869,7 @@ sf.org.numResourceMetricsbyToken: * Dimension(s): `orgId`, `resourceType`, `tokenId` * Data resolution: 10 minutes - + metric_type: gauge title: sf.org.numResourceMetricsbyToken