From 63f99f31f22a9fbdf15f6d2423d7975a58eee217 Mon Sep 17 00:00:00 2001 From: Ignacio Tolstoy Date: Tue, 16 Mar 2021 11:41:19 +0100 Subject: [PATCH] New definitions format (#109) * Swipe ruammel on the definitions * Update the schemas and apply new format: summary metrics, golden metrics, dashboards * Move facet values into eventName * Update validators * Update docs --- README.md | 20 ++- .../apm-application/golden_metrics.yml | 6 +- .../browser-application/golden_metrics.yml | 8 +- definitions/ext-fastly_pop/definition.yml | 3 +- definitions/ext-fastly_pop/golden_metrics.yml | 8 +- definitions/ext-pi_hole/definition.yml | 4 +- definitions/ext-redis/definition.yml | 3 +- definitions/ext-tinyproxy/definition.yml | 3 +- .../infra-apacheserver/golden_metrics.yml | 8 +- definitions/infra-awsalb/golden_metrics.yml | 6 +- .../golden_metrics.yml | 8 +- .../infra-awsapigatewayapi/golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 8 +- .../infra-awsdocdbcluster/golden_metrics.yml | 12 +- .../golden_metrics.yml | 12 +- .../infra-awsdocdbinstance/golden_metrics.yml | 12 +- .../golden_metrics.yml | 8 +- .../golden_metrics.yml | 2 +- .../infra-awsdynamodbtable/golden_metrics.yml | 6 +- .../infra-awsebsvolume/golden_metrics.yml | 8 +- .../infra-awsecscluster/golden_metrics.yml | 4 +- .../infra-awsecsservice/golden_metrics.yml | 4 +- .../infra-awsefsfilesystem/golden_metrics.yml | 8 +- .../golden_metrics.yml | 10 +- .../golden_metrics.yml | 12 +- .../golden_metrics.yml | 12 +- .../golden_metrics.yml | 12 +- .../golden_metrics.yml | 4 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 12 +- .../golden_metrics.yml | 12 +- definitions/infra-awselb/golden_metrics.yml | 12 +- .../golden_metrics.yml | 8 +- .../golden_metrics.yml | 10 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 8 +- .../infra-awskinesisstream/golden_metrics.yml | 12 +- .../golden_metrics.yml | 12 +- .../golden_metrics.yml | 8 +- .../golden_metrics.yml | 8 +- .../infra-awslambdaregion/golden_metrics.yml | 4 +- .../golden_metrics.yml | 2 +- .../golden_metrics.yml | 18 +-- .../golden_metrics.yml | 6 +- .../infra-awsmskbroker/golden_metrics.yml | 6 +- .../infra-awsmskcluster/golden_metrics.yml | 6 +- definitions/infra-awsnlb/golden_metrics.yml | 9 +- .../golden_metrics.yml | 4 +- .../infra-awsrdsdbcluster/golden_metrics.yml | 6 +- .../infra-awsrdsdbinstance/golden_metrics.yml | 8 +- .../golden_metrics.yml | 8 +- .../infra-awsredshiftnode/golden_metrics.yml | 12 +- .../infra-awss3bucket/golden_metrics.yml | 8 +- .../infra-awssnstopic/golden_metrics.yml | 6 +- .../infra-awssqsqueue/golden_metrics.yml | 6 +- .../golden_metrics.yml | 8 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 16 +-- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 8 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 4 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../infra-azurefirewall/golden_metrics.yml | 8 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 8 +- .../golden_metrics.yml | 10 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../infra-azuremysqlserver/golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 8 +- .../golden_metrics.yml | 14 +- .../infra-azuresqldatabase/golden_metrics.yml | 10 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../infra-cassandranode/golden_metrics.yml | 8 +- .../golden_metrics.yml | 6 +- definitions/infra-etcd_cluster/definition.yml | 3 +- definitions/infra-f5pool/golden_metrics.yml | 8 +- .../infra-f5poolmember/golden_metrics.yml | 8 +- .../infra-f5virtualserver/golden_metrics.yml | 8 +- .../golden_metrics.yml | 8 +- .../golden_metrics.yml | 4 +- .../infra-gcpbigquerytable/golden_metrics.yml | 4 +- .../golden_metrics.yml | 8 +- .../infra-gcpbigtabletable/golden_metrics.yml | 8 +- .../golden_metrics.yml | 8 +- .../golden_metrics.yml | 8 +- .../infra-gcpcloudfunction/golden_metrics.yml | 6 +- .../infra-gcpcloudsql/golden_metrics.yml | 8 +- .../golden_metrics.yml | 4 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 8 +- .../infra-gcpredisinstance/golden_metrics.yml | 8 +- .../golden_metrics.yml | 6 +- .../golden_metrics.yml | 8 +- .../infra-gcpstoragebucket/golden_metrics.yml | 6 +- definitions/infra-host/golden_metrics.yml | 8 +- .../infra-kafkabroker/golden_metrics.yml | 6 +- .../infra-mssqlinstance/golden_metrics.yml | 6 +- .../infra-mysqlnode/golden_metrics.yml | 6 +- .../infra-nginxserver/golden_metrics.yml | 4 +- .../infra-oracledbinstance/golden_metrics.yml | 8 +- .../golden_metrics.yml | 6 +- .../infra-rabbitmqexchange/golden_metrics.yml | 10 +- .../infra-rabbitmqnode/golden_metrics.yml | 8 +- .../infra-rabbitmqqueue/golden_metrics.yml | 10 +- .../infra-redisinstance/golden_metrics.yml | 6 +- .../infra-vspherecluster/golden_metrics.yml | 6 +- .../golden_metrics.yml | 6 +- .../infra-vspheredatastore/golden_metrics.yml | 4 +- .../infra-vspherehost/golden_metrics.yml | 8 +- .../golden_metrics.yml | 6 +- .../infra-vspherevm/golden_metrics.yml | 6 +- .../mobile-application/golden_metrics.yml | 6 +- definitions/synth-monitor/golden_metrics.yml | 4 +- docs/example-entity-definition.yml | 6 +- docs/golden_metrics.md | 27 +++- docs/summary_metrics.md | 25 ++++ validator/schemas/entity-schema-v1.json | 34 +++-- .../schemas/golden-metrics-schema-v1.json | 134 ++++++++++-------- .../schemas/summary-metrics-schema-v1.json | 131 +++++++++-------- 134 files changed, 710 insertions(+), 586 deletions(-) diff --git a/README.md b/README.md index ab93ce2a6..6c6675367 100644 --- a/README.md +++ b/README.md @@ -132,11 +132,25 @@ You can create a dashboard with the NewRelic interface and export it to JSON for Then you can just copy it to a file within your entity type's folder, modify it if needed and refer to it from the definition.yml: ```yaml -dashboardTemplates: - - ./.json +dashboardTemplates: + newRelic: + template: dashboard.json +``` + +If your entity has more than one telemetry source you can also provide a different dashboard for each of them. The entity must have the tag `instrumentation.provider` with the value used as the key of the `dashboardTemplates`. If you are using a NewRelic agent you should use `newRelic` as the tag value, otherwise come talk to us and we'll guide you. + +In the example below we define a dashboard for two telemetry sources `newRelic` and `otherSource`. +If no tag matches the keys you provide in the map, the dashboard used will be the first one defined, in this case the one for `newRelic`. + + +```yaml +dashboardTemplates: + newRelic: + template: dashboard.json + otherSource: + template: other_source_dashboard.json ``` -Note that you can define more than one dashboard under the `dashboardTemplates` field. #### Configurations diff --git a/definitions/apm-application/golden_metrics.yml b/definitions/apm-application/golden_metrics.yml index 95c90de99..d195cdaad 100644 --- a/definitions/apm-application/golden_metrics.yml +++ b/definitions/apm-application/golden_metrics.yml @@ -3,16 +3,16 @@ responseTimeMs: query: select: average(newrelic.timeslice.value) * 1000 AS 'Response time (ms)' where: metricTimesliceName in ('HttpDispatcher', 'OtherTransaction/all') - facet: appName + eventName: appName throughput: title: Throughput query: select: count(newrelic.timeslice.value) AS 'Throughput' where: metricTimesliceName in ('HttpDispatcher', 'OtherTransaction/all') - facet: appName + eventName: appName errorRate: title: Error rate query: select: filter(count(newrelic.timeslice.value), where metricTimesliceName = 'Errors/all') / (filter(count(newrelic.timeslice.value), where metricTimesliceName in ('HttpDispatcher', 'OtherTransaction/all'))) * 100 AS 'Error %' - facet: appName + eventName: appName diff --git a/definitions/browser-application/golden_metrics.yml b/definitions/browser-application/golden_metrics.yml index 0990220aa..6c5b92351 100644 --- a/definitions/browser-application/golden_metrics.yml +++ b/definitions/browser-application/golden_metrics.yml @@ -3,26 +3,26 @@ throughputPpm: query: select: rate(count(*), 1 minute) from: PageView - facet: appName eventId: entityGuid + eventName: appName largestContentfulPaint75PercentileS: title: Largest Contentful Paint (75 percentile) (s) query: select: percentile(largestContentfulPaint, 75) from: PageViewTiming - facet: appName eventId: entityGuid + eventName: appName firstInputDelay75PercentileMs: title: First Input Delay (75 percentile) (ms) query: select: percentile(firstInputDelay, 75) from: PageViewTiming - facet: appName eventId: entityGuid + eventName: appName errors: title: Errors query: select: count(*) from: JavaScriptError - facet: appName eventId: entityGuid + eventName: appName diff --git a/definitions/ext-fastly_pop/definition.yml b/definitions/ext-fastly_pop/definition.yml index 57deb3f96..e1bb62ec7 100644 --- a/definitions/ext-fastly_pop/definition.yml +++ b/definitions/ext-fastly_pop/definition.yml @@ -17,7 +17,8 @@ synthesis: # Template that can be used to generate a dashboard for the entity. # dashboardTemplates: -# - dashboard.json +# newRelic: +# template: dashboard.json compositeMetrics: goldenMetrics: diff --git a/definitions/ext-fastly_pop/golden_metrics.yml b/definitions/ext-fastly_pop/golden_metrics.yml index abe66cd41..99a228a04 100644 --- a/definitions/ext-fastly_pop/golden_metrics.yml +++ b/definitions/ext-fastly_pop/golden_metrics.yml @@ -5,13 +5,13 @@ clientTimeToFirstByte: select: average(fastly.client.ttfb.summary)/1000 from: Metric where: service LIKE 'fastly%' - facet: entity.name eventId: entity.guid # --- # Query used to build the Logs-to-Metrics rule # --- # FROM Log SELECT summary(`client_resp_ttfb`) AS 'fastly.client.resp.ttfb.summary' WHERE service LIKE 'fastly%' FACET `domain`, `fastly_region`, `fastly_datacenter`, `user_continent_code`, `user_region`, `user_country_code`, `user_agent`, `client_as_name` + eventName: entity.name clientRoundTripTime: title: Average Round Trip Time (ms) displayAsValue: true @@ -19,13 +19,13 @@ clientRoundTripTime: select: average(fastly.client.rtt.summary)/1000 from: Metric where: service LIKE 'fastly%' - facet: entity.name eventId: entity.guid # --- # Query used to build the Logs-to-Metrics rule # --- # FROM Log SELECT summary(`client_rtt_us`) AS 'fastly.client.rtt.summary' WHERE service LIKE 'fastly%' FACET `domain`, `fastly_region`, `fastly_datacenter`, `user_continent_code`, `user_region`, `user_country_code`, `user_agent`, `client_as_name` + eventName: entity.name clientTimeElapsed: title: Average Connection Duration (ms) displayAsValue: true @@ -33,7 +33,6 @@ clientTimeElapsed: select: average(fastly.client.duration.summary)/1000 from: Metric where: service LIKE 'fastly%' - facet: entity.name eventId: entity.guid # --- # Query used to build the Logs-to-Metrics rule @@ -42,6 +41,7 @@ clientTimeElapsed: # This section is disabled until client_rate_bps is added to the ingest + eventName: entity.name clientbps: title: Average Bits Per Second displayAsValue: true @@ -49,9 +49,9 @@ clientbps: select: average(fastly.client.bps.summary) from: Metric where: service LIKE 'fastly%' - facet: entity.name eventId: entity.guid # --- # Query used to build the Logs-to-Metrics rule # --- # FROM Log SELECT summary(`client_rate_bps`) AS 'fastly.client.bps.summary' WHERE service LIKE 'fastly%' FACET `domain`, `fastly_region`, `fastly_datacenter`, `user_continent_code`, `user_region`, `user_country_code`, `user_agent`, `client_as_name` + eventName: entity.name diff --git a/definitions/ext-pi_hole/definition.yml b/definitions/ext-pi_hole/definition.yml index aac2d9c90..d8d1cca5f 100644 --- a/definitions/ext-pi_hole/definition.yml +++ b/definitions/ext-pi_hole/definition.yml @@ -8,8 +8,10 @@ synthesis: conditions: - attribute: metricName prefix: pihole_ + dashboardTemplates: -- dashboard.json + newRelic: + template: dashboard.json compositeMetrics: goldenMetrics: diff --git a/definitions/ext-redis/definition.yml b/definitions/ext-redis/definition.yml index c2a2bbccc..22de5e663 100644 --- a/definitions/ext-redis/definition.yml +++ b/definitions/ext-redis/definition.yml @@ -16,7 +16,8 @@ compositeMetrics: summaryMetrics: - summary_metrics.yml dashboardTemplates: -- dashboard.json + newRelic: + template: dashboard.json configuration: entityExpirationTime: EIGHT_DAYS alertable: true diff --git a/definitions/ext-tinyproxy/definition.yml b/definitions/ext-tinyproxy/definition.yml index 65ccae6e3..2e8aa4e8d 100644 --- a/definitions/ext-tinyproxy/definition.yml +++ b/definitions/ext-tinyproxy/definition.yml @@ -15,7 +15,8 @@ synthesis: instrumentation.name: dashboardTemplates: -- dashboard.json + newRelic: + template: dashboard.json compositeMetrics: goldenMetrics: diff --git a/definitions/infra-apacheserver/golden_metrics.yml b/definitions/infra-apacheserver/golden_metrics.yml index 500297971..41ebbd6dd 100644 --- a/definitions/infra-apacheserver/golden_metrics.yml +++ b/definitions/infra-apacheserver/golden_metrics.yml @@ -4,25 +4,25 @@ requestsPerSecond: select: average(net.requestsPerSecond) from: ApacheSample eventId: entityGuid - facet: entityName + eventName: entityName totalBytesSentPerSecond: title: Total Bytes Sent per second query: select: average(net.bytesPerSecond) from: ApacheSample eventId: entityGuid - facet: entityName + eventName: entityName busyWorkers: title: Current number of Busy Workers query: select: average(server.busyWorkers) from: ApacheSample eventId: entityGuid - facet: entityName + eventName: entityName idleWorkers: title: Current number of Idle Workers query: select: average(server.idleWorkers) from: ApacheSample eventId: entityGuid - facet: entityName + eventName: entityName diff --git a/definitions/infra-awsalb/golden_metrics.yml b/definitions/infra-awsalb/golden_metrics.yml index 83bbf077f..0df80cfeb 100644 --- a/definitions/infra-awsalb/golden_metrics.yml +++ b/definitions/infra-awsalb/golden_metrics.yml @@ -5,21 +5,21 @@ serverErrors4XxAnd5Xx: minute) from: LoadBalancerSample where: provider='Alb' - facet: entityName eventId: entityGuid + eventName: entityName activeConnections: title: Active Connections query: select: rate(sum(provider.activeConnectionCount.Sum),1 minute) from: LoadBalancerSample where: provider='Alb' - facet: entityName eventId: entityGuid + eventName: entityName rejectedConnections: title: Rejected connections query: select: rate(sum(provider.rejectedConnectionCount.Sum),1 minute) from: LoadBalancerSample where: provider='Alb' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsalbtargetgroup/golden_metrics.yml b/definitions/infra-awsalbtargetgroup/golden_metrics.yml index a1b34004e..7203d1edb 100644 --- a/definitions/infra-awsalbtargetgroup/golden_metrics.yml +++ b/definitions/infra-awsalbtargetgroup/golden_metrics.yml @@ -5,29 +5,29 @@ serverErrors4XxAnd5Xx: minute) from: LoadBalancerSample where: provider='AlbTargetGroup' - facet: entityName eventId: entityGuid + eventName: entityName unhealthyHosts: title: Unhealthy host count query: select: max(`provider.unHealthyHostCount.Maximum`) from: LoadBalancerSample where: provider='AlbTargetGroup' - facet: entityName eventId: entityGuid + eventName: entityName responseTime: title: Average response time query: select: average(`provider.targetResponseTime.Average`) from: LoadBalancerSample where: provider='AlbTargetGroup' - facet: entityName eventId: entityGuid + eventName: entityName requests: title: Requests query: select: rate(sum(provider.requestCountPerTarget.Sum),1 minute) from: LoadBalancerSample where: provider='AlbTargetGroup' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsapigatewayapi/golden_metrics.yml b/definitions/infra-awsapigatewayapi/golden_metrics.yml index 69e81b550..c24fa60db 100644 --- a/definitions/infra-awsapigatewayapi/golden_metrics.yml +++ b/definitions/infra-awsapigatewayapi/golden_metrics.yml @@ -4,21 +4,21 @@ requests: select: sum(provider.count.SampleCount) from: ApiGatewaySample where: provider='ApiGatewayApi' - facet: entityName eventId: entityGuid + eventName: entityName errors4XxAnd5Xx: title: Errors (4xx and 5xx) query: select: sum((`provider.5xxError.Sum` OR 0) + (`provider.4xxError.Sum` OR 0)) from: ApiGatewaySample where: provider='ApiGatewayApi' - facet: entityName eventId: entityGuid + eventName: entityName latencyMs: title: Latency (ms) query: select: average(provider.latency.Average) from: ApiGatewaySample where: provider='ApiGatewayApi' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsapigatewayresourcewithmetrics/golden_metrics.yml b/definitions/infra-awsapigatewayresourcewithmetrics/golden_metrics.yml index ad00637ab..a4038b6d9 100644 --- a/definitions/infra-awsapigatewayresourcewithmetrics/golden_metrics.yml +++ b/definitions/infra-awsapigatewayresourcewithmetrics/golden_metrics.yml @@ -4,21 +4,21 @@ requests: select: sum(provider.count.SampleCount) from: ApiGatewaySample where: provider='ApiGatewayResourceWithMetrics' - facet: entityName eventId: entityGuid + eventName: entityName errors4XxAnd5Xx: title: Errors (4xx and 5xx) query: select: sum((`provider.5xxError.Sum` OR 0) + (`provider.4xxError.Sum` OR 0)) from: ApiGatewaySample where: provider='ApiGatewayResourceWithMetrics' - facet: entityName eventId: entityGuid + eventName: entityName latencyMs: title: Latency (ms) query: select: average(provider.latency.Average) from: ApiGatewaySample where: provider='ApiGatewayResourceWithMetrics' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsapigatewaystage/golden_metrics.yml b/definitions/infra-awsapigatewaystage/golden_metrics.yml index fc323634c..7977d7d78 100644 --- a/definitions/infra-awsapigatewaystage/golden_metrics.yml +++ b/definitions/infra-awsapigatewaystage/golden_metrics.yml @@ -4,21 +4,21 @@ requests: select: sum(provider.count.SampleCount) from: ApiGatewaySample where: provider='ApiGatewayStage' - facet: entityName eventId: entityGuid + eventName: entityName errors4XxAnd5Xx: title: Errors (4xx and 5xx) query: select: sum((`provider.4xxError.Sum` OR 0) + (`provider.5xxError.Sum` OR 0)) from: ApiGatewaySample where: provider='ApiGatewayStage' - facet: entityName eventId: entityGuid + eventName: entityName latencyMs: title: Latency (ms) query: select: average(provider.latency.Average) from: ApiGatewaySample where: provider='ApiGatewayStage' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsautoscalinggroup/golden_metrics.yml b/definitions/infra-awsautoscalinggroup/golden_metrics.yml index c2561888b..143fc7827 100644 --- a/definitions/infra-awsautoscalinggroup/golden_metrics.yml +++ b/definitions/infra-awsautoscalinggroup/golden_metrics.yml @@ -4,21 +4,21 @@ desiredInstances: select: max(provider.groupDesiredCapacity.Maximum) from: AutoScalingGroupSample where: provider='AutoScalingGroup' - facet: entityName eventId: entityGuid + eventName: entityName inServiceInstances: title: In service instances query: select: min(provider.groupInServiceInstances.Minimum) from: AutoScalingGroupSample where: provider='AutoScalingGroup' - facet: entityName eventId: entityGuid + eventName: entityName pendingInstances: title: Pending instances query: select: max(provider.groupStandbyInstances.Maximum) from: AutoScalingGroupSample where: provider='AutoScalingGroup' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awscloudfrontdistribution/golden_metrics.yml b/definitions/infra-awscloudfrontdistribution/golden_metrics.yml index 0bd66fa8c..6b6a986e9 100644 --- a/definitions/infra-awscloudfrontdistribution/golden_metrics.yml +++ b/definitions/infra-awscloudfrontdistribution/golden_metrics.yml @@ -4,29 +4,29 @@ requests: select: sum(provider.requests.Sum) from: LoadBalancerSample where: provider='CloudFrontDistribution' - facet: entityName eventId: entityGuid + eventName: entityName totalErrorRate: title: Total error rate query: select: average(provider.totalErrorRate.Average) from: LoadBalancerSample where: provider='CloudFrontDistribution' - facet: entityName eventId: entityGuid + eventName: entityName bytesUploaded: title: Uploaded bytes query: select: sum(provider.bytesUploaded.Sum) from: LoadBalancerSample where: provider='CloudFrontDistribution' - facet: entityName eventId: entityGuid + eventName: entityName bytesDownloaded: title: Downloaded bytes query: select: sum(provider.bytesDownloaded.Sum) from: LoadBalancerSample where: provider='CloudFrontDistribution' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsdocdbcluster/golden_metrics.yml b/definitions/infra-awsdocdbcluster/golden_metrics.yml index 1ebc697f0..bca0be66a 100644 --- a/definitions/infra-awsdocdbcluster/golden_metrics.yml +++ b/definitions/infra-awsdocdbcluster/golden_metrics.yml @@ -6,8 +6,8 @@ cpuUsage: select: average(provider.cpuUtilization.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbCluster' - facet: entityName eventId: entityGuid + eventName: entityName unit: PERCENTAGE databaseConnections: title: Database connections @@ -15,8 +15,8 @@ databaseConnections: select: average(provider.databaseConnections.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbCluster' - facet: entityName eventId: entityGuid + eventName: entityName unit: COUNT volumeBytesUsed: title: Storage consumption @@ -24,8 +24,8 @@ volumeBytesUsed: select: average(provider.volumeBytesUsed.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbCluster' - facet: entityName eventId: entityGuid + eventName: entityName unit: BYTES networkThroughput: title: Network throughput @@ -33,8 +33,8 @@ networkThroughput: select: average(provider.networkThroughput.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbCluster' - facet: entityName eventId: entityGuid + eventName: entityName unit: BYTES_PER_SECOND writeIops: title: Write IOPS @@ -42,8 +42,8 @@ writeIops: select: average(provider.writeIOPS.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbCluster' - facet: entityName eventId: entityGuid + eventName: entityName unit: OPERATIONS_PER_SECOND readIopos: title: Read IOPS @@ -51,6 +51,6 @@ readIopos: select: average(provider.readIOPS.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbCluster' - facet: entityName eventId: entityGuid + eventName: entityName unit: OPERATIONS_PER_SECOND diff --git a/definitions/infra-awsdocdbclusterbyrole/golden_metrics.yml b/definitions/infra-awsdocdbclusterbyrole/golden_metrics.yml index c72bf9575..2dd7cc696 100644 --- a/definitions/infra-awsdocdbclusterbyrole/golden_metrics.yml +++ b/definitions/infra-awsdocdbclusterbyrole/golden_metrics.yml @@ -6,8 +6,8 @@ cpuUsage: select: average(provider.cpuUtilization.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbClusterByRole' - facet: entityName eventId: entityGuid + eventName: entityName unit: PERCENTAGE databaseConnections: title: Database connections @@ -15,8 +15,8 @@ databaseConnections: select: average(provider.databaseConnections.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbClusterByRole' - facet: entityName eventId: entityGuid + eventName: entityName unit: COUNT volumeBytesUsed: title: Storage consumption @@ -24,8 +24,8 @@ volumeBytesUsed: select: average(provider.volumeBytesUsed.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbClusterByRole' - facet: entityName eventId: entityGuid + eventName: entityName unit: BYTES networkThroughput: title: Network throughput @@ -33,8 +33,8 @@ networkThroughput: select: average(provider.networkThroughput.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbClusterByRole' - facet: entityName eventId: entityGuid + eventName: entityName unit: BYTES_PER_SECOND writeIops: title: Write IOPS @@ -42,8 +42,8 @@ writeIops: select: average(provider.writeIOPS.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbClusterByRole' - facet: entityName eventId: entityGuid + eventName: entityName unit: OPERATIONS_PER_SECOND readIopos: title: Read IOPS @@ -51,6 +51,6 @@ readIopos: select: average(provider.readIOPS.Average) from: AwsDocDbClusterSample where: provider='AwsDocDbClusterByRole' - facet: entityName eventId: entityGuid + eventName: entityName unit: OPERATIONS_PER_SECOND diff --git a/definitions/infra-awsdocdbinstance/golden_metrics.yml b/definitions/infra-awsdocdbinstance/golden_metrics.yml index d937c99dd..c392de7f3 100644 --- a/definitions/infra-awsdocdbinstance/golden_metrics.yml +++ b/definitions/infra-awsdocdbinstance/golden_metrics.yml @@ -6,8 +6,8 @@ cpuUsage: select: average(provider.cpuUtilization.Average) from: AwsDocDbInstanceSample where: provider='AwsDocDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName unit: PERCENTAGE databaseConnections: title: Database connections @@ -15,8 +15,8 @@ databaseConnections: select: average(provider.databaseConnections.Average) from: AwsDocDbInstanceSample where: provider='AwsDocDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName unit: COUNT volumeBytesUsed: title: Storage consumption @@ -24,8 +24,8 @@ volumeBytesUsed: select: average(provider.volumeBytesUsed.Average) from: AwsDocDbInstanceSample where: provider='AwsDocDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName unit: BYTES networkThroughput: title: Network throughput @@ -33,8 +33,8 @@ networkThroughput: select: average(provider.networkThroughput.Average) from: AwsDocDbInstanceSample where: provider='AwsDocDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName unit: BYTES_PER_SECOND writeIops: title: Write IOPS @@ -42,8 +42,8 @@ writeIops: select: average(provider.writeIOPS.Average) from: AwsDocDbInstanceSample where: provider='AwsDocDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName unit: OPERATIONS_PER_SECOND readIopos: title: Read IOPS @@ -51,6 +51,6 @@ readIopos: select: average(provider.readIOPS.Average) from: AwsDocDbInstanceSample where: provider='AwsDocDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName unit: OPERATIONS_PER_SECOND diff --git a/definitions/infra-awsdynamodbglobalsecondaryindex/golden_metrics.yml b/definitions/infra-awsdynamodbglobalsecondaryindex/golden_metrics.yml index 79c8412fc..6de1b50dd 100644 --- a/definitions/infra-awsdynamodbglobalsecondaryindex/golden_metrics.yml +++ b/definitions/infra-awsdynamodbglobalsecondaryindex/golden_metrics.yml @@ -4,29 +4,29 @@ consumedReadCapacityUnits: select: sum(provider.consumedReadCapacityUnits.Sum) from: DatastoreSample where: provider='DynamoDbGlobalSecondaryIndex' - facet: entityName eventId: entityGuid + eventName: entityName provisionedReadCapacityUnits: title: Provisioned read capacity unit query: select: sum(provider.provisionedReadCapacityUnits.Average) from: DatastoreSample where: provider='DynamoDbGlobalSecondaryIndex' - facet: entityName eventId: entityGuid + eventName: entityName consumedWriteCapacityUnits: title: Consumed write capacity unit query: select: sum(provider.consumedWriteCapacityUnits.Sum) from: DatastoreSample where: provider='DynamoDbGlobalSecondaryIndex' - facet: entityName eventId: entityGuid + eventName: entityName provisionedWriteCapacityUnits: title: Provisioned write capacity unit query: select: sum(provider.provisionedWriteCapacityUnits.Average) from: DatastoreSample where: provider='DynamoDbGlobalSecondaryIndex' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsdynamodbregion/golden_metrics.yml b/definitions/infra-awsdynamodbregion/golden_metrics.yml index e9253e4bf..2ebfa2573 100644 --- a/definitions/infra-awsdynamodbregion/golden_metrics.yml +++ b/definitions/infra-awsdynamodbregion/golden_metrics.yml @@ -4,5 +4,5 @@ systemErrors: select: sum(systemErrors.Total) from: DatastoreSample where: provider='DynamoDbRegion' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsdynamodbtable/golden_metrics.yml b/definitions/infra-awsdynamodbtable/golden_metrics.yml index 269b5f5bc..4d002bc77 100644 --- a/definitions/infra-awsdynamodbtable/golden_metrics.yml +++ b/definitions/infra-awsdynamodbtable/golden_metrics.yml @@ -4,21 +4,21 @@ readThrottledRequests: select: sum(provider.readThrottleEvents.Sum) from: DatastoreSample where: provider='DynamoDbTable' - facet: entityName eventId: entityGuid + eventName: entityName writeThrottledRequests: title: Write throttled requests query: select: sum(provider.writeThrottleEvents.Sum) from: DatastoreSample where: provider='DynamoDbTable' - facet: entityName eventId: entityGuid + eventName: entityName getitemLatencyMs: title: GetItem latency (ms) query: select: average(provider.getSuccessfulRequestLatency.Average) from: DatastoreSample where: provider='DynamoDbTable' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsebsvolume/golden_metrics.yml b/definitions/infra-awsebsvolume/golden_metrics.yml index bc944ab62..bf2e426f1 100644 --- a/definitions/infra-awsebsvolume/golden_metrics.yml +++ b/definitions/infra-awsebsvolume/golden_metrics.yml @@ -4,29 +4,29 @@ readAndWriteOperations: select: sum((provider.volumeReadOps.Sum OR 0) + (provider.volumeWriteOps.Sum OR 0)) from: BlockDeviceSample where: provider='EbsVolume' - facet: entityName eventId: entityGuid + eventName: entityName readAndWriteQueueLength: title: Read and Write Queue Length query: select: average(provider.volumeQueueLength.Average) from: BlockDeviceSample where: provider='EbsVolume' - facet: entityName eventId: entityGuid + eventName: entityName averageWriteTimeMs: title: Average Write Time (ms) query: select: average(provider.volumeTotalWriteTime.Sum / provider.volumeWriteOps.Sum) * 1000 from: BlockDeviceSample where: provider='EbsVolume' - facet: entityName eventId: entityGuid + eventName: entityName averageReadTimeMs: title: Average Read Time (ms) query: select: average(provider.volumeTotalReadTime.Sum / provider.volumeReadOps.Sum) * 1000 from: BlockDeviceSample where: provider='EbsVolume' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsecscluster/golden_metrics.yml b/definitions/infra-awsecscluster/golden_metrics.yml index fbc14fcfe..b15d3746d 100644 --- a/definitions/infra-awsecscluster/golden_metrics.yml +++ b/definitions/infra-awsecscluster/golden_metrics.yml @@ -4,13 +4,13 @@ cpuUsage: select: average(provider.cpuUtilization.Average) from: ComputeSample where: provider='EcsCluster' - facet: entityName eventId: entityGuid + eventName: entityName memoryUsage: title: Memory usage (%) query: select: average(provider.memoryUtilization.Average) from: ComputeSample where: provider='EcsCluster' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsecsservice/golden_metrics.yml b/definitions/infra-awsecsservice/golden_metrics.yml index 67cf5313d..074e30f1f 100644 --- a/definitions/infra-awsecsservice/golden_metrics.yml +++ b/definitions/infra-awsecsservice/golden_metrics.yml @@ -4,13 +4,13 @@ cpuUsage: select: average(provider.cpuUtilization.Average) from: ComputeSample where: provider='EcsService' - facet: entityName eventId: entityGuid + eventName: entityName memoryUsage: title: Memory usage (%) query: select: average(provider.memoryUtilization.Average) from: ComputeSample where: provider='EcsService' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsefsfilesystem/golden_metrics.yml b/definitions/infra-awsefsfilesystem/golden_metrics.yml index 9ca2f506e..f5dce43fa 100644 --- a/definitions/infra-awsefsfilesystem/golden_metrics.yml +++ b/definitions/infra-awsefsfilesystem/golden_metrics.yml @@ -4,29 +4,29 @@ iops: select: rate(sum(`provider.totalIOBytes.Sum`), 1 second) from: BlockDeviceSample where: provider='EfsFileSystem' - facet: entityName eventId: entityGuid + eventName: entityName iolimit: title: I/O limit (%) query: select: max(`provider.percentIOLimit.Maximum`) from: BlockDeviceSample where: provider='EfsFileSystem' - facet: entityName eventId: entityGuid + eventName: entityName clientConnections: title: Client Connections query: select: max(`provider.clientConnections.Sum`) from: BlockDeviceSample where: provider='EfsFileSystem' - facet: entityName eventId: entityGuid + eventName: entityName burstCreditBalance: title: Burst Credit Balance query: select: average(`provider.burstCreditBalance.Average`) from: BlockDeviceSample where: provider='EfsFileSystem' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awselasticachememcachedcluster/golden_metrics.yml b/definitions/infra-awselasticachememcachedcluster/golden_metrics.yml index fb4cc58a0..71f67f965 100644 --- a/definitions/infra-awselasticachememcachedcluster/golden_metrics.yml +++ b/definitions/infra-awselasticachememcachedcluster/golden_metrics.yml @@ -4,37 +4,37 @@ cpuUtilization: select: average(provider.cpuUtilization.Average) from: DatastoreSample where: provider='ElastiCacheMemcachedCluster' - facet: entityName eventId: entityGuid + eventName: entityName swapUsageBytes: title: Swap usage (bytes) query: select: average(`provider.swapUsage.Average`) from: DatastoreSample where: provider='ElastiCacheMemcachedCluster' - facet: entityName eventId: entityGuid + eventName: entityName freeableMemory: title: Free memory (bytes) query: select: average(`provider.freeableMemory.Average`) from: DatastoreSample where: provider='ElastiCacheMemcachedCluster' - facet: entityName eventId: entityGuid + eventName: entityName networkBytesIn: title: Bytes in per sec query: select: rate(sum(`provider.networkBytesIn.Sum`), 1 second) from: DatastoreSample where: provider='ElastiCacheMemcachedCluster' - facet: entityName eventId: entityGuid + eventName: entityName networkBytesOut: title: Bytes out per sec query: select: rate(sum(`provider.networkBytesOut.Sum`), 1 second) from: DatastoreSample where: provider='ElastiCacheMemcachedCluster' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awselasticachememcachednode/golden_metrics.yml b/definitions/infra-awselasticachememcachednode/golden_metrics.yml index df5e23dbe..e920f80fa 100644 --- a/definitions/infra-awselasticachememcachednode/golden_metrics.yml +++ b/definitions/infra-awselasticachememcachednode/golden_metrics.yml @@ -4,45 +4,45 @@ getThroughput: select: rate(sum(provider.getHits.Sum)+sum(provider.getMisses.Sum), 1 second) from: DatastoreSample where: provider='ElastiCacheMemcachedNode' - facet: entityName eventId: entityGuid + eventName: entityName getMisses: title: Get hit rate (%) query: select: (sum(provider.getHits.Sum)/(sum(provider.getHits.Sum)+sum(provider.getMisses.Sum)))*100 from: DatastoreSample where: provider='ElastiCacheMemcachedNode' - facet: entityName eventId: entityGuid + eventName: entityName evictedItems: title: Evicted items per sec query: select: rate(sum(`provider.evictions.Sum`), 1 second) from: DatastoreSample where: provider='ElastiCacheMemcachedNode' - facet: entityName eventId: entityGuid + eventName: entityName swapUsage: title: Swap Usage query: select: average(`provider.swapUsage.Average`) from: DatastoreSample where: provider='ElastiCacheMemcachedNode' - facet: entityName eventId: entityGuid + eventName: entityName cpuUtilization: title: CPU utilization (%) query: select: average(provider.cpuUtilization.Average) from: DatastoreSample where: provider='ElastiCacheMemcachedNode' - facet: entityName eventId: entityGuid + eventName: entityName currentConnections: title: Current connections query: select: average(`provider.currConnections.Average`) from: DatastoreSample where: provider='ElastiCacheMemcachedNode' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awselasticacherediscluster/golden_metrics.yml b/definitions/infra-awselasticacherediscluster/golden_metrics.yml index 5d05745f8..d622b86a5 100644 --- a/definitions/infra-awselasticacherediscluster/golden_metrics.yml +++ b/definitions/infra-awselasticacherediscluster/golden_metrics.yml @@ -4,45 +4,45 @@ cpuUtilization: select: average(provider.cpuUtilization.Average) from: DatastoreSample where: provider='ElastiCacheRedisCluster' - facet: entityName eventId: entityGuid + eventName: entityName engineCpuUtilization: title: Engine CPU utilization (%) query: select: average(provider.engineCpuUtilization.Average) from: DatastoreSample where: provider='ElastiCacheRedisCluster' - facet: entityName eventId: entityGuid + eventName: entityName swapUsageBytes: title: Swap usage (bytes) query: select: average(`provider.swapUsage.Average`) from: DatastoreSample where: provider='ElastiCacheRedisCluster' - facet: entityName eventId: entityGuid + eventName: entityName freeableMemory: title: Free memory (bytes) query: select: average(`provider.freeableMemory.Average`) from: DatastoreSample where: provider='ElastiCacheRedisCluster' - facet: entityName eventId: entityGuid + eventName: entityName networkBytesIn: title: Bytes in per sec query: select: rate(sum(`provider.networkBytesIn.Sum`), 1 second) from: DatastoreSample where: provider='ElastiCacheRedisCluster' - facet: entityName eventId: entityGuid + eventName: entityName networkBytesOut: title: Bytes out per sec query: select: rate(sum(`provider.networkBytesOut.Sum`), 1 second) from: DatastoreSample where: provider='ElastiCacheRedisCluster' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awselasticacheredisnode/golden_metrics.yml b/definitions/infra-awselasticacheredisnode/golden_metrics.yml index 7cb2e372e..b82b05b5e 100644 --- a/definitions/infra-awselasticacheredisnode/golden_metrics.yml +++ b/definitions/infra-awselasticacheredisnode/golden_metrics.yml @@ -4,45 +4,45 @@ readThroughput: select: rate(sum(provider.cacheHits.Sum)+sum(provider.cacheMisses.Sum), 1 second) from: DatastoreSample where: provider='ElastiCacheRedisNode' - facet: entityName eventId: entityGuid + eventName: entityName cacheHitRate: title: Cache hit rate (%) query: select: (sum(provider.cacheHits.Sum)/(sum(provider.cacheHits.Sum)+sum(provider.cacheMisses.Sum)))*100 from: DatastoreSample where: provider='ElastiCacheRedisNode' - facet: entityName eventId: entityGuid + eventName: entityName evictedItems: title: Evicted items per sec query: select: rate(sum(`provider.evictions.Sum`), 1 second) from: DatastoreSample where: provider='ElastiCacheRedisNode' - facet: entityName eventId: entityGuid + eventName: entityName swapUsage: title: Swap Usage query: select: average(`provider.swapUsage.Average`) from: DatastoreSample where: provider='ElastiCacheRedisNode' - facet: entityName eventId: entityGuid + eventName: entityName cpuUtilization: title: CPU utilization (%) query: select: average(provider.cpuUtilization.Average) from: DatastoreSample where: provider='ElastiCacheRedisNode' - facet: entityName eventId: entityGuid + eventName: entityName currentConnections: title: Current connections query: select: average(`provider.currConnections.Average`) from: DatastoreSample where: provider='ElastiCacheRedisNode' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awselasticbeanstalkenvironment/golden_metrics.yml b/definitions/infra-awselasticbeanstalkenvironment/golden_metrics.yml index a4e644896..a8e1c0722 100644 --- a/definitions/infra-awselasticbeanstalkenvironment/golden_metrics.yml +++ b/definitions/infra-awselasticbeanstalkenvironment/golden_metrics.yml @@ -3,7 +3,7 @@ requests: eventId: entityGuid select: sum(`provider.applicationRequestsTotal.Sum`) from: ElasticBeanstalkEnvironmentSample - facet: entityName + eventName: entityName unit: COUNT title: Requests latency: @@ -11,6 +11,6 @@ latency: eventId: entityGuid select: (average(`provider.applicationLatencyP99.9.Average`) * 1000) / 1000 from: ElasticBeanstalkEnvironmentSample - facet: entityName + eventName: entityName unit: SECONDS title: Latency diff --git a/definitions/infra-awselasticmapreducecluster/golden_metrics.yml b/definitions/infra-awselasticmapreducecluster/golden_metrics.yml index 9b600369d..95959b8fa 100644 --- a/definitions/infra-awselasticmapreducecluster/golden_metrics.yml +++ b/definitions/infra-awselasticmapreducecluster/golden_metrics.yml @@ -4,8 +4,8 @@ availableMemoryBytes: select: average(provider.memoryAvailableBytes.Average) from: ElasticMapReduceClusterSample where: provider='ElasticMapReduceCluster' - facet: entityName eventId: entityGuid + eventName: entityName unit: BYTES completedApplications: title: Completed applications @@ -13,8 +13,8 @@ completedApplications: select: rate(sum(provider.appsCompleted.Sum), 1 minute) from: ElasticMapReduceClusterSample where: provider='ElasticMapReduceCluster' - facet: entityName eventId: entityGuid + eventName: entityName unit: COUNT failedApplications: title: Failed applications @@ -22,6 +22,6 @@ failedApplications: select: rate(sum(provider.appsFailed.Sum), 1 minute) from: ElasticMapReduceClusterSample where: provider='ElasticMapReduceCluster' - facet: entityName eventId: entityGuid + eventName: entityName unit: COUNT diff --git a/definitions/infra-awselasticsearchcluster/golden_metrics.yml b/definitions/infra-awselasticsearchcluster/golden_metrics.yml index 4aa1d1a1c..92d2208da 100644 --- a/definitions/infra-awselasticsearchcluster/golden_metrics.yml +++ b/definitions/infra-awselasticsearchcluster/golden_metrics.yml @@ -4,45 +4,45 @@ searchRateOpsMin: select: average(provider.SearchRate.Average) from: DatastoreSample where: provider='ElasticsearchCluster' - facet: entityName eventId: entityGuid + eventName: entityName indexingRateReqsMin: title: Indexing rate (reqs/min) query: select: average(provider.IndexingRate.Average) from: DatastoreSample where: provider='ElasticsearchCluster' - facet: entityName eventId: entityGuid + eventName: entityName searchLatencyMs: title: Search latency (ms) query: select: average(provider.SearchLatency.Average) from: DatastoreSample where: provider='ElasticsearchCluster' - facet: entityName eventId: entityGuid + eventName: entityName indexingLatencyMs: title: Indexing latency (ms) query: select: average(provider.IndexingLatency.Average) from: DatastoreSample where: provider='ElasticsearchCluster' - facet: entityName eventId: entityGuid + eventName: entityName cpuUtilization: title: CPU Utilization (%) query: select: average(`provider.CPUUtilization.Average`) from: DatastoreSample where: provider='ElasticsearchCluster' - facet: entityName eventId: entityGuid + eventName: entityName jvmMemoryPressure: title: JVM memory pressure (%) query: select: max(`provider.JVMMemoryPressure.Maximum`) from: DatastoreSample where: provider='ElasticsearchCluster' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awselasticsearchnode/golden_metrics.yml b/definitions/infra-awselasticsearchnode/golden_metrics.yml index e8bd0c580..76da11820 100644 --- a/definitions/infra-awselasticsearchnode/golden_metrics.yml +++ b/definitions/infra-awselasticsearchnode/golden_metrics.yml @@ -4,45 +4,45 @@ searchRateOpsMin: select: average(provider.SearchRate.Average) from: DatastoreSample where: provider='ElasticsearchNode' - facet: entityName eventId: entityGuid + eventName: entityName indexingRateReqsMin: title: Indexing rate (reqs/min) query: select: average(provider.IndexingRate.Average) from: DatastoreSample where: provider='ElasticsearchNode' - facet: entityName eventId: entityGuid + eventName: entityName searchLatencyMs: title: Search latency (ms) query: select: average(provider.SearchLatency.Average) from: DatastoreSample where: provider='ElasticsearchNode' - facet: entityName eventId: entityGuid + eventName: entityName indexingLatencyMs: title: Indexing latency (ms) query: select: average(provider.IndexingLatency.Average) from: DatastoreSample where: provider='ElasticsearchNode' - facet: entityName eventId: entityGuid + eventName: entityName cpuUtilization: title: Max CPU Utilization (%) query: select: max(`provider.CPUUtilization.Maximum`) from: DatastoreSample where: provider='ElasticsearchNode' - facet: entityName eventId: entityGuid + eventName: entityName jvmMemoryPressure: title: Max JVM memory pressure (%) query: select: max(`provider.JVMMemoryPressure.Maximum`) from: DatastoreSample where: provider='ElasticsearchNode' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awselb/golden_metrics.yml b/definitions/infra-awselb/golden_metrics.yml index 645a7c6c5..7236aac6f 100644 --- a/definitions/infra-awselb/golden_metrics.yml +++ b/definitions/infra-awselb/golden_metrics.yml @@ -4,45 +4,45 @@ requests: select: rate(sum(provider.requestCount.Sum), 1 minute) from: LoadBalancerSample where: provider='Elb' - facet: entityName eventId: entityGuid + eventName: entityName latency: title: Latency (s) query: select: average(provider.latency.Average) from: LoadBalancerSample where: provider='Elb' - facet: entityName eventId: entityGuid + eventName: entityName errorRate: title: Error Rate query: select: rate(sum(provider.backendConnectionErrors.Sum), 1 minute) from: LoadBalancerSample where: provider='Elb' - facet: entityName eventId: entityGuid + eventName: entityName latencyP99: title: P99 Latency (s) query: select: average(provider.latency.p99) from: LoadBalancerSample where: provider='Elb' - facet: entityName eventId: entityGuid + eventName: entityName latencyP90: title: P90 Latency (s) query: select: average(provider.latency.p90) from: LoadBalancerSample where: provider='Elb' - facet: entityName eventId: entityGuid + eventName: entityName unhealthyHosts: title: Unhealthy hosts query: select: average(`provider.unhealthyHostCount.Average`) from: LoadBalancerSample where: provider='Elb' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsfsxwindowsfileserver/golden_metrics.yml b/definitions/infra-awsfsxwindowsfileserver/golden_metrics.yml index 49cb95db9..98511ca1b 100644 --- a/definitions/infra-awsfsxwindowsfileserver/golden_metrics.yml +++ b/definitions/infra-awsfsxwindowsfileserver/golden_metrics.yml @@ -3,26 +3,26 @@ fileSystemReadOperationsBytes: query: select: average(dataReadBytes) from: AwsFsxWindowsFileServerSample - facet: entityName eventId: entityGuid + eventName: entityName fileSystemWriteOperationsBytes: title: File system write operations (bytes) query: select: average(dataWriteBytes) from: AwsFsxWindowsFileServerSample - facet: entityName eventId: entityGuid + eventName: entityName readOperations: title: Read operations query: select: average(dataReadOperations) from: AwsFsxWindowsFileServerSample - facet: entityName eventId: entityGuid + eventName: entityName writeOperations: title: Write operations query: select: average(dataWriteOperations) from: AwsFsxWindowsFileServerSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awskinesisanalyticsapplication/golden_metrics.yml b/definitions/infra-awskinesisanalyticsapplication/golden_metrics.yml index 5e7f4f735..04656b131 100644 --- a/definitions/infra-awskinesisanalyticsapplication/golden_metrics.yml +++ b/definitions/infra-awskinesisanalyticsapplication/golden_metrics.yml @@ -4,37 +4,37 @@ millisBehindLatest: select: average(provider.millisBehindLatest.Average) * 1000 from: AwsKinesisAnalyticsApplicationSample where: provider='AwsKinesisAnalyticsApplication' - facet: entityName eventId: entityGuid + eventName: entityName bytesConsumedRate: title: Consumed bytes (Bytes per sec) query: select: average(provider.bytesConsumedRate.Average) from: AwsKinesisAnalyticsApplicationSample where: provider='AwsKinesisAnalyticsApplication' - facet: entityName eventId: entityGuid + eventName: entityName numRecordsIn: title: Number of received records query: select: average(provider.numRecordsIn.Average) from: AwsKinesisAnalyticsTaskSample where: provider='AwsKinesisAnalyticsTask' - facet: entityName eventId: entityGuid + eventName: entityName numRecordsOut: title: Number of emitted records query: select: average(provider.numRecordsOut.Average) from: AwsKinesisAnalyticsTaskSample where: provider='AwsKinesisAnalyticsTask' - facet: entityName eventId: entityGuid + eventName: entityName recordsLagMax: title: Maximum lag query: select: max(provider.recordsLagMax.Maximum) from: AwsKinesisAnalyticsTaskSample where: provider='AwsKinesisAnalyticsTask' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awskinesisanalyticstask/golden_metrics.yml b/definitions/infra-awskinesisanalyticstask/golden_metrics.yml index af227d174..f54c3ac83 100644 --- a/definitions/infra-awskinesisanalyticstask/golden_metrics.yml +++ b/definitions/infra-awskinesisanalyticstask/golden_metrics.yml @@ -4,21 +4,21 @@ numRecordsIn: select: average(provider.numRecordsIn.Average) from: AwsKinesisAnalyticsTaskSample where: provider='AwsKinesisAnalyticsTask' - facet: entityName eventId: entityGuid + eventName: entityName numRecordsOut: title: Number of emitted records query: select: average(provider.numRecordsOut.Average) from: AwsKinesisAnalyticsTaskSample where: provider='AwsKinesisAnalyticsTask' - facet: entityName eventId: entityGuid + eventName: entityName recordsLagMax: title: Maximum lag query: select: max(provider.recordsLagMax.Maximum) from: AwsKinesisAnalyticsTaskSample where: provider='AwsKinesisAnalyticsTask' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awskinesisdeliverystream/golden_metrics.yml b/definitions/infra-awskinesisdeliverystream/golden_metrics.yml index 49dcef4bd..f44a0c20b 100644 --- a/definitions/infra-awskinesisdeliverystream/golden_metrics.yml +++ b/definitions/infra-awskinesisdeliverystream/golden_metrics.yml @@ -4,8 +4,8 @@ putThroughput: select: rate(sum(provider.incomingBytes.Sum), 1 second) from: QueueSample where: provider='KinesisDeliveryStream' - facet: entityName eventId: entityGuid + eventName: entityName getThroughput: title: Bytes out per sec query: @@ -13,16 +13,16 @@ getThroughput: + sum(`provider.deliveryToRedshiftBytes.Sum`)), 1 second) from: QueueSample where: provider='KinesisDeliveryStream' - facet: entityName eventId: entityGuid + eventName: entityName putRecordThroughput: title: Records in per sec query: select: rate(sum(provider.incomingRecords.Sum), 1 second) from: QueueSample where: provider='KinesisDeliveryStream' - facet: entityName eventId: entityGuid + eventName: entityName getRecordsThroughput: title: Records out per sec query: @@ -30,5 +30,5 @@ getRecordsThroughput: + sum(`provider.deliveryToRedshiftRecords.Sum`)), 1 second) from: QueueSample where: provider='KinesisDeliveryStream' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awskinesisstream/golden_metrics.yml b/definitions/infra-awskinesisstream/golden_metrics.yml index 2556969bc..2e2c07b29 100644 --- a/definitions/infra-awskinesisstream/golden_metrics.yml +++ b/definitions/infra-awskinesisstream/golden_metrics.yml @@ -4,45 +4,45 @@ putThroughput: select: rate(sum(provider.incomingBytes.Sum), 1 second) from: QueueSample where: provider='KinesisStream' - facet: entityName eventId: entityGuid + eventName: entityName getThroughput: title: Bytes out per sec query: select: rate(sum(provider.getRecordsBytes.Sum), 1 second) from: QueueSample where: provider='KinesisStream' - facet: entityName eventId: entityGuid + eventName: entityName putRecordThroughput: title: Put records per sec query: select: rate(sum(provider.incomingRecords.Sum), 1 second) from: QueueSample where: provider='KinesisStream' - facet: entityName eventId: entityGuid + eventName: entityName getRecordsThroughput: title: Get records per sec query: select: rate(sum(provider.getRecordsRecords.Sum), 1 second) from: QueueSample where: provider='KinesisStream' - facet: entityName eventId: entityGuid + eventName: entityName putrecordsCallsThrottled: title: Puts throttled per second query: select: rate(sum(provider.writeProvisionedThroughputExceeded.Sum), 1 second) from: QueueSample where: provider='KinesisStream' - facet: entityName eventId: entityGuid + eventName: entityName getrecordsCallsThrottled: title: Gets throttled per second query: select: rate(sum(provider.readProvisionedThroughputExceeded.Sum), 1 second) from: QueueSample where: provider='KinesisStream' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awskinesisstreamshard/golden_metrics.yml b/definitions/infra-awskinesisstreamshard/golden_metrics.yml index 08bd62783..dca03753f 100644 --- a/definitions/infra-awskinesisstreamshard/golden_metrics.yml +++ b/definitions/infra-awskinesisstreamshard/golden_metrics.yml @@ -4,45 +4,45 @@ putThroughput: select: rate(sum(provider.incomingBytes.Sum), 1 second) from: QueueSample where: provider='KinesisStreamShard' - facet: entityName eventId: entityGuid + eventName: entityName getThroughput: title: Bytes out per sec query: select: rate(sum(provider.outgoingBytes.Sum), 1 second) from: QueueSample where: provider='KinesisStreamShard' - facet: entityName eventId: entityGuid + eventName: entityName putRecordThroughput: title: Put records per sec query: select: rate(sum(provider.incomingRecords.Sum), 1 second) from: QueueSample where: provider='KinesisStreamShard' - facet: entityName eventId: entityGuid + eventName: entityName getRecordsThroughput: title: Get records per sec query: select: rate(sum(provider.outgoingRecords.Sum), 1 second) from: QueueSample where: provider='KinesisStreamShard' - facet: entityName eventId: entityGuid + eventName: entityName putrecordsCallsThrottled: title: Puts throttled per sec query: select: rate(sum(provider.writeProvisionedThroughputExceeded.Sum), 1 second) from: QueueSample where: provider='KinesisStreamShard' - facet: entityName eventId: entityGuid + eventName: entityName getrecordsCallsThrottled: title: Gets throttled per sec query: select: rate(sum(provider.readProvisionedThroughputExceeded.Sum), 1 second) from: QueueSample where: provider='KinesisStreamShard' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awslambdafunction/golden_metrics.yml b/definitions/infra-awslambdafunction/golden_metrics.yml index f5ea0c099..48f39c6cc 100644 --- a/definitions/infra-awslambdafunction/golden_metrics.yml +++ b/definitions/infra-awslambdafunction/golden_metrics.yml @@ -5,7 +5,7 @@ errorRate: from: ServerlessSample where: provider='LambdaFunction' eventId: entityGuid - facet: entityName + eventName: entityName totalInvocations: title: Total Invocations query: @@ -13,7 +13,7 @@ totalInvocations: from: ServerlessSample where: provider='LambdaFunction' eventId: entityGuid - facet: entityName + eventName: entityName duration99PercentileS: title: Duration (99 percentile) (s) query: @@ -21,7 +21,7 @@ duration99PercentileS: from: ServerlessSample where: provider='LambdaFunction' eventId: entityGuid - facet: entityName + eventName: entityName throttles: title: Throttled invocations query: @@ -29,4 +29,4 @@ throttles: from: ServerlessSample where: provider='LambdaFunction' eventId: entityGuid - facet: entityName + eventName: entityName diff --git a/definitions/infra-awslambdafunctionalias/golden_metrics.yml b/definitions/infra-awslambdafunctionalias/golden_metrics.yml index f5ea0c099..48f39c6cc 100644 --- a/definitions/infra-awslambdafunctionalias/golden_metrics.yml +++ b/definitions/infra-awslambdafunctionalias/golden_metrics.yml @@ -5,7 +5,7 @@ errorRate: from: ServerlessSample where: provider='LambdaFunction' eventId: entityGuid - facet: entityName + eventName: entityName totalInvocations: title: Total Invocations query: @@ -13,7 +13,7 @@ totalInvocations: from: ServerlessSample where: provider='LambdaFunction' eventId: entityGuid - facet: entityName + eventName: entityName duration99PercentileS: title: Duration (99 percentile) (s) query: @@ -21,7 +21,7 @@ duration99PercentileS: from: ServerlessSample where: provider='LambdaFunction' eventId: entityGuid - facet: entityName + eventName: entityName throttles: title: Throttled invocations query: @@ -29,4 +29,4 @@ throttles: from: ServerlessSample where: provider='LambdaFunction' eventId: entityGuid - facet: entityName + eventName: entityName diff --git a/definitions/infra-awslambdaregion/golden_metrics.yml b/definitions/infra-awslambdaregion/golden_metrics.yml index 0edce0bb3..cc9416b08 100644 --- a/definitions/infra-awslambdaregion/golden_metrics.yml +++ b/definitions/infra-awslambdaregion/golden_metrics.yml @@ -5,7 +5,7 @@ ConcurrentExecutions: from: ServerlessSample where: provider='LambdaRegion' eventId: entityGuid - facet: entityName + eventName: entityName UnreservedConcurrentExecutions: title: Max Unreserved Current Executions query: @@ -13,4 +13,4 @@ UnreservedConcurrentExecutions: from: ServerlessSample where: provider='LambdaRegion' eventId: entityGuid - facet: entityName + eventName: entityName diff --git a/definitions/infra-awsmediaconvertoperation/golden_metrics.yml b/definitions/infra-awsmediaconvertoperation/golden_metrics.yml index cf377eee3..1cb01ec51 100644 --- a/definitions/infra-awsmediaconvertoperation/golden_metrics.yml +++ b/definitions/infra-awsmediaconvertoperation/golden_metrics.yml @@ -3,5 +3,5 @@ operationErrors: query: select: average(errors) from: AwsMediaConvertOperationSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsmediaconvertqueue/golden_metrics.yml b/definitions/infra-awsmediaconvertqueue/golden_metrics.yml index 3df569c41..e1aa8ac0b 100644 --- a/definitions/infra-awsmediaconvertqueue/golden_metrics.yml +++ b/definitions/infra-awsmediaconvertqueue/golden_metrics.yml @@ -3,61 +3,61 @@ audioOnlyOutputS: query: select: average(audioOutputDuration) from: AwsMediaConvertQueueSample - facet: entityName eventId: entityGuid + eventName: entityName standardDefinitionSdOutputS: title: Standard definition (SD) output (s) query: select: average(sDOutputDuration) from: AwsMediaConvertQueueSample - facet: entityName eventId: entityGuid + eventName: entityName highDefinitionHdOutputS: title: High-definition (HD) output (s) query: select: average(hDOutputDuration) from: AwsMediaConvertQueueSample - facet: entityName eventId: entityGuid + eventName: entityName ultraHighDefinitionUhdOutputS: title: Ultra-high-definition (UHD) output (s) query: select: average(uHDOutputDuration) from: AwsMediaConvertQueueSample - facet: entityName eventId: entityGuid + eventName: entityName 8KOutputS: title: 8K output (s) query: select: average(`8KOutputDuration`) from: AwsMediaConvertQueueSample - facet: entityName eventId: entityGuid + eventName: entityName jobsCompleted: title: Jobs completed query: select: average(jobsCompletedCount) from: AwsMediaConvertQueueSample - facet: entityName eventId: entityGuid + eventName: entityName jobsFailed: title: Jobs failed query: select: average(jobsErroredCount) from: AwsMediaConvertQueueSample - facet: entityName eventId: entityGuid + eventName: entityName transcodingStandByDurationS: title: Transcoding stand by duration (s) query: select: average(standbyTime) from: AwsMediaConvertQueueSample - facet: entityName eventId: entityGuid + eventName: entityName transcodingDurationS: title: Transcoding duration (s) query: select: average(transcodingTime) from: AwsMediaConvertQueueSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsmediapackagevodpackagingconfiguration/golden_metrics.yml b/definitions/infra-awsmediapackagevodpackagingconfiguration/golden_metrics.yml index 9e563ae3c..40d05911d 100644 --- a/definitions/infra-awsmediapackagevodpackagingconfiguration/golden_metrics.yml +++ b/definitions/infra-awsmediapackagevodpackagingconfiguration/golden_metrics.yml @@ -3,19 +3,19 @@ bytesSuccessfullySentPerRequest: query: select: average(egressBytes) from: AwsMediaPackageVODPackagingConfigurationSample - facet: entityName eventId: entityGuid + eventName: entityName processTimeOfOutputRequestsMs: title: Process time of output requests (ms) query: select: average(egressResponseTime) from: AwsMediaPackageVODPackagingConfigurationSample - facet: entityName eventId: entityGuid + eventName: entityName contentRequestsReceived: title: Content requests received query: select: average(egressRequestCount) from: AwsMediaPackageVODPackagingConfigurationSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsmskbroker/golden_metrics.yml b/definitions/infra-awsmskbroker/golden_metrics.yml index 411f11e21..6690161da 100644 --- a/definitions/infra-awsmskbroker/golden_metrics.yml +++ b/definitions/infra-awsmskbroker/golden_metrics.yml @@ -4,21 +4,21 @@ incomingMessagesPerSecond: select: average(provider.messagesInPerSec.Average) from: AwsMskBrokerSample where: provider='AwsMskBroker' - facet: entityName eventId: entityGuid + eventName: entityName networkRxDropped: title: Network RX Dropped query: select: max(provider.networkRxDropped.Maximum) from: AwsMskBrokerSample where: provider='AwsMskBroker' - facet: entityName eventId: entityGuid + eventName: entityName networkTxDropped: title: Network TX Dropped query: select: max(provider.networkTxDropped.Maximum) from: AwsMskBrokerSample where: provider='AwsMskBroker' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsmskcluster/golden_metrics.yml b/definitions/infra-awsmskcluster/golden_metrics.yml index d0b3672bd..1232f4256 100644 --- a/definitions/infra-awsmskcluster/golden_metrics.yml +++ b/definitions/infra-awsmskcluster/golden_metrics.yml @@ -4,21 +4,21 @@ activeControllers: select: min(provider.activeControllerCount.Minimum) from: AwsMskClusterSample where: provider='AwsMskCluster' - facet: entityName eventId: entityGuid + eventName: entityName globalPartitions: title: Global partitions query: select: min(provider.globalPartitionCount.Minimum) from: AwsMskClusterSample where: provider='AwsMskCluster' - facet: entityName eventId: entityGuid + eventName: entityName offlinePartitions: title: Offline partitions query: select: max(provider.offlinePartitionsCount.Maximum) from: AwsMskClusterSample where: provider='AwsMskCluster' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsnlb/golden_metrics.yml b/definitions/infra-awsnlb/golden_metrics.yml index 7e1f1b5f9..867b81784 100644 --- a/definitions/infra-awsnlb/golden_metrics.yml +++ b/definitions/infra-awsnlb/golden_metrics.yml @@ -5,7 +5,7 @@ failedClientNlbTlsHandshakes: from: LoadBalancerSample where: provider='Nlb' eventId: entityGuid - facet: entityName + eventName: entityName failedNlbTargetTlsHandshakes: title: Failed NLB-target TLS handshakes query: @@ -13,7 +13,7 @@ failedNlbTargetTlsHandshakes: from: LoadBalancerSample where: provider='Nlb' eventId: entityGuid - facet: entityName + eventName: entityName concurrentFlows: title: Avg Concurrent flows query: @@ -21,7 +21,7 @@ concurrentFlows: from: LoadBalancerSample where: provider='Nlb' eventId: entityGuid - facet: entityName + eventName: entityName concurrentTlsFlows: title: Avg Concurrent TLS flows query: @@ -29,5 +29,4 @@ concurrentTlsFlows: from: LoadBalancerSample where: provider='Nlb' eventId: entityGuid - facet: entityName - + eventName: entityName diff --git a/definitions/infra-awsnlbtargetgroup/golden_metrics.yml b/definitions/infra-awsnlbtargetgroup/golden_metrics.yml index 5cb5564ca..570012864 100644 --- a/definitions/infra-awsnlbtargetgroup/golden_metrics.yml +++ b/definitions/infra-awsnlbtargetgroup/golden_metrics.yml @@ -5,7 +5,7 @@ unhealthyHosts: from: LoadBalancerSample where: provider='NlbTargetGroup' eventId: entityGuid - facet: entityName + eventName: entityName healthyHosts: title: Healthy hosts query: @@ -13,4 +13,4 @@ healthyHosts: from: LoadBalancerSample where: provider='NlbTargetGroup' eventId: entityGuid - facet: entityName + eventName: entityName diff --git a/definitions/infra-awsrdsdbcluster/golden_metrics.yml b/definitions/infra-awsrdsdbcluster/golden_metrics.yml index d64785151..4f9e51f24 100644 --- a/definitions/infra-awsrdsdbcluster/golden_metrics.yml +++ b/definitions/infra-awsrdsdbcluster/golden_metrics.yml @@ -4,21 +4,21 @@ readIops: select: average(provider.volumeReadIops.Average) from: DatastoreSample where: provider='RdsDbCluster' - facet: entityName eventId: entityGuid + eventName: entityName writeIops: title: Write IOPS query: select: average(provider.volumeWriteIops.Average) from: DatastoreSample where: provider='RdsDbCluster' - facet: entityName eventId: entityGuid + eventName: entityName usageBytes: title: Usage (bytes) query: select: average(provider.volumeUsedBytes.Average) from: DatastoreSample where: provider='RdsDbCluster' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsrdsdbinstance/golden_metrics.yml b/definitions/infra-awsrdsdbinstance/golden_metrics.yml index a86dc3f75..25f430a25 100644 --- a/definitions/infra-awsrdsdbinstance/golden_metrics.yml +++ b/definitions/infra-awsrdsdbinstance/golden_metrics.yml @@ -4,29 +4,29 @@ readThroughput: select: average(provider.readThroughput.Average) from: DatastoreSample where: provider='RdsDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName writeThroughput: title: Write throughput query: select: average(provider.writeThroughput.Average) from: DatastoreSample where: provider='RdsDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName latencyMs: title: Latency (ms) query: select: average(provider.readLatency.Average + provider.writeLatency.Average) * 1000 from: DatastoreSample where: provider='RdsDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName databaseConnections: title: Database connections query: select: average(provider.databaseConnections.Average) from: DatastoreSample where: provider='RdsDbInstance' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsredshiftcluster/golden_metrics.yml b/definitions/infra-awsredshiftcluster/golden_metrics.yml index 8ea67ad8e..326ad875d 100644 --- a/definitions/infra-awsredshiftcluster/golden_metrics.yml +++ b/definitions/infra-awsredshiftcluster/golden_metrics.yml @@ -4,29 +4,29 @@ CPUUtilization: select: max(`provider.cpuUtilization.Maximum`) from: DatastoreSample where: provider='RedshiftCluster' - facet: entityName eventId: entityGuid + eventName: entityName QueryDuration: title: Max Query Duration query: select: max(`provider.QueryDuration.Maximum`) from: DatastoreSample where: provider='RedshiftCluster' - facet: entityName eventId: entityGuid + eventName: entityName HealthStatus: title: Cluster Health Status query: select: min(`provider.HealthStatus.Minimum`) from: DatastoreSample where: provider='RedshiftCluster' - facet: entityName eventId: entityGuid + eventName: entityName DatabaseConnections: title: Database Connections query: select: max(`provider.DatabaseConnections.Maximum`) from: DatastoreSample where: provider='RedshiftCluster' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsredshiftnode/golden_metrics.yml b/definitions/infra-awsredshiftnode/golden_metrics.yml index 33badb154..55527216b 100644 --- a/definitions/infra-awsredshiftnode/golden_metrics.yml +++ b/definitions/infra-awsredshiftnode/golden_metrics.yml @@ -4,45 +4,45 @@ CPUUtilization: select: max(`provider.cpuUtilization.Maximum`) from: DatastoreSample where: provider='RedshiftNode' - facet: entityName eventId: entityGuid + eventName: entityName DatabaseConnections: title: Database Connections query: select: max(`provider.DatabaseConnections.Maximum`) from: DatastoreSample where: provider='RedshiftNode' - facet: entityName eventId: entityGuid + eventName: entityName ReadLatency: title: Max Read Latency query: select: max(`provider.ReadLatency.Maximum`) from: DatastoreSample where: provider='RedshiftNode' - facet: entityName eventId: entityGuid + eventName: entityName WriteLatency: title: Max Write Latency query: select: max(`provider.WriteLatency.Maximum`) from: DatastoreSample where: provider='RedshiftNode' - facet: entityName eventId: entityGuid + eventName: entityName PercentageDiskSpace: title: Max Percentage disk space used query: select: max(`provider.PercentageDiskSpaceUsed.Maximum`) from: DatastoreSample where: provider='RedshiftNode' - facet: entityName eventId: entityGuid + eventName: entityName HealthStatus: title: Cluster Health Status query: select: min(`provider.HealthStatus.Minimum`) from: DatastoreSample where: provider='RedshiftNode' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awss3bucket/golden_metrics.yml b/definitions/infra-awss3bucket/golden_metrics.yml index 140a319fc..26b284d0c 100644 --- a/definitions/infra-awss3bucket/golden_metrics.yml +++ b/definitions/infra-awss3bucket/golden_metrics.yml @@ -4,8 +4,8 @@ requests: select: sum(`provider.getRequests.Sum`) + sum(`provider.putRequests.Sum`) + sum(`provider.headRequests.Sum`) from: DatastoreSample where: provider='S3BucketRequests' - facet: entityName eventId: entityGuid + eventName: entityName unit: COUNT errors4xxAnd5xx: title: Errors @@ -14,7 +14,7 @@ errors4xxAnd5xx: from: DatastoreSample eventId: entityGuid where: provider='S3BucketRequests' - facet: entityName + eventName: entityName unit: COUNT latency: title: Latency @@ -29,13 +29,13 @@ bytesDownloaded: select: sum(`provider.bytesDownloaded.Sum`) from: DatastoreSample where: provider='S3BucketRequests' - facet: entityName eventId: entityGuid + eventName: entityName bytesUploaded: title: Bytes uploaded query: select: sum(`provider.bytesUploaded.Sum`) from: DatastoreSample where: provider='S3BucketRequests' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awssnstopic/golden_metrics.yml b/definitions/infra-awssnstopic/golden_metrics.yml index e59f9b166..2d0c6ee6f 100644 --- a/definitions/infra-awssnstopic/golden_metrics.yml +++ b/definitions/infra-awssnstopic/golden_metrics.yml @@ -4,21 +4,21 @@ publishedMessages: select: sum(provider.numberOfMessagesPublished.Sum) from: QueueSample where: provider='SnsTopic' - facet: entityName eventId: entityGuid + eventName: entityName deliveredNotifications: title: Delivered notifications query: select: sum(provider.numberOfNotificationsDelivered.Sum) from: QueueSample where: provider='SnsTopic' - facet: entityName eventId: entityGuid + eventName: entityName failedNotifications: title: Failed notifications query: select: sum(provider.numberOfNotificationsFailed.Sum) from: QueueSample where: provider='SnsTopic' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awssqsqueue/golden_metrics.yml b/definitions/infra-awssqsqueue/golden_metrics.yml index f98219826..b489c7063 100644 --- a/definitions/infra-awssqsqueue/golden_metrics.yml +++ b/definitions/infra-awssqsqueue/golden_metrics.yml @@ -4,21 +4,21 @@ receivedMessages: select: sum(provider.numberOfMessagesReceived.Sum) from: QueueSample where: provider='SqsQueue' - facet: entityName eventId: entityGuid + eventName: entityName sentMessages: title: Sent messages query: select: sum(provider.numberOfMessagesSent.Sum) from: QueueSample where: provider='SqsQueue' - facet: entityName eventId: entityGuid + eventName: entityName oldestMessageAgeS: title: Approximate age of oldest message (s) query: select: average(provider.approximateAgeOfOldestMessage.Average) from: QueueSample where: provider='SqsQueue' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-awsstatesstatemachine/golden_metrics.yml b/definitions/infra-awsstatesstatemachine/golden_metrics.yml index 9f2a41384..d64b157c9 100644 --- a/definitions/infra-awsstatesstatemachine/golden_metrics.yml +++ b/definitions/infra-awsstatesstatemachine/golden_metrics.yml @@ -4,29 +4,29 @@ successfulExecutions: select: sum(`provider.executionsSucceeded.Sum`) from: AwsStatesStateMachineSample where: provider='AwsStatesStateMachine' - facet: entityName eventId: entityGuid + eventName: entityName executionTimeMs: title: Execution Time (ms) query: select: average(`provider.executionTime.Average`) from: AwsStatesStateMachineSample where: provider='AwsStatesStateMachine' - facet: entityName eventId: entityGuid + eventName: entityName failedExecutions: title: Failed Executions query: select: sum(`provider.executionsFailed.Sum`) from: AwsStatesStateMachineSample where: provider='AwsStatesStateMachine' - facet: entityName eventId: entityGuid + eventName: entityName errorRatio: title: Error ratio (%) query: select: sum(`provider.executionsFailed.Sum`)/sum(`provider.executionsStarted.Sum`) * 100 from: AwsStatesStateMachineSample where: provider='AwsStatesStateMachine' - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azureapimanagementservice/golden_metrics.yml b/definitions/infra-azureapimanagementservice/golden_metrics.yml index 6803aeffc..f07501315 100644 --- a/definitions/infra-azureapimanagementservice/golden_metrics.yml +++ b/definitions/infra-azureapimanagementservice/golden_metrics.yml @@ -3,19 +3,19 @@ requests: query: select: sum(totalRequests.Total) from: AzureApiManagementServiceSample - facet: entityName eventId: entityGuid + eventName: entityName averageResponseTime: title: Average response time (ms) query: select: average(durationMilliseconds.Average) from: AzureApiManagementServiceSample - facet: entityName eventId: entityGuid + eventName: entityName capacityPercent: title: Capacity (%) query: select: average(capacityPercent.Average) from: AzureApiManagementServiceSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azureapplicationgateway/golden_metrics.yml b/definitions/infra-azureapplicationgateway/golden_metrics.yml index 611ab2eee..98a4d3e89 100644 --- a/definitions/infra-azureapplicationgateway/golden_metrics.yml +++ b/definitions/infra-azureapplicationgateway/golden_metrics.yml @@ -3,54 +3,54 @@ throughputBps: query: select: average(throughputBytesPerSecond.Average) from: AzureApplicationGatewaySample - facet: entityName eventId: entityGuid + eventName: entityName succesfulRequests: title: Succesful requests query: select: sum(totalRequests.Total) from: AzureApplicationGatewaySample - facet: entityName eventId: entityGuid + eventName: entityName failedRequests: title: Failed requests query: select: sum(failedRequests.Total) from: AzureApplicationGatewaySample - facet: entityName eventId: entityGuid + eventName: entityName cpuUtilization: title: CPU utilization (%) query: select: average(cpuUtilizationPercent.Average) from: AzureApplicationGatewaySample - facet: entityName eventId: entityGuid + eventName: entityName outboundTrafficB: title: Outbound traffic (B) query: select: sum(bytesSentBytes.Total) from: AzureApplicationGatewaySample - facet: entityName eventId: entityGuid + eventName: entityName inboundTrafficB: title: Inbound traffic (B) query: select: sum(bytesReceivedBytes.Total) from: AzureApplicationGatewaySample - facet: entityName eventId: entityGuid + eventName: entityName rttMs: title: RTT (ms) query: select: average(clientRttMilliseconds.Average) from: AzureApplicationGatewaySample - facet: entityName eventId: entityGuid + eventName: entityName responseTimeMs: title: Response time (ms) query: select: average(applicationGatewayTotalTimeMilliseconds.Average) from: AzureApplicationGatewaySample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azureappservicewebapp/golden_metrics.yml b/definitions/infra-azureappservicewebapp/golden_metrics.yml index 80ed01328..9c1dd2219 100644 --- a/definitions/infra-azureappservicewebapp/golden_metrics.yml +++ b/definitions/infra-azureappservicewebapp/golden_metrics.yml @@ -3,19 +3,19 @@ requests: query: select: sum(requests.Total) from: AzureAppServiceWebAppSample - facet: entityName eventId: entityGuid + eventName: entityName averageResponseTimeS: title: Response time (s) query: select: average(averageResponseTimeSeconds.Average) from: AzureAppServiceWebAppSample - facet: entityName eventId: entityGuid + eventName: entityName serverErrors5Xx: title: Errors (5xx) query: select: sum(http5xx.Total) from: AzureAppServiceWebAppSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurecontainersinstancegroup/golden_metrics.yml b/definitions/infra-azurecontainersinstancegroup/golden_metrics.yml index 5982292a3..ca09e7e01 100644 --- a/definitions/infra-azurecontainersinstancegroup/golden_metrics.yml +++ b/definitions/infra-azurecontainersinstancegroup/golden_metrics.yml @@ -3,26 +3,26 @@ cpuUsage: query: select: average(cpuUsage.Average) from: AzureContainersInstanceGroupSample - facet: entityName eventId: entityGuid + eventName: entityName memoryUsageBytes: title: Memory usage (bytes) query: select: average(memoryUsageBytes.Average) from: AzureContainersInstanceGroupSample - facet: entityName eventId: entityGuid + eventName: entityName networkBytesReceivedPerSecond: title: Network bytes received per second query: select: average(networkReceivedBytesPerSecond.Average) from: AzureContainersInstanceGroupSample - facet: entityName eventId: entityGuid + eventName: entityName networkBytesTransmittedPerSecond: title: Network bytes transmitted per second query: select: average(networkTransmittedBytesPerSecond.Average) from: AzureContainersInstanceGroupSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurecontainersmanagedcluster/golden_metrics.yml b/definitions/infra-azurecontainersmanagedcluster/golden_metrics.yml index cde3b51f3..ee37e1f82 100644 --- a/definitions/infra-azurecontainersmanagedcluster/golden_metrics.yml +++ b/definitions/infra-azurecontainersmanagedcluster/golden_metrics.yml @@ -3,19 +3,19 @@ availableCpuCores: query: select: sum(kubeNodeStatusAllocatableCpuCores.Total) from: AzureContainersManagedClusterSample - facet: entityName eventId: entityGuid + eventName: entityName availableMemoryBytes: title: Available memory (bytes) query: select: sum(kubeNodeStatusAllocatableMemoryBytes.Total) from: AzureContainersManagedClusterSample - facet: entityName eventId: entityGuid + eventName: entityName podsInReadyState: title: Pods in Ready state query: select: sum(kubePodStatusReady.Total) from: AzureContainersManagedClusterSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurecontainersregistry/golden_metrics.yml b/definitions/infra-azurecontainersregistry/golden_metrics.yml index c8de33a1d..04d1ae5ba 100644 --- a/definitions/infra-azurecontainersregistry/golden_metrics.yml +++ b/definitions/infra-azurecontainersregistry/golden_metrics.yml @@ -3,12 +3,12 @@ imagePulls: query: select: sum(totalPullCount.Total) from: AzureContainersRegistrySample - facet: entityName eventId: entityGuid + eventName: entityName imagePushes: title: Image Pushes query: select: sum(totalPushCount.Total) from: AzureContainersRegistrySample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurecosmosdbaccount/golden_metrics.yml b/definitions/infra-azurecosmosdbaccount/golden_metrics.yml index 6339e55c1..eede5b946 100644 --- a/definitions/infra-azurecosmosdbaccount/golden_metrics.yml +++ b/definitions/infra-azurecosmosdbaccount/golden_metrics.yml @@ -3,19 +3,19 @@ requests: eventId: entityGuid select: sum(`totalRequests.Total`) from: AzureCosmosDbAccountSample - facet: entityName + eventName: entityName title: Requests serviceAvailability: query: eventId: entityGuid select: max(`serviceAvailabilityPercent.Maximum`) from: AzureCosmosDbAccountSample - facet: entityName + eventName: entityName title: Service availability (%) documents: query: eventId: entityGuid select: sum(`documentCount.Total`) from: AzureCosmosDbAccountSample - facet: entityName + eventName: entityName title: Documents diff --git a/definitions/infra-azurecosmosdbcollection/golden_metrics.yml b/definitions/infra-azurecosmosdbcollection/golden_metrics.yml index 2ff141a56..755d3c82f 100644 --- a/definitions/infra-azurecosmosdbcollection/golden_metrics.yml +++ b/definitions/infra-azurecosmosdbcollection/golden_metrics.yml @@ -3,19 +3,19 @@ requests: eventId: entityGuid select: sum(`totalRequests.Total`) from: AzureCosmosDbCollectionSample - facet: entityName + eventName: entityName title: Requests dataUsage: query: eventId: entityGuid select: sum(`dataUsageBytes.Total`) from: AzureCosmosDbCollectionSample - facet: entityName + eventName: entityName title: Data usage (bytes) documents: query: eventId: entityGuid select: sum(`documentCount.Total`) from: AzureCosmosDbCollectionSample - facet: entityName + eventName: entityName title: Documents diff --git a/definitions/infra-azurecosmosdbdatabase/golden_metrics.yml b/definitions/infra-azurecosmosdbdatabase/golden_metrics.yml index 8213ea8a0..5ad0d4092 100644 --- a/definitions/infra-azurecosmosdbdatabase/golden_metrics.yml +++ b/definitions/infra-azurecosmosdbdatabase/golden_metrics.yml @@ -3,19 +3,19 @@ requests: eventId: entityGuid select: sum(`totalRequests.Total`) from: AzureCosmosDbDatabaseSample - facet: entityName + eventName: entityName title: Requests dataUsage: query: eventId: entityGuid select: sum(`dataUsageBytes.Total`) from: AzureCosmosDbDatabaseSample - facet: entityName + eventName: entityName title: Data usage (bytes) documents: query: eventId: entityGuid select: sum(`documentCount.Total`) from: AzureCosmosDbDatabaseSample - facet: entityName + eventName: entityName title: Documents diff --git a/definitions/infra-azuredatafactorydatafactory/golden_metrics.yml b/definitions/infra-azuredatafactorydatafactory/golden_metrics.yml index 441db7d07..2a6f88dcf 100644 --- a/definitions/infra-azuredatafactorydatafactory/golden_metrics.yml +++ b/definitions/infra-azuredatafactorydatafactory/golden_metrics.yml @@ -3,19 +3,19 @@ failedRuns: query: select: sum(failedRuns.Total) from: AzureDataFactoryDataFactorySample - facet: entityName eventId: entityGuid + eventName: entityName successfulRuns: title: Successful runs query: select: sum(successfulRuns.Total) from: AzureDataFactoryDataFactorySample - facet: entityName eventId: entityGuid + eventName: entityName runtimeCpuUtilization: title: Runtime CPU utilization (%) query: select: average(integrationRuntimeCpuPercentagePercent.Average) from: AzureDataFactoryDataFactorySample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azureeventhubcluster/golden_metrics.yml b/definitions/infra-azureeventhubcluster/golden_metrics.yml index 706af0029..62a17c1f7 100644 --- a/definitions/infra-azureeventhubcluster/golden_metrics.yml +++ b/definitions/infra-azureeventhubcluster/golden_metrics.yml @@ -3,19 +3,19 @@ successfulRequests: query: select: sum(successfulRequests.Total) from: AzureEventHubClusterSample - facet: entityName eventId: entityGuid + eventName: entityName throttledRequests: title: Throttled requests query: select: sum(throttledRequests.Total) from: AzureEventHubClusterSample - facet: entityName eventId: entityGuid + eventName: entityName errorsServerAndUser: title: Errors (server and user) query: select: sum(serverErrors.Total) + sum(userErrors.Total) from: AzureEventHubClusterSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azureeventhubnamespace/golden_metrics.yml b/definitions/infra-azureeventhubnamespace/golden_metrics.yml index 95d0f4423..a41714b20 100644 --- a/definitions/infra-azureeventhubnamespace/golden_metrics.yml +++ b/definitions/infra-azureeventhubnamespace/golden_metrics.yml @@ -3,19 +3,19 @@ successfulRequests: query: select: sum(successfulRequests.Total) from: AzureEventHubNamespace - facet: entityName eventId: entityGuid + eventName: entityName throttledRequests: title: Throttled requests query: select: sum(throttledRequests.Total) from: AzureEventHubNamespace - facet: entityName eventId: entityGuid + eventName: entityName errorsServerAndUser: title: Errors (server and user) query: select: sum(serverErrors.Total) + sum(userErrors.Total) from: AzureEventHubNamespace - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurefirewall/golden_metrics.yml b/definitions/infra-azurefirewall/golden_metrics.yml index 7eacb3093..1032e3bc7 100644 --- a/definitions/infra-azurefirewall/golden_metrics.yml +++ b/definitions/infra-azurefirewall/golden_metrics.yml @@ -3,26 +3,26 @@ applicationRulesHits: query: select: average(applicationRuleHit) from: AzureFirewallSample - facet: entityName eventId: entityGuid + eventName: entityName networkRulesHits: title: Network rules hits query: select: average(networkRuleHit) from: AzureFirewallSample - facet: entityName eventId: entityGuid + eventName: entityName dataProcessedB: title: Data processed (B) query: select: average(dataProcessedBytes) from: AzureFirewallSample - facet: entityName eventId: entityGuid + eventName: entityName throughputBps: title: Throughput (bps) query: select: average(throughputBitsPerSecond) from: AzureFirewallSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurefrontdoorfrontdoor/golden_metrics.yml b/definitions/infra-azurefrontdoorfrontdoor/golden_metrics.yml index 068c3998e..d3669bb92 100644 --- a/definitions/infra-azurefrontdoorfrontdoor/golden_metrics.yml +++ b/definitions/infra-azurefrontdoorfrontdoor/golden_metrics.yml @@ -3,19 +3,19 @@ requestSizeBytes: query: select: sum(requestSizeBytes.Total) from: AzureFrontDoorFrontDoorSample - facet: entityName eventId: entityGuid + eventName: entityName responseSizeBytes: title: Response size (bytes) query: select: sum(responseSizeBytes.Total) from: AzureFrontDoorFrontDoorSample - facet: entityName eventId: entityGuid + eventName: entityName latencyMs: title: Latency (ms) query: select: sum(totalLatencyMilliseconds.Total) from: AzureFrontDoorFrontDoorSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurefunctionsapp/golden_metrics.yml b/definitions/infra-azurefunctionsapp/golden_metrics.yml index 8ef471277..9000f7a6a 100644 --- a/definitions/infra-azurefunctionsapp/golden_metrics.yml +++ b/definitions/infra-azurefunctionsapp/golden_metrics.yml @@ -3,26 +3,26 @@ functionExecutionCount: query: select: sum(functionExecutionCount.Total) from: AzureFunctionsAppSample - facet: entityName eventId: entityGuid + eventName: entityName errors: title: Errors query: select: sum(`http5xx.Total`) from: AzureFunctionsAppSample - facet: entityName eventId: entityGuid + eventName: entityName averageResponseTimeS: title: Average response time (s) query: select: sum(functionExecutionUnits.Total) from: AzureFunctionsAppSample - facet: entityName eventId: entityGuid + eventName: entityName averageMemoryWorkingSetBytes: title: Average memory working set (Bytes) query: select: average(averageMemoryWorkingSetBytes.Average) from: AzureFunctionsAppSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurekeyvaultvault/golden_metrics.yml b/definitions/infra-azurekeyvaultvault/golden_metrics.yml index 10028ffb5..ff6b4ff19 100644 --- a/definitions/infra-azurekeyvaultvault/golden_metrics.yml +++ b/definitions/infra-azurekeyvaultvault/golden_metrics.yml @@ -3,33 +3,33 @@ serviceApiHits: query: select: average(serviceApiHit) from: AzureKeyVaultVaultSample - facet: entityName eventId: entityGuid + eventName: entityName serviceApiLatencyMs: title: Service API latency (ms) query: select: average(serviceApiLatencyMilliseconds) from: AzureKeyVaultVaultSample - facet: entityName eventId: entityGuid + eventName: entityName serviceApiResults: title: Service API results query: select: average(serviceApiResult) from: AzureKeyVaultVaultSample - facet: entityName eventId: entityGuid + eventName: entityName vaultCapacityUsed: title: Vault capacity used query: select: average(saturationShoeboxPercent) from: AzureKeyVaultVaultSample - facet: entityName eventId: entityGuid + eventName: entityName vaultRequestsAvailability: title: Vault requests availability query: select: average(availabilityPercent) from: AzureKeyVaultVaultSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azureloadbalancer/golden_metrics.yml b/definitions/infra-azureloadbalancer/golden_metrics.yml index 019e028e3..80a85d7e2 100644 --- a/definitions/infra-azureloadbalancer/golden_metrics.yml +++ b/definitions/infra-azureloadbalancer/golden_metrics.yml @@ -3,19 +3,19 @@ availability: query: select: average(dipAvailability.Average) from: AzureLoadBalancerSample - facet: entityName eventId: entityGuid + eventName: entityName bytesTransmitted: title: Bytes transmitted query: select: sum(byteCount.Total) from: AzureLoadBalancerSample - facet: entityName eventId: entityGuid + eventName: entityName packetsTransmitted: title: Packets transmitted query: select: sum(packetCount.Total) from: AzureLoadBalancerSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurelogicappsintegrationserviceenvironment/golden_metrics.yml b/definitions/infra-azurelogicappsintegrationserviceenvironment/golden_metrics.yml index 082877bf9..040b8c5a4 100644 --- a/definitions/infra-azurelogicappsintegrationserviceenvironment/golden_metrics.yml +++ b/definitions/infra-azurelogicappsintegrationserviceenvironment/golden_metrics.yml @@ -3,19 +3,19 @@ workflowRunsCompleted: query: select: sum(runsCompleted.Total) from: AzureLogicAppsIntegrationServiceEnvironmentSample - facet: entityName eventId: entityGuid + eventName: entityName workflowActionsCompleted: title: Workflow actions completed query: select: sum(actionsCompleted.Total) from: AzureLogicAppsIntegrationServiceEnvironmentSample - facet: entityName eventId: entityGuid + eventName: entityName workflowTriggersCompleted: title: Workflow triggers completed query: select: sum(triggersCompleted.Total) from: AzureLogicAppsIntegrationServiceEnvironmentSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurelogicappsworkflow/golden_metrics.yml b/definitions/infra-azurelogicappsworkflow/golden_metrics.yml index bb1053a6a..515890176 100644 --- a/definitions/infra-azurelogicappsworkflow/golden_metrics.yml +++ b/definitions/infra-azurelogicappsworkflow/golden_metrics.yml @@ -3,19 +3,19 @@ workflowRunsCompleted: query: select: sum(runsCompleted.Total) from: AzureLogicAppsWorkflowSample - facet: entityName eventId: entityGuid + eventName: entityName workflowActionsCompleted: title: Workflow actions completed query: select: sum(actionsCompleted.Total) from: AzureLogicAppsWorkflowSample - facet: entityName eventId: entityGuid + eventName: entityName workflowTriggersCompleted: title: Workflow triggers completed query: select: sum(triggersCompleted.Total) from: AzureLogicAppsWorkflowSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azuremariadbserver/golden_metrics.yml b/definitions/infra-azuremariadbserver/golden_metrics.yml index 81d73e01b..89c2c10b2 100644 --- a/definitions/infra-azuremariadbserver/golden_metrics.yml +++ b/definitions/infra-azuremariadbserver/golden_metrics.yml @@ -2,20 +2,20 @@ cpu: query: select: average(`cpuPercent.Average`) from: AzureMariaDbServerSample - facet: entityName eventId: entityGuid + eventName: entityName title: CPU usage memory: query: select: average(`memoryPercent.Average`) from: AzureMariaDbServerSample - facet: entityName eventId: entityGuid + eventName: entityName title: Memory usage storage: query: select: average(`storagePercent.Average`) from: AzureMariaDbServerSample - facet: entityName eventId: entityGuid + eventName: entityName title: Storage usage diff --git a/definitions/infra-azuremysqlserver/golden_metrics.yml b/definitions/infra-azuremysqlserver/golden_metrics.yml index 867f26d92..9b22bac8e 100644 --- a/definitions/infra-azuremysqlserver/golden_metrics.yml +++ b/definitions/infra-azuremysqlserver/golden_metrics.yml @@ -3,19 +3,19 @@ cpu: query: select: average(cpuPercent.Average) from: AzureMySqlServerSample - facet: entityName eventId: entityGuid + eventName: entityName memory: title: Memory (%) query: select: average(memoryPercent.Average) from: AzureMySqlServerSample - facet: entityName eventId: entityGuid + eventName: entityName storage: title: Storage (%) query: select: average(storagePercent.Average) from: AzureMySqlServerSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurepostgresqlserver/golden_metrics.yml b/definitions/infra-azurepostgresqlserver/golden_metrics.yml index 8db8baaa0..48917b7a6 100644 --- a/definitions/infra-azurepostgresqlserver/golden_metrics.yml +++ b/definitions/infra-azurepostgresqlserver/golden_metrics.yml @@ -3,19 +3,19 @@ cpu: query: select: average(cpuPercent.Average) from: AzurePostgreSqlServerSample - facet: entityName eventId: entityGuid + eventName: entityName memory: title: Memory (%) query: select: average(memoryPercent.Average) from: AzurePostgreSqlServerSample - facet: entityName eventId: entityGuid + eventName: entityName storageUsed: title: Storage used (%) query: select: average(storagePercent.Average) from: AzurePostgreSqlServerSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurepowerbidedicatedcapacity/golden_metrics.yml b/definitions/infra-azurepowerbidedicatedcapacity/golden_metrics.yml index f05450b46..3ed10a6aa 100644 --- a/definitions/infra-azurepowerbidedicatedcapacity/golden_metrics.yml +++ b/definitions/infra-azurepowerbidedicatedcapacity/golden_metrics.yml @@ -3,26 +3,26 @@ daxQueryDurationInLastIntervalMs: query: select: average(queryDurationMilliseconds) from: AzurePowerBIDedicatedCapacitySample - facet: entityName eventId: entityGuid + eventName: entityName numberOfJobsInTheQueueOfTheQueryThreadPool: title: Number of jobs in the queue of the query thread pool query: select: average(queryPoolJobQueueLength) from: AzurePowerBIDedicatedCapacitySample - facet: entityName eventId: entityGuid + eventName: entityName qpuHighUtilizationInLastMinute: title: QPU High Utilization In Last Minute query: select: average(qpuHighUtilizationMetric) from: AzurePowerBIDedicatedCapacitySample - facet: entityName eventId: entityGuid + eventName: entityName memoryBytes: title: Memory (bytes) query: select: average(memoryMetricBytes) from: AzurePowerBIDedicatedCapacitySample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azureservicebusnamespace/golden_metrics.yml b/definitions/infra-azureservicebusnamespace/golden_metrics.yml index 1903394bb..f473f3d33 100644 --- a/definitions/infra-azureservicebusnamespace/golden_metrics.yml +++ b/definitions/infra-azureservicebusnamespace/golden_metrics.yml @@ -3,48 +3,48 @@ incomingRequests: query: select: sum(incomingRequests.Total) from: AzureServiceBusNamespaceSample - facet: entityName eventId: entityGuid + eventName: entityName successfulRequests: title: Successful requests query: select: sum(successfulRequests.Total) from: AzureServiceBusNamespaceSample - facet: entityName eventId: entityGuid + eventName: entityName throttledRequests: title: Throttled requests query: select: sum(throttledRequests.Total) from: AzureServiceBusNamespaceSample - facet: entityName eventId: entityGuid + eventName: entityName userAndServerErrors: title: User and server errors query: select: sum(userErrors.Total) + sum(serverErrors.Total) from: AzureServiceBusNamespaceSample - facet: entityName eventId: entityGuid + eventName: entityName activeConnections: title: Active connections query: select: sum(activeConnections.Total) from: AzureServiceBusNamespaceSample - facet: entityName eventId: entityGuid + eventName: entityName connectionsOpened: title: Connections opened query: select: sum(connectionsOpened.Total) from: AzureServiceBusNamespaceSample - facet: entityName eventId: entityGuid + eventName: entityName connectionsClosed: title: Connections closed query: select: sum(connectionsClosed.Total) from: AzureServiceBusNamespaceSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azuresqldatabase/golden_metrics.yml b/definitions/infra-azuresqldatabase/golden_metrics.yml index 11cfa3a27..82fbc0fd3 100644 --- a/definitions/infra-azuresqldatabase/golden_metrics.yml +++ b/definitions/infra-azuresqldatabase/golden_metrics.yml @@ -3,33 +3,33 @@ storageUsagePercent: query: select: max(storagePercent.Maximum) from: AzureSqlDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName cpu: title: CPU (%) query: select: average(cpuPercent.Average) from: AzureSqlDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName successfulConnections: title: Successful connections query: select: sum(connectionSuccessful.Total) from: AzureSqlDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName failedConnections: title: Failed connections query: select: sum(connectionFailed.Total) from: AzureSqlDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName deadlocks: title: Deadlocks query: select: sum(deadlock.Total) from: AzureSqlDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azuresqlmanagedinstance/golden_metrics.yml b/definitions/infra-azuresqlmanagedinstance/golden_metrics.yml index a5aecc45a..152d9da78 100644 --- a/definitions/infra-azuresqlmanagedinstance/golden_metrics.yml +++ b/definitions/infra-azuresqlmanagedinstance/golden_metrics.yml @@ -3,19 +3,19 @@ averageCpu: query: select: average(avgCpuPercent.Average) from: AzureSqlManagedInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName storageSpaceUsedMb: title: Storage space used (MB) query: select: sum(storageSpaceUsed.Total) from: AzureSqlManagedInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName totalIoRequests: title: Total IO requests query: select: sum(ioRequests.Total) from: AzureSqlManagedInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurestorageaccount/golden_metrics.yml b/definitions/infra-azurestorageaccount/golden_metrics.yml index 93aa60675..1bdbbe626 100644 --- a/definitions/infra-azurestorageaccount/golden_metrics.yml +++ b/definitions/infra-azurestorageaccount/golden_metrics.yml @@ -3,19 +3,19 @@ transactions: query: select: sum(transactions.Total) from: AzureStorageAccountSample - facet: entityName eventId: entityGuid + eventName: entityName availabilityPercent: title: Availability query: select: average(availabilityPercent.Average) from: AzureStorageAccountSample - facet: entityName eventId: entityGuid + eventName: entityName successE2ELatencyMilliseconds: title: Success E2E Latency (ms) query: select: average(successE2ELatencyMilliseconds.Average) from: AzureStorageAccountSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-azurevirtualmachinescaleset/golden_metrics.yml b/definitions/infra-azurevirtualmachinescaleset/golden_metrics.yml index bab062d8e..4ca29a728 100644 --- a/definitions/infra-azurevirtualmachinescaleset/golden_metrics.yml +++ b/definitions/infra-azurevirtualmachinescaleset/golden_metrics.yml @@ -3,19 +3,19 @@ cpuPercent: query: select: average(cpuPercent.Average) from: AzureVirtualMachineScaleSetSample - facet: entityName eventId: entityGuid + eventName: entityName networkInTotal: title: Incoming traffic (bytes) query: select: average(networkInTotalBytes.Average) from: AzureVirtualMachineScaleSetSample - facet: entityName eventId: entityGuid + eventName: entityName networkOutTotal: title: Outgoing traffic (bytes) query: select: average(networkOutTotalBytes.Average) from: AzureVirtualMachineScaleSetSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-cassandranode/golden_metrics.yml b/definitions/infra-cassandranode/golden_metrics.yml index f3afeeb3d..f040b488a 100644 --- a/definitions/infra-cassandranode/golden_metrics.yml +++ b/definitions/infra-cassandranode/golden_metrics.yml @@ -3,15 +3,15 @@ readRequestsPerSecond: query: select: average(query.readRequestsPerSecond) from: CassandraSample - facet: entityName eventId: entityGuid + eventName: entityName writeRequestsPerSecond: title: Write requests per second query: select: average(query.writeRequestsPerSecond) from: CassandraSample - facet: entityName eventId: entityGuid + eventName: entityName droppedMessagesPerSecond: title: Dropped messages per second query: @@ -21,12 +21,12 @@ droppedMessagesPerSecond: OR 0)+(db.droppedReadRepairMessagesPerSecond OR 0)+(db.droppedRequestResponseMessagesPerSecond OR 0)+(db.droppedTraceMessagesPerSecond OR 0)) from: CassandraSample - facet: entityName eventId: entityGuid + eventName: entityName readLatency99Percentile: title: Read Latency (99 percentile) query: select: average(query.readLatency99thPercentileMilliseconds) from: CassandraSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-elasticsearchnode/golden_metrics.yml b/definitions/infra-elasticsearchnode/golden_metrics.yml index 1be05ef08..fcb3906bd 100644 --- a/definitions/infra-elasticsearchnode/golden_metrics.yml +++ b/definitions/infra-elasticsearchnode/golden_metrics.yml @@ -3,19 +3,19 @@ activeSearches: query: select: sum(activeSearches) from: ElasticsearchNodeSample - facet: entityName eventId: entityGuid + eventName: entityName missingDocumentRequests: title: Missing Document Requests query: select: sum(get.requestsDocumentMissing) from: ElasticsearchNodeSample - facet: entityName eventId: entityGuid + eventName: entityName fileStoreIOOperations: title: File Store I/O Operations query: select: sum(fs.iOOperations) from: ElasticsearchNodeSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-etcd_cluster/definition.yml b/definitions/infra-etcd_cluster/definition.yml index 5528c2d4e..a05ffd86f 100644 --- a/definitions/infra-etcd_cluster/definition.yml +++ b/definitions/infra-etcd_cluster/definition.yml @@ -15,7 +15,8 @@ synthesis: label.kubernetes.io/hostname: label.kubernetes.io/os: dashboardTemplates: -- dashboard.json + newRelic: + template: dashboard.json goldenTags: - label.kubernetes.io/os compositeMetrics: diff --git a/definitions/infra-f5pool/golden_metrics.yml b/definitions/infra-f5pool/golden_metrics.yml index 62a7ac5da..6ea42500d 100644 --- a/definitions/infra-f5pool/golden_metrics.yml +++ b/definitions/infra-f5pool/golden_metrics.yml @@ -3,26 +3,26 @@ requestsPerSecond: query: select: average(pool.requestsPerSecond) from: F5BigIpPoolSample - facet: entityName eventId: entityGuid + eventName: entityName connections: title: Connections query: select: average(pool.connections) from: F5BigIpPoolSample - facet: entityName eventId: entityGuid + eventName: entityName packetsReceivedPerSecond: title: Packets received per second query: select: average(pool.packetsReceivedPerSecond) from: F5BigIpPoolSample - facet: entityName eventId: entityGuid + eventName: entityName packetsSentPerSecond: title: Packets sent per second query: select: average(pool.packetsSentPerSecond) from: F5BigIpPoolSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-f5poolmember/golden_metrics.yml b/definitions/infra-f5poolmember/golden_metrics.yml index 0450b85e4..d7bec6701 100644 --- a/definitions/infra-f5poolmember/golden_metrics.yml +++ b/definitions/infra-f5poolmember/golden_metrics.yml @@ -3,26 +3,26 @@ connections: query: select: average(member.connections) from: F5BigIpPoolMemberSample - facet: entityName eventId: entityGuid + eventName: entityName sessions: title: Sessions query: select: average(member.sessions) from: F5BigIpPoolMemberSample - facet: entityName eventId: entityGuid + eventName: entityName packetsReceivedPerSecond: title: Packets received per second query: select: average(member.packetsReceivedPerSecond) from: F5BigIpPoolMemberSample - facet: entityName eventId: entityGuid + eventName: entityName packetsSentPerSecond: title: Packets sent per second query: select: average(member.packetsSentPerSecond) from: F5BigIpPoolMemberSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-f5virtualserver/golden_metrics.yml b/definitions/infra-f5virtualserver/golden_metrics.yml index a221ded9c..6adb74990 100644 --- a/definitions/infra-f5virtualserver/golden_metrics.yml +++ b/definitions/infra-f5virtualserver/golden_metrics.yml @@ -3,26 +3,26 @@ requestsPerSecond: query: select: average(virtualserver.requestsPerSecond) from: F5BigIpVirtualServerSample - facet: entityName eventId: entityGuid + eventName: entityName connections: title: Connections query: select: latest(virtualserver.connections) from: F5BigIpVirtualServerSample - facet: entityName eventId: entityGuid + eventName: entityName bytesPerSecondIn: title: Bytes per second in query: select: average(virtualserver.inDataInBytesPerSecond) from: F5BigIpVirtualServerSample - facet: entityName eventId: entityGuid + eventName: entityName bytesPerSecondOut: title: Bytes per second out query: select: average(virtualserver.outDataInBytesPerSecond) from: F5BigIpVirtualServerSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpappengineservice/golden_metrics.yml b/definitions/infra-gcpappengineservice/golden_metrics.yml index a9f72e88c..74b9c1ba2 100644 --- a/definitions/infra-gcpappengineservice/golden_metrics.yml +++ b/definitions/infra-gcpappengineservice/golden_metrics.yml @@ -3,26 +3,26 @@ Instances: query: select: max(`system.Instances`) from: GcpAppEngineServiceSample - facet: entityName eventId: entityGuid + eventName: entityName Responses: title: Number of http responses query: select: sum(`server.Responses`) from: GcpAppEngineServiceSample - facet: entityName eventId: entityGuid + eventName: entityName ErrorRate: title: Error rate query: select: filter(sum(`server.Responses`), WHERE response_code NOT LIKE '2%') * 100 from: GcpAppEngineServiceSample - facet: entityName eventId: entityGuid + eventName: entityName latency: title: Latency query: select: (average(`server.ResponseLatenciesMilliseconds`)) / 1000 from: GcpAppEngineServiceSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpbigquerydataset/golden_metrics.yml b/definitions/infra-gcpbigquerydataset/golden_metrics.yml index 76cb635c4..dbff2331d 100644 --- a/definitions/infra-gcpbigquerydataset/golden_metrics.yml +++ b/definitions/infra-gcpbigquerydataset/golden_metrics.yml @@ -3,12 +3,12 @@ storedBytes: query: select: sum(`storage.StoredBytes`) from: GcpBigQueryDatasetSample - facet: entityName eventId: entityGuid + eventName: entityName tables: title: Number of Tables query: select: sum(`storage.Tables`) from: GcpBigQueryDatasetSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpbigquerytable/golden_metrics.yml b/definitions/infra-gcpbigquerytable/golden_metrics.yml index 358ef191a..7ebb58e6e 100644 --- a/definitions/infra-gcpbigquerytable/golden_metrics.yml +++ b/definitions/infra-gcpbigquerytable/golden_metrics.yml @@ -3,12 +3,12 @@ uploadedBytes: query: select: sum(`storage.UploadedBytes`) from: GcpBigQueryTableSample - facet: entityName eventId: entityGuid + eventName: entityName uploadedRows: title: Uploaded Rows query: select: sum(`storage.UploadedRowCount`) from: GcpBigQueryTableSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpbigtablecluster/golden_metrics.yml b/definitions/infra-gcpbigtablecluster/golden_metrics.yml index f1dcccabc..dff801744 100644 --- a/definitions/infra-gcpbigtablecluster/golden_metrics.yml +++ b/definitions/infra-gcpbigtablecluster/golden_metrics.yml @@ -3,26 +3,26 @@ cpuLoad: query: select: average(cluster.CpuLoad) from: GcpBigtableClusterSample - facet: entityName eventId: entityGuid + eventName: entityName cpuLoadOfBusiestNode: title: CPU load of busiest node (%) query: select: average(cluster.CpuLoadHottestNode) from: GcpBigtableClusterSample - facet: entityName eventId: entityGuid + eventName: entityName utilizationOfHddDisks: title: Utilization of HDD disks (%) query: select: average(cluster.DiskLoad) from: GcpBigtableClusterSample - facet: entityName eventId: entityGuid + eventName: entityName storageUsed: title: Storage used (%) query: select: average(cluster.StorageUtilization) from: GcpBigtableClusterSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpbigtabletable/golden_metrics.yml b/definitions/infra-gcpbigtabletable/golden_metrics.yml index 4598a247e..0a20c163d 100644 --- a/definitions/infra-gcpbigtabletable/golden_metrics.yml +++ b/definitions/infra-gcpbigtabletable/golden_metrics.yml @@ -3,26 +3,26 @@ replicationRequestLatenciesMs: query: select: average(replication.Latency) from: GcpBigtableTableSample - facet: entityName eventId: entityGuid + eventName: entityName serverRequestsFailed: title: Server requests failed query: select: average(server.Error) from: GcpBigtableTableSample - facet: entityName eventId: entityGuid + eventName: entityName serverRequests: title: Server requests query: select: average(server.Request) from: GcpBigtableTableSample - facet: entityName eventId: entityGuid + eventName: entityName uncompressedBytesOfResponseData: title: Uncompressed bytes of response data query: select: average(server.SentBytes) from: GcpBigtableTableSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpcloudcomposerenvironment/golden_metrics.yml b/definitions/infra-gcpcloudcomposerenvironment/golden_metrics.yml index d07b42fdb..75a82cee7 100644 --- a/definitions/infra-gcpcloudcomposerenvironment/golden_metrics.yml +++ b/definitions/infra-gcpcloudcomposerenvironment/golden_metrics.yml @@ -3,26 +3,26 @@ databaseCpuUtilization: query: select: average(environment.database.cpu.Utilization) * 100 from: GcpComposerEnvironmentSample - facet: entityName eventId: entityGuid + eventName: entityName databaseMemoryUtilization: title: Database Memory utilization (%) query: select: average(environment.database.memory.Utilization) * 100 from: GcpComposerEnvironmentSample - facet: entityName eventId: entityGuid + eventName: entityName runningTasks: title: Running tasks query: select: average(environment.executor.RunningTasks) from: GcpComposerEnvironmentSample - facet: entityName eventId: entityGuid + eventName: entityName tasksInQueue: title: Tasks in queue query: select: average(environment.TaskQueueLength) from: GcpComposerEnvironmentSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpcloudcomposerworkflow/golden_metrics.yml b/definitions/infra-gcpcloudcomposerworkflow/golden_metrics.yml index 2aaa28d6b..f24a961a0 100644 --- a/definitions/infra-gcpcloudcomposerworkflow/golden_metrics.yml +++ b/definitions/infra-gcpcloudcomposerworkflow/golden_metrics.yml @@ -3,26 +3,26 @@ workflowRunsCompleted: query: select: average(workflow.Run) from: GcpComposerWorkflowSample - facet: entityName eventId: entityGuid + eventName: entityName workflowRunDurationS: title: Workflow run duration (s) query: select: average(workflow.RunDuration) from: GcpComposerWorkflowSample - facet: entityName eventId: entityGuid + eventName: entityName workflowTasksCompleted: title: Workflow tasks completed query: select: average(workflow.task.Run) from: GcpComposerWorkflowSample - facet: entityName eventId: entityGuid + eventName: entityName workflowTaskDurationS: title: Workflow task duration (s) query: select: average(workflow.task.RunDuration) from: GcpComposerWorkflowSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpcloudfunction/golden_metrics.yml b/definitions/infra-gcpcloudfunction/golden_metrics.yml index 021e44e5a..1ce171fb5 100644 --- a/definitions/infra-gcpcloudfunction/golden_metrics.yml +++ b/definitions/infra-gcpcloudfunction/golden_metrics.yml @@ -3,19 +3,19 @@ Executions: query: select: sum(`api.Requests`) from: GcpCloudFunctionSample - facet: entityName eventId: entityGuid + eventName: entityName ErrorRate: title: Error rate query: select: filter(sum(`function.Executions`), WHERE status != 'ok') * 100 / sum(`function.Executions`) from: GcpCloudFunctionSample - facet: entityName eventId: entityGuid + eventName: entityName latency: title: Latency query: select: (average(`function.ExecutionTimeNanos`)) / 1000000000 from: GcpCloudFunctionSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpcloudsql/golden_metrics.yml b/definitions/infra-gcpcloudsql/golden_metrics.yml index 4a1850006..d59269240 100644 --- a/definitions/infra-gcpcloudsql/golden_metrics.yml +++ b/definitions/infra-gcpcloudsql/golden_metrics.yml @@ -3,26 +3,26 @@ cpu: query: select: max(database.cpu.Utilization) * 100 from: GcpCloudSqlSample - facet: entityName eventId: entityGuid + eventName: entityName memory: title: Memory (%) query: select: max(database.memory.Utilization) * 100 from: GcpCloudSqlSample - facet: entityName eventId: entityGuid + eventName: entityName disk: title: Disk (%) query: select: max(database.disk.Utilization) * 100 from: GcpCloudSqlSample - facet: entityName eventId: entityGuid + eventName: entityName uptime: title: Uptime (%) query: select: latest(database.Uptime) * 100 / 60 from: GcpCloudSqlSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcphttploadbalancer/golden_metrics.yml b/definitions/infra-gcphttploadbalancer/golden_metrics.yml index d3c3d7754..0d7eb48f4 100644 --- a/definitions/infra-gcphttploadbalancer/golden_metrics.yml +++ b/definitions/infra-gcphttploadbalancer/golden_metrics.yml @@ -3,12 +3,12 @@ requestsRate: query: select: (rate(sum(`https.Requests`), 1 minute)) / 60 from: GcpHttpLoadBalancerSample - facet: entityName eventId: entityGuid + eventName: entityName totalLatencyMs: title: Total Latency query: select: (average(`https.TotalLatencies`)) / 1000 from: GcpHttpLoadBalancerSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpinternalloadbalancer/golden_metrics.yml b/definitions/infra-gcpinternalloadbalancer/golden_metrics.yml index 727e503c1..896dc4584 100644 --- a/definitions/infra-gcpinternalloadbalancer/golden_metrics.yml +++ b/definitions/infra-gcpinternalloadbalancer/golden_metrics.yml @@ -3,19 +3,19 @@ Sent: query: select: sum(`l3.internal.EgressBytes`) from: GcpInternalLoadBalancerSample - facet: entityName eventId: entityGuid + eventName: entityName Received: title: Received bytes query: select: sum(`l3.internal.IngressBytes`) from: GcpInternalLoadBalancerSample - facet: entityName eventId: entityGuid + eventName: entityName latency: title: Latency query: select: average(`l3.internal.RttLatencies`) / 1000 from: GcpInternalLoadBalancerSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpmemcachememcachenode/golden_metrics.yml b/definitions/infra-gcpmemcachememcachenode/golden_metrics.yml index 223f1721e..239ec775e 100644 --- a/definitions/infra-gcpmemcachememcachenode/golden_metrics.yml +++ b/definitions/infra-gcpmemcachememcachenode/golden_metrics.yml @@ -3,26 +3,26 @@ connectionsActive: query: select: average(node.ActiveConnections) from: GcpMemcacheMemcacheNodeSample - facet: entityName eventId: entityGuid + eventName: entityName cpuUsage: title: CPU usage (%) query: select: average(node.cpu.Utilization) from: GcpMemcacheMemcacheNodeSample - facet: entityName eventId: entityGuid + eventName: entityName hitRatio: title: Hit ratio (%) query: select: average(node.HitRatio) from: GcpMemcacheMemcacheNodeSample - facet: entityName eventId: entityGuid + eventName: entityName itemsStored: title: Items stored query: select: average(node.Items) from: GcpMemcacheMemcacheNodeSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpredisinstance/golden_metrics.yml b/definitions/infra-gcpredisinstance/golden_metrics.yml index f622a4c73..8b133cea4 100644 --- a/definitions/infra-gcpredisinstance/golden_metrics.yml +++ b/definitions/infra-gcpredisinstance/golden_metrics.yml @@ -3,26 +3,26 @@ cacheHitRatio: query: select: average(stats.CacheHitRatio) from: GcpRedisInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName cpuSecondsConsumedS: title: CPU-seconds consumed (s) query: select: average(stats.CpuUtilization) from: GcpRedisInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName memoryUsageRatio: title: Memory usage ratio (%) query: select: average(stats.memory.UsageRatio) from: GcpRedisInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName totalNetworkTrafficBytes: title: Total network traffic (bytes) query: select: average(stats.NetworkTraffic) from: GcpRedisInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpspannerdatabase/golden_metrics.yml b/definitions/infra-gcpspannerdatabase/golden_metrics.yml index c7483f96c..cc45c530c 100644 --- a/definitions/infra-gcpspannerdatabase/golden_metrics.yml +++ b/definitions/infra-gcpspannerdatabase/golden_metrics.yml @@ -3,19 +3,19 @@ requests: query: select: sum(`api.Requests`) from: GcpSpannerDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName errorRate: title: Error rate query: select: filter(sum(`api.Requests`), WHERE status != 'OK') * 100 / sum(`api.Requests`) from: GcpSpannerDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName latency: title: Latency query: select: (average(`api.RequestLatencies`)) / 1000 from: GcpSpannerDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-gcpspannerinstance/golden_metrics.yml b/definitions/infra-gcpspannerinstance/golden_metrics.yml index 2be85652b..2b339671f 100644 --- a/definitions/infra-gcpspannerinstance/golden_metrics.yml +++ b/definitions/infra-gcpspannerinstance/golden_metrics.yml @@ -3,26 +3,26 @@ Nodes: query: select: latest(`instance.nodes`) from: GcpSpannerInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName cpuUtilization: title: Average cpu utilization query: select: average(`instance.cpu.Utilization`) from: GcpSpannerInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName diskUsage: title: Storage used in bytes query: select: average(`instance.storage.UsedBytes`) from: GcpSpannerInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName sessions: title: Sessions in use query: select: latest(`instance.sessions`) from: GcpSpannerInstanceSample - facet: entityName eventId: entityGuide + eventName: entityName diff --git a/definitions/infra-gcpstoragebucket/golden_metrics.yml b/definitions/infra-gcpstoragebucket/golden_metrics.yml index 62ec740d8..48992ce84 100644 --- a/definitions/infra-gcpstoragebucket/golden_metrics.yml +++ b/definitions/infra-gcpstoragebucket/golden_metrics.yml @@ -3,19 +3,19 @@ receivedBytes: query: select: sum(`network.ReceivedBytes`) from: GcpStorageBucketSample - facet: entityName eventId: entityGuid + eventName: entityName sentBytes: title: Sent bytes query: select: sum(`network.SentBytes`) from: GcpStorageBucketSample - facet: entityName eventId: entityGuid + eventName: entityName apiRequests: title: Number API calls query: select: sum(`api.Requests`) from: GcpStorageBucketSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-host/golden_metrics.yml b/definitions/infra-host/golden_metrics.yml index e4d60ce50..9a2a2f19b 100644 --- a/definitions/infra-host/golden_metrics.yml +++ b/definitions/infra-host/golden_metrics.yml @@ -3,26 +3,26 @@ cpuUsage: query: select: average(cpuPercent) from: SystemSample - facet: entityName eventId: entityGuid + eventName: entityName memoryUsage: title: Memory usage (%) query: select: average(memoryUsedPercent) from: SystemSample - facet: entityName eventId: entityGuid + eventName: entityName storageUsage: title: Storage usage (%) query: select: average(diskUsedPercent) from: StorageSample - facet: entityName eventId: entityGuid + eventName: entityName networkTraffic: title: Network Traffic (kB/s) query: select: average(transmitBytesPerSecond) + average(receiveBytesPerSecond) from: NetworkSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-kafkabroker/golden_metrics.yml b/definitions/infra-kafkabroker/golden_metrics.yml index eea4c7ba0..8f89c517c 100644 --- a/definitions/infra-kafkabroker/golden_metrics.yml +++ b/definitions/infra-kafkabroker/golden_metrics.yml @@ -3,19 +3,19 @@ incomingMessagesPerSecond: query: select: average(broker.messagesInPerSecond) from: KafkaBrokerSample - facet: entityName eventId: entityGuid + eventName: entityName produceRequestDuration99PercentileS: title: Produce Request Duration (99 percentile) (s) query: select: average(request.produceTime99Percentile) from: KafkaBrokerSample - facet: entityName eventId: entityGuid + eventName: entityName failedProduceRequestsPerSecond: title: Failed Produce Requests per Second query: select: average(request.produceRequestsFailedPerSecond) from: KafkaBrokerSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-mssqlinstance/golden_metrics.yml b/definitions/infra-mssqlinstance/golden_metrics.yml index 289b75fb6..21d2f1854 100644 --- a/definitions/infra-mssqlinstance/golden_metrics.yml +++ b/definitions/infra-mssqlinstance/golden_metrics.yml @@ -3,19 +3,19 @@ connections: query: select: average(stats.connections) from: MssqlInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName blockedProcesses: title: Blocked processes query: select: max(instance.blockedProcessesCount) from: MssqlInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName waitTimeMs: title: Wait time (ms) query: select: average(system.waitTimeInMillisecondsPerSecond) from: MssqlInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-mysqlnode/golden_metrics.yml b/definitions/infra-mysqlnode/golden_metrics.yml index 5b3fdef27..ae5fa57fe 100644 --- a/definitions/infra-mysqlnode/golden_metrics.yml +++ b/definitions/infra-mysqlnode/golden_metrics.yml @@ -3,19 +3,19 @@ queriesPerSecond: query: select: average(query.queriesPerSecond) from: MysqlSample - facet: entityName eventId: entityGuid + eventName: entityName slowQueriesPerMinute: title: Slow queries per minute query: select: average(query.slowQueriesPerSecond) * 60 from: MysqlSample - facet: entityName eventId: entityGuid + eventName: entityName connectionsPerSecond: title: Connections per Second query: select: average(net.connectionsPerSecond) from: MysqlSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-nginxserver/golden_metrics.yml b/definitions/infra-nginxserver/golden_metrics.yml index 8455e1b34..5ecbf54ae 100644 --- a/definitions/infra-nginxserver/golden_metrics.yml +++ b/definitions/infra-nginxserver/golden_metrics.yml @@ -3,12 +3,12 @@ requests: query: select: average(net.requestsPerSecond) from: NginxSample - facet: entityName eventId: entityGuid + eventName: entityName activeConnections: title: Active connections query: select: average(net.connectionsActive) from: NginxSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-oracledbinstance/golden_metrics.yml b/definitions/infra-oracledbinstance/golden_metrics.yml index bbd2e0b70..51f30c67b 100644 --- a/definitions/infra-oracledbinstance/golden_metrics.yml +++ b/definitions/infra-oracledbinstance/golden_metrics.yml @@ -3,26 +3,26 @@ hostCpuUtilization: query: select: average(db.hostCpuUtilization) from: OracleDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName ioMegabytesPerSecond: title: IO Megabytes per Second query: select: average(network.ioMegabytesPerSecond) from: OracleDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName sessions: title: Sessions query: select: latest(db.sessionCount) from: OracleDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName executionsPerSecond: title: Executions per second query: select: average(db.executionsPerSecond) from: OracleDatabaseSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-postgresqlinstance/golden_metrics.yml b/definitions/infra-postgresqlinstance/golden_metrics.yml index b6ab419e6..a16001f4c 100644 --- a/definitions/infra-postgresqlinstance/golden_metrics.yml +++ b/definitions/infra-postgresqlinstance/golden_metrics.yml @@ -3,19 +3,19 @@ scheduledCheckpoints: query: select: average(bgwriter.checkpointsScheduledPerSecond) as 'Scheduled checkpoints' from: PostgresqlInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName requestedCheckpoints: title: Requested checkpoints query: select: average(bgwriter.checkpointsRequestedPerSecond) as 'Requested checkpoints' from: PostgresqlInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName buffersAllocated: title: Buffers allocated query: select: average(bgwriter.buffersAllocatedPerSecond) as 'Buffers allocated' from: PostgresqlInstanceSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-rabbitmqexchange/golden_metrics.yml b/definitions/infra-rabbitmqexchange/golden_metrics.yml index 52e325201..ab65f8869 100644 --- a/definitions/infra-rabbitmqexchange/golden_metrics.yml +++ b/definitions/infra-rabbitmqexchange/golden_metrics.yml @@ -3,33 +3,33 @@ bindings: query: select: average(exchange.bindings) from: RabbitmqExchangeSample - facet: entityName eventId: entityGuid + eventName: entityName messagesPublishedPerChannel: title: Messages published per channel query: select: sum(exchange.messagesPublishedPerChannel) from: RabbitmqExchangeSample - facet: entityName eventId: entityGuid + eventName: entityName messagesPublishedPerChannelPerSecond: title: Messages published per channel per second query: select: average(exchange.messagesPublishedPerChannelPerSecond) from: RabbitmqExchangeSample - facet: entityName eventId: entityGuid + eventName: entityName messagesPublishedQueue: title: Messages published queue query: select: sum(exchange.messagesPublishedQueue) from: RabbitmqExchangeSample - facet: entityName eventId: entityGuid + eventName: entityName messagesPublishedQueuePerSecond: title: Messages published queue per second query: select: average(exchange.messagesPublishedQueuePerSecond) from: RabbitmqExchangeSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-rabbitmqnode/golden_metrics.yml b/definitions/infra-rabbitmqnode/golden_metrics.yml index 04d7819fa..80de9f959 100644 --- a/definitions/infra-rabbitmqnode/golden_metrics.yml +++ b/definitions/infra-rabbitmqnode/golden_metrics.yml @@ -3,26 +3,26 @@ totalMemoryUsedInBytes: query: select: average(node.totalMemoryUsedInBytes) from: RabbitmqNodeSample - facet: entityName eventId: entityGuid + eventName: entityName diskSpaceFreeInBytes: title: Disk space free (bytes) query: select: average(node.diskSpaceFreeInBytes) from: RabbitmqNodeSample - facet: entityName eventId: entityGuid + eventName: entityName fileDescriptorsTotalUsed: title: File descriptors total used query: select: average(node.fileDescriptorsTotalUsed) from: RabbitmqNodeSample - facet: entityName eventId: entityGuid + eventName: entityName averageErlangProcessesWaiting: title: Average Erlang processes waiting query: select: average(node.averageErlangProcessesWaiting) from: RabbitmqNodeSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-rabbitmqqueue/golden_metrics.yml b/definitions/infra-rabbitmqqueue/golden_metrics.yml index 115657bf5..47d677a85 100644 --- a/definitions/infra-rabbitmqqueue/golden_metrics.yml +++ b/definitions/infra-rabbitmqqueue/golden_metrics.yml @@ -3,33 +3,33 @@ consumers: query: select: average(queue.consumers) from: RabbitmqQueueSample - facet: entityName eventId: entityGuid + eventName: entityName messagesDelivered: title: Messages delivered query: select: sum(queue.sumMessagesDelivered) from: RabbitmqQueueSample - facet: entityName eventId: entityGuid + eventName: entityName messagesDeliveredPerSecond: title: Messages delivered per second query: select: average(queue.sumMessagesDeliveredPerSecond) from: RabbitmqQueueSample - facet: entityName eventId: entityGuid + eventName: entityName messagesPublished: title: Nessages published query: select: sum(queue.messagesPublished) from: RabbitmqQueueSample - facet: entityName eventId: entityGuid + eventName: entityName messagesPublishedPerSecond: title: Messages published per second query: select: average(queue.messagesPublishedPerSecond) from: RabbitmqQueueSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-redisinstance/golden_metrics.yml b/definitions/infra-redisinstance/golden_metrics.yml index 364e61977..ddfc2a187 100644 --- a/definitions/infra-redisinstance/golden_metrics.yml +++ b/definitions/infra-redisinstance/golden_metrics.yml @@ -3,19 +3,19 @@ keyspaceHitsPerSecond: query: select: average(db.keyspaceHitsPerSecond) from: RedisSample - facet: entityName eventId: entityGuid + eventName: entityName keyspaceMissesPerSecond: title: Keyspace misses per second query: select: average(db.keyspaceMissesPerSecond) from: RedisSample - facet: entityName eventId: entityGuid + eventName: entityName connectedClients: title: Connected clients query: select: average(net.connectedClients) from: RedisSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-vspherecluster/golden_metrics.yml b/definitions/infra-vspherecluster/golden_metrics.yml index 3318f8276..f10e2af6f 100644 --- a/definitions/infra-vspherecluster/golden_metrics.yml +++ b/definitions/infra-vspherecluster/golden_metrics.yml @@ -4,18 +4,18 @@ hostsCount: eventId: entityGuid select: latest(`hosts`) from: VSphereClusterSample - facet: entityName + eventName: entityName totalEffectiveMHz: title: Total Effective CPU resources in MHz query: eventId: entityGuid select: latest(`cpu.totalEffectiveMHz`) from: VSphereClusterSample - facet: entityName + eventName: entityName totalMHz: title: Aggregated CPU resources of all hosts in MHz query: eventId: entityGuid select: latest(`cpu.totalMHz`) from: VSphereClusterSample - facet: entityName + eventName: entityName diff --git a/definitions/infra-vspheredatacenter/golden_metrics.yml b/definitions/infra-vspheredatacenter/golden_metrics.yml index e21afa9e8..fb706755e 100644 --- a/definitions/infra-vspheredatacenter/golden_metrics.yml +++ b/definitions/infra-vspheredatacenter/golden_metrics.yml @@ -3,19 +3,19 @@ cpuUsage: query: select: average(cpu.overallUsagePercentage) from: VSphereDatacenterSample - facet: entityName eventId: entityGuid + eventName: entityName memoryUsage: title: Memory usage (%) query: select: average(mem.usagePercentage) from: VSphereDatacenterSample - facet: entityName eventId: entityGuid + eventName: entityName datastoreCapacityUtilizationGib: title: Datastore capacity utilization (GiB) query: select: average(datastore.totalUsedGiB) from: VSphereDatacenterSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-vspheredatastore/golden_metrics.yml b/definitions/infra-vspheredatastore/golden_metrics.yml index e48fb231c..6daadd83f 100644 --- a/definitions/infra-vspheredatastore/golden_metrics.yml +++ b/definitions/infra-vspheredatastore/golden_metrics.yml @@ -3,12 +3,12 @@ storageUsage: query: select: average(freeSpace)*100/average(capacity) from: VSphereDatastoreSample - facet: entityName eventId: entityGuid + eventName: entityName uncommittedSpaceGib: title: Uncommitted space (GiB) query: select: average(uncommitted) from: VSphereDatastoreSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-vspherehost/golden_metrics.yml b/definitions/infra-vspherehost/golden_metrics.yml index de8e7ecb7..6da986690 100644 --- a/definitions/infra-vspherehost/golden_metrics.yml +++ b/definitions/infra-vspherehost/golden_metrics.yml @@ -4,25 +4,25 @@ cpuUsage: select: average(cpu.percent) from: VSphereHostSample eventId: entityGuid - facet: entityName + eventName: entityName memoryUsage: title: Memory usage (%) query: select: average(mem.free)*100/average(mem.size) from: VSphereHostSample eventId: entityGuid - facet: entityName + eventName: entityName diskUsageMib: title: Disk usage (MiB) query: select: average(disk.totalMiB) from: VSphereHostSample eventId: entityGuid - facet: entityName + eventName: entityName connectionState: title: Connection State of the Host query: eventId: entityGuid select: latest(`connectionState`) from: VSphereHostSample - facet: entityName + eventName: entityName diff --git a/definitions/infra-vsphereresourcepool/golden_metrics.yml b/definitions/infra-vsphereresourcepool/golden_metrics.yml index c893b7ac5..40697e2d6 100644 --- a/definitions/infra-vsphereresourcepool/golden_metrics.yml +++ b/definitions/infra-vsphereresourcepool/golden_metrics.yml @@ -3,19 +3,19 @@ numberOfVmsInThisPool: query: select: average(vmCount) from: VSphereResourcePoolSample - facet: entityName eventId: entityGuid + eventName: entityName aggregatedCpuUsage: title: Aggregated CPU usage (%) query: select: average(cpu.overallUsage) from: VSphereResourcePoolSample - facet: entityName eventId: entityGuid + eventName: entityName aggregatedMemoryUsage: title: Aggregated memory usage (%) query: select: average(mem.usage)*100/(average(mem.free)+average(mem.usage)) from: VSphereResourcePoolSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/infra-vspherevm/golden_metrics.yml b/definitions/infra-vspherevm/golden_metrics.yml index 5b9586862..1bf739e46 100644 --- a/definitions/infra-vspherevm/golden_metrics.yml +++ b/definitions/infra-vspherevm/golden_metrics.yml @@ -3,19 +3,19 @@ cpuUsage: query: select: average(cpu.hostUsagePercent) from: VSphereVmSample - facet: entityName eventId: entityGuid + eventName: entityName memoryUsage: title: Memory usage (%) query: select: average(mem.usage)*100/average(mem.size) from: VSphereVmSample - facet: entityName eventId: entityGuid + eventName: entityName diskUsageMib: title: Disk usage (MiB) query: select: average(disk.totalMiB) from: VSphereVmSample - facet: entityName eventId: entityGuid + eventName: entityName diff --git a/definitions/mobile-application/golden_metrics.yml b/definitions/mobile-application/golden_metrics.yml index 0d3c48c67..a737a73c8 100644 --- a/definitions/mobile-application/golden_metrics.yml +++ b/definitions/mobile-application/golden_metrics.yml @@ -3,19 +3,19 @@ httpResponseTime95S: query: select: percentile(responseTime,95) from: MobileRequest - facet: appName eventId: entityGuid + eventName: appName httpErrorsAndNetworkFailures: title: HTTP errors and network failures query: select: count(*) from: MobileRequestError - facet: appName eventId: entityGuid + eventName: appName requestsPerMinute: title: Requests per minute query: select: rate(count(*), 1 minute) from: MobileRequest - facet: appName eventId: entityGuid + eventName: appName diff --git a/definitions/synth-monitor/golden_metrics.yml b/definitions/synth-monitor/golden_metrics.yml index 1bd643e3e..45cb467cd 100644 --- a/definitions/synth-monitor/golden_metrics.yml +++ b/definitions/synth-monitor/golden_metrics.yml @@ -3,13 +3,13 @@ medianDurationS: query: select: percentile(duration,50)/1000 from: SyntheticCheck - facet: monitorName eventId: entityGuid + eventName: monitorName failures: title: Failures query: select: count(*) from: SyntheticCheck where: result = 'FAILED' - facet: monitorName eventId: entityGuid + eventName: monitorName diff --git a/docs/example-entity-definition.yml b/docs/example-entity-definition.yml index 31eeb4386..58f26c8f2 100644 --- a/docs/example-entity-definition.yml +++ b/docs/example-entity-definition.yml @@ -28,8 +28,12 @@ synthesis: attributeNameC: # Template that can be used to generate a dashboard for the entity. +# If your telemetry comes from different providers you can specify a dashboard for each one of them, otherwise you can just use `newRelic` dashboardTemplates: - - dashboard.json + newRelic: + template: dashboard.json + prometheus: + template: prometheus_dashboard.json # Reference to the golden and/or summary metrics associated with the entity (if any). compositeMetrics: diff --git a/docs/golden_metrics.md b/docs/golden_metrics.md index e88a27146..b86d1708d 100644 --- a/docs/golden_metrics.md +++ b/docs/golden_metrics.md @@ -16,8 +16,9 @@ memoryUsage: select: average(host.memoryUsagePercent) from: Metric where: "" - facet: entity.name + facet: "" eventId: entity.guid + eventName: entity.name displayAsValue: false ``` @@ -47,7 +48,29 @@ memoryUsage: | select | Yes | | Provide the field and function you want to display in the metric. You must only provide one field, but you can do aggregations, sums, etc. Always name the fields to make it easier to read. e.g. `sum((provider.httpCodeElb4XXCount.Sum OR 0) + (provider.httpCodeElb5XXCount.Sum OR 0)) AS 'Errors'`| | from | No | `Metric` | Choose where your metric gathers the information from | | where | No | empty string | In the case you need a more granular WHERE clause added into the query you can use this field. e.g. `provider='Alb'` | -| facet | No | `entity.name` | Which field to use when doing a FACET. This field will be used when displaying the metric for several entities | +| facet | No | empty string | An extra facet by a specific field to be added to the default facet by entityName | | eventId | No | `entity.guid` | The event attribute used to filter the entity. We recommend to use the default `entity.guid` which is generated automatically as part of the entity synthesis. | +| eventName | No | `entity.name` | The name of the field in the event that references the entity name. By default `entity.guid` which is generated automatically as part of the entity synthesis. | +### Roll-up entities +In the cases that the entity type can be ingested from different sources and you need to provide a different query implementation for each of them, you can use `queries` instead of `query` + +```yaml +memoryUsage: + title: "A title explaining what the user is seeing (unit displayed in the dashboard)" + queries: + prometheus: + select: average(field) + from: PrometheusSample + newRelic: + select: average(nrField) + from: NewRelicSample +``` + +In this example `prometheus` and `newRelic` are the values the entity must have in the `instrumentation.provider` tag. +The first tag value that matches with the entity will be the one used to build the queries. + +Is also important to note that the semantics of the queries should match between each implementation. This includes things like average vs counts, units and other details. + +If no rule matches the `newRelic` one will be used. diff --git a/docs/summary_metrics.md b/docs/summary_metrics.md index 257a7520c..fd222c672 100644 --- a/docs/summary_metrics.md +++ b/docs/summary_metrics.md @@ -94,3 +94,28 @@ returns the value of the first metric that has a value different than `null`. e. @metricA || 10 It returns the value of `metricA` if it's not `null`, `10` otherwise. + + +### Roll-up entities + +In the cases that the entity type can be ingested from different sources and you need to provide a different query implementation you can use `queries` instead of `query` + +```yaml +memoryUsage: + title: "A title explaining what the user is seeing (unit displayed in the dashboard)" + unit: COUNT + queries: + prometheus: + select: sum(field) + from: PrometheusSample + newRelic: + select: sum(nrField) + from: NewRelicSample +``` + +In this example `prometheus` and `newRelic` are the values the entity must have in the `instrumentation.provider` tag. +The first tag value that matches with the entity will be the one used to build the queries. + +Is also important to note that the semantics of the queries should match between each implementation. This includes things like average vs counts, units and other details. + +If no rule matches the `newRelic` one will be used. \ No newline at end of file diff --git a/validator/schemas/entity-schema-v1.json b/validator/schemas/entity-schema-v1.json index 898b21aa2..0fa9cb1c0 100644 --- a/validator/schemas/entity-schema-v1.json +++ b/validator/schemas/entity-schema-v1.json @@ -196,17 +196,29 @@ }, "dashboardTemplates": { "$id": "#/properties/dashboardTemplates", - "type": "array", - "items": { - "type": "string", - "pattern": "^[a-zA-Z_-]*dashboard.json$" - }, - "description": "An array dashboard templates", - "examples": [ - [ - "url@github.com" - ] - ] + "type": "object", + "title": "Summary dashboards", + "description": "Dashboards that will be displayed in the entity overview.", + "additionalProperties": { + "type": "object", + "required": [ + "template" + ], + "properties": { + "template": { + "$id": "#/properties/query/dashboardTemplates/template", + "type": "string", + "pattern": "^[a-zA-Z_-]*dashboard.json$", + "description": "The file where the dashboard is located.", + "examples": [ + [ + "prometheus_dashboard.json" + ] + ] + } + }, + "additionalProperties": false + } }, "compositeMetrics": { "$id": "#/properties/compositeMetrics", diff --git a/validator/schemas/golden-metrics-schema-v1.json b/validator/schemas/golden-metrics-schema-v1.json index 4157019aa..a07c777a0 100644 --- a/validator/schemas/golden-metrics-schema-v1.json +++ b/validator/schemas/golden-metrics-schema-v1.json @@ -25,9 +25,10 @@ }, "additionalProperties": { "type": "object", - "required": [ - "title", - "query" + + "oneOf": [ + {"required": ["title", "query"]}, + {"required": ["title", "queries"]} ], "properties": { "title": { @@ -48,62 +49,83 @@ false ] }, - "query": { - "$id": "#/properties/query", + "query": { "$ref": "#/definitions/query" }, + "queries": { + "$id": "#/properties/queries", "type": "object", - "title": "The query schema", - "description": "Information about the query to get the golden metric.", - "examples": [ - { - "select": "average(host.memoryUsagePercent)", - "from": "Metric", - "where": "", - "facet": "entity.name", - "eventId": "entity.guid" - } - ], - "required": [ - "select" - ], - "properties": { - "select": { - "$id": "#/properties/query/properties/select", - "type": "string", - "examples": [ - "average(host.memoryUsagePercent)" - ] - }, - "from": { - "$id": "#/properties/query/properties/from", - "type": "string", - "examples": [ - "Metric" - ] - }, - "where": { - "$id": "#/properties/query/properties/where", - "type": "string", - "examples": [ - "condition is true" - ] - }, - "facet": { - "$id": "#/properties/query/properties/facet", - "type": "string", - "examples": [ - "entity.name" - ] - }, - "eventId": { - "$id": "#/properties/query/properties/eventId", - "type": "string", - "examples": [ - "entity.guid" - ] - } + "propertyNames": { + "pattern": "^[a-zA-Z0-9_]{1,100}$" }, - "additionalProperties": true + "additionalProperties": { + "$ref": "#/definitions/query" + } } } + }, + "definitions": { + "query": { + "$id": "#/definitions/query", + "type": "object", + "title": "The query schema", + "description": "Information about the query to get the golden metric.", + "examples": [ + { + "select": "average(host.memoryUsagePercent)", + "from": "Metric", + "where": "", + "facet": "", + "eventId": "entity.guid", + "eventName": "entity.name" + } + ], + "required": [ + "select" + ], + "properties": { + "select": { + "$id": "#/properties/query/properties/select", + "type": "string", + "examples": [ + "average(host.memoryUsagePercent)" + ] + }, + "from": { + "$id": "#/properties/query/properties/from", + "type": "string", + "examples": [ + "Metric" + ] + }, + "where": { + "$id": "#/properties/query/properties/where", + "type": "string", + "examples": [ + "condition is true" + ] + }, + "facet": { + "$id": "#/properties/query/properties/facet", + "type": "string", + "examples": [ + "drive" + ] + }, + "eventId": { + "$id": "#/properties/query/properties/eventId", + "type": "string", + "examples": [ + "entity.guid" + ] + }, + "eventName": { + "$id": "#/properties/query/properties/eventName", + "type": "string", + "examples": [ + "entity.name" + ] + } + }, + "additionalProperties": true + } } } diff --git a/validator/schemas/summary-metrics-schema-v1.json b/validator/schemas/summary-metrics-schema-v1.json index a5ff13461..d46b4a132 100644 --- a/validator/schemas/summary-metrics-schema-v1.json +++ b/validator/schemas/summary-metrics-schema-v1.json @@ -31,6 +31,11 @@ "query" ] }, + { + "required": [ + "queries" + ] + }, { "required": [ "tag" @@ -65,64 +70,16 @@ "type": "boolean", "title": "Whether the metric shows up on the UI or not" }, - "query": { - "$id": "#/properties/query", + "query": { "$ref": "#/definitions/query" }, + "queries": { + "$id": "#/properties/queries", "type": "object", - "title": "The NRDB query to build the metric", - "description": "Information about the query to get the summary metric.", - "examples": [ - { - "select": "sum(metricName)", - "from": "Metric", - "where": "", - "eventId": "entity.guid" - } - ], - "required": [ - "select", - "from", - "eventId" - ], - "properties": { - "select": { - "$id": "#/properties/query/properties/select", - "type": "string", - "title": "The query's select", - "examples": [ - "sum(metricName)" - ] - }, - "from": { - "$id": "#/properties/query/properties/from", - "type": "string", - "title": "The query's from", - "examples": [ - "Metric" - ] - }, - "where": { - "$id": "#/properties/query/properties/where", - "type": "string", - "title": "The query's where", - "examples": [ - "condition is true" - ] - }, - "eventId": { - "$id": "#/properties/query/properties/eventId", - "type": "string", - "title": "The query's eventId", - "examples": [ - "entity.guid" - ] - }, - "eventObjectId": { - "$id": "#/properties/query/properties/eventObjectId", - "type": "string", - "enum": ["DOMAIN_IDS","ENTITY_GUIDS"] - } + "propertyNames": { + "pattern": "^[a-zA-Z0-9_]{1,100}$" }, - "additionalProperties": false + "additionalProperties": { + "$ref": "#/definitions/query" + } }, "tag": { "$id": "#/properties/tag", @@ -160,5 +117,67 @@ } }, "additionalProperties": false + }, + + "definitions": { + "query": { + "$id": "#/definitions/query", + "type": "object", + "title": "The NRDB query to build the metric", + "description": "Information about the query to get the summary metric.", + "examples": [ + { + "select": "sum(metricName)", + "from": "Metric", + "where": "", + "eventId": "entity.guid" + } + ], + "required": [ + "select", + "from", + "eventId" + ], + "properties": { + "select": { + "$id": "#/properties/query/properties/select", + "type": "string", + "title": "The query's select", + "examples": [ + "sum(metricName)" + ] + }, + "from": { + "$id": "#/properties/query/properties/from", + "type": "string", + "title": "The query's from", + "examples": [ + "Metric" + ] + }, + "where": { + "$id": "#/properties/query/properties/where", + "type": "string", + "title": "The query's where", + "examples": [ + "condition is true" + ] + }, + "eventId": { + "$id": "#/properties/query/properties/eventId", + "type": "string", + "title": "The query's eventId", + "examples": [ + "entity.guid" + ] + }, + "eventObjectId": { + "$id": "#/properties/query/properties/eventObjectId", + "type": "string", + "enum": ["DOMAIN_IDS","ENTITY_GUIDS"] + } + }, + "additionalProperties": false + } } }