diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/appengine-platform-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/appengine-platform-dashboard.json index e167b5d..f572c1e 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/appengine-platform-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/appengine-platform-dashboard.json @@ -12,7 +12,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -43,7 +43,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completions__count\" AND metric.label.success=False", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completion_latencies__count\" AND metric.label.success=False", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -73,15 +73,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], @@ -103,30 +99,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/repository/downloads__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.repositoryType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/repository/downloads__count\"", - - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.repositoryType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/repository/download_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.repository_type" + ], + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/aws-platform-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/aws-platform-dashboard.json index 8f3872f..ceec020 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/aws-platform-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/aws-platform-dashboard.json @@ -68,13 +68,13 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/equests__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceName" + "metric.label.service_name" ], "unitOverride": "1" } @@ -99,14 +99,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.statusCode" + "metric.label.service_endpoint", + "metric.label.status_code" ], "unitOverride": "1" } @@ -130,29 +130,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.requestType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.requestType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.request_type" + ], + "unitOverride": "ns" } } ], @@ -175,14 +162,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.serviceName=\"AmazonEC2\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.service_name=\"AmazonEC2\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType" + "metric.label.service_endpoint", + "metric.label.request_type" ], "unitOverride": "1" } @@ -207,15 +194,15 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.status!=\"2xx\" AND metric.label.serviceName=\"AmazonEC2\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\" AND metric.label.service_name=\"AmazonEC2\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType", - "metric.label.statusCode" + "metric.label.service_endpoint", + "metric.label.request_type", + "metric.label.status_code" ], "unitOverride": "1" } @@ -239,29 +226,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__totalTime\" AND metric.label.serviceName=\"AmazonEC2\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.requestType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.serviceName=\"AmazonEC2\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.requestType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies\" AND metric.label.service_name=\"AmazonEC2\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.request_type" + ], + "unitOverride": "ns" } } ], @@ -284,14 +258,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.serviceName=\"AmazonAutoScaling\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.service_name=\"AmazonAutoScaling\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType" + "metric.label.service_endpoint", + "metric.label.request_type" ], "unitOverride": "1" } @@ -316,15 +290,15 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.status!=\"2xx\" AND metric.label.serviceName=\"AmazonAutoScaling\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\" AND metric.label.service_name=\"AmazonAutoScaling\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType", - "metric.label.statusCode" + "metric.label.service_endpoint", + "metric.label.request_type", + "metric.label.status_code" ], "unitOverride": "1" } @@ -348,29 +322,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__totalTime\" AND metric.label.serviceName=\"AmazonAutoScaling\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.requestType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.serviceName=\"AmazonEC2\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.requestType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies\" AND metric.label.service_name=\"AmazonAutoScaling\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.request_type" + ], + "unitOverride": "ns" } } ], @@ -393,14 +354,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.serviceName=\"AmazonElasticLoadBalancing\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.service_name=\"AmazonElasticLoadBalancing\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType" + "metric.label.service_endpoint", + "metric.label.request_type" ], "unitOverride": "1" } @@ -425,15 +386,15 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.status!=\"2xx\" AND metric.label.serviceName=\"AmazonElasticLoadBalancing\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\" AND metric.label.service_name=\"AmazonElasticLoadBalancing\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType", - "metric.label.statusCode" + "metric.label.service_endpoint", + "metric.label.request_type", + "metric.label.status_code" ], "unitOverride": "1" } @@ -457,29 +418,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__totalTime\" AND metric.label.serviceName=\"AmazonElasticLoadBalancing\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.requestType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.serviceName=\"AmazonElasticLoadBalancing\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.requestType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies\" AND metric.label.service_name=\"AmazonElasticLoadBalancing\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.request_type" + ], + "unitOverride": "ns" } } ], @@ -502,14 +450,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.serviceName!=\"AmazonEC2\" AND metric.label.serviceName!=\"AmazonAutoScaling\" AND metric.label.serviceName!=\"AmazonElasticLoadBalancing\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.service_name!=\"AmazonEC2\" AND metric.label.service_name!=\"AmazonAutoScaling\" AND metric.label.service_name!=\"AmazonElasticLoadBalancing\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType" + "metric.label.service_endpoint", + "metric.label.request_type" ], "unitOverride": "1" } @@ -534,15 +482,15 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.status!=\"2xx\" AND metric.label.serviceName!=\"AmazonEC2\" AND metric.label.serviceName!=\"AmazonAutoScaling\" AND metric.label.serviceName!=\"AmazonElasticLoadBalancing\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\" AND metric.label.service_name!=\"AmazonEC2\" AND metric.label.service_name!=\"AmazonAutoScaling\" AND metric.label.service_name!=\"AmazonElasticLoadBalancing\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType", - "metric.label.statusCode" + "metric.label.service_endpoint", + "metric.label.request_type", + "metric.label.status_code" ], "unitOverride": "1" } @@ -566,31 +514,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__totalTime\" AND metric.label.serviceName!=\"AmazonEC2\" AND metric.label.serviceName!=\"AmazonAutoScaling\" AND metric.label.serviceName!=\"AmazonElasticLoadBalancing\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.serviceName!=\"AmazonEC2\" AND metric.label.serviceName!=\"AmazonAutoScaling\" AND metric.label.serviceName!=\"AmazonElasticLoadBalancing\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.serviceEndpoint", - "metric.label.requestType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies\" AND metric.label.service_name!=\"AmazonEC2\" AND metric.label.service_name!=\"AmazonAutoScaling\" AND metric.label.service_name!=\"AmazonElasticLoadBalancing\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.service_endpoint", + "metric.label.request_type" + ], + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/clouddriver-service-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/clouddriver-service-dashboard.json index 206aeec..c2311bc 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/clouddriver-service-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/clouddriver-service-dashboard.json @@ -56,7 +56,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"clouddriver\" AND metric.label.status=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"clouddriver\" AND metric.label.status_code_class=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -75,7 +75,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"clouddriver\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"clouddriver\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -99,15 +99,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\" AND metric.label.spin_service=\"clouddriver\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"clouddriver\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\" AND metric.label.spin_service=\"clouddriver\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], @@ -130,8 +126,10 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operations__count\" AND metric.label.spin_service=\"clouddriver\"", - "perSeriesAligner": "ALIGN_RATE" + "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operation_latencies\" AND metric.label.spin_service=\"clouddriver\"", + "perSeriesAligner": "ALIGN_RATE", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], @@ -149,15 +147,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operations__totalTime\" AND metric.label.spin_service=\"clouddriver\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operations__count\" AND metric.label.spin_service=\"clouddriver\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operation_latencies\" AND metric.label.spin_service=\"clouddriver\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], @@ -198,15 +192,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/cache/execution/successful__totalTime\" AND metric.label.spin_service=\"clouddriver\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/cache/execution/successful__count\" AND metric.label.spin_service=\"clouddriver\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/cache/execution/successful_latencies\" AND metric.label.spin_service=\"clouddriver\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], @@ -228,29 +218,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/cache/onDemand/completions__totalTime\" AND metric.label.spin_service=\"clouddriver\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.platform" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/cache/onDemand/completions__count\" AND metric.label.spin_service=\"clouddriver\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.platform" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/cache/onDemand/completion_latencies\" AND metric.label.spin_service=\"clouddriver\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.cloud_platform" + ], + "unitOverride": "ns" } } ], @@ -274,7 +251,7 @@ "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.platform" + "metric.label.cloud_platform" ], "unitOverride": "1" } diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/echo-service-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/echo-service-dashboard.json index 6126fa4..a4a63f0 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/echo-service-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/echo-service-dashboard.json @@ -49,19 +49,6 @@ } ] } - }, - { - "title": "Events Per Poll", - "xyChart": { - "dataSets": [ - { - "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/echo/event/perPoll\" AND metric.label.spin_service=\"echo\"", - "perSeriesAligner": "ALIGN_RATE" - } - } - ] - } } ] }, @@ -74,14 +61,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__count\" AND metric.label.spin_service=\"gate\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completion_latencies__count\" AND metric.label.spin_service=\"gate\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.spin_variant", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -105,31 +92,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__totalTime\" AND metric.label.spin_service=\"echo\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__count\" AND metric.label.spin_service=\"echo\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completion_latencies\" AND metric.label.spin_service=\"echo\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_variant", + "metric.label.status_code" + ], + "unitOverride": "ns" } } ], @@ -151,15 +124,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\" AND metric.label.spin_service=\"echo\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"echo\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\" AND metric.label.spin_service=\"echo\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/errors-system-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/errors-system-dashboard.json index 05eff4b..dd41c56 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/errors-system-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/errors-system-dashboard.json @@ -12,7 +12,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -21,7 +21,7 @@ "metric.label.spin_service", "metric.label.spin_variant", "metric.label.method", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -78,7 +78,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rollingCount/fallback\" AND metric.label.success!=True", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rolling_count/fallback\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -106,7 +106,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rollingCount/fallback\" AND metric.label.success=True", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rolling_count/fallback\" AND metric.label.success=True", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/fiat-service-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/fiat-service-dashboard.json index 8ca895e..15096c8 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/fiat-service-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/fiat-service-dashboard.json @@ -130,7 +130,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"fiat\" AND metric.label.status=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"fiat\" AND metric.label.status_code_class=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -149,7 +149,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"fiat\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"fiat\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -172,15 +172,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\" AND metric.label.spin_service=\"fiat\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"fiat\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\" AND metric.label.spin_service=\"fiat\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/front50-service-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/front50-service-dashboard.json index 2c82c28..d14ddb1 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/front50-service-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/front50-service-dashboard.json @@ -12,7 +12,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rollingCount/fallback\" AND metric.label.spin_service=\"front50\" AND metric.label.success!=True", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rolling_count/fallback\" AND metric.label.spin_service=\"front50\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -39,7 +39,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rollingCount/fallback\" AND metric.label.spin_service\"front50\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rolling_count/fallback\" AND metric.label.spin_service\"front50\"", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -72,7 +72,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__count\" AND metric.label.spin_service=\"front50\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completion_latencies__count\" AND metric.label.spin_service=\"front50\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -80,7 +80,7 @@ "groupByFields": [ "metric.label.spin_variant", "metric.label.method", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -111,7 +111,7 @@ "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.objectType" + "metric.label.object_type" ], "unitOverride": "1" } @@ -137,7 +137,7 @@ "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.objectType" + "metric.label.object_type" ], "unitOverride": "1" } @@ -161,29 +161,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/front50/cache/refresh__totalTime\" AND metric.label.spin_service=\"front50\" AND metric.label.scheduled=True", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.objectType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/front50/cache/refresh__count\" AND metric.label.spin_service=\"front50\" AND metric.label.scheduled=True", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.objectType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/front50/cache/refresh_latencies\" AND metric.label.spin_service=\"front50\" AND metric.label.scheduled=True", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.object_type" + ], + "unitOverride": "ns" } } ] @@ -194,29 +181,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/front50/cache/refresh__totalTime\" AND metric.label.spin_service=\"front50\" AND metric.label.scheduled!=True", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.objectType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/front50/cache/refresh__count\" AND metric.label.spin_service=\"front50\" AND metric.label.scheduled=True", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.objectType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/front50/cache/refresh_latencies\" AND metric.label.spin_service=\"front50\" AND metric.label.scheduled!=True", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.object_type" + ], + "unitOverride": "ns" } } ], @@ -321,29 +295,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/operation/retryable__totalTime\" AND metric.label.spin_service=\"front50\"", - "perSeriesAligner": "ALIGN_RATE", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.action" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/operation/retryable__count\" AND metric.label.spin_service=\"front50\"", - "perSeriesAligner": "ALIGN_RATE", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.action" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/operation/retryable_latencies\" AND metric.label.spin_service=\"front50\"", + "perSeriesAligner": "ALIGN_RATE", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.action" + ], + "unitOverride": "ns" } } ], @@ -360,29 +321,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__totalTime\" AND metric.label.spin_service=\"front50\"", - "perSeriesAligner": "ALIGN_RATE", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__count\" AND metric.label.spin_service=\"front50\"", - "perSeriesAligner": "ALIGN_RATE", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completion_latencies\" AND metric.label.spin_service=\"front50\"", + "perSeriesAligner": "ALIGN_RATE", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method" + ], + "unitOverride": "ns" } } ], @@ -406,7 +354,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"front50\" AND metric.label.status=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"front50\" AND metric.label.status_code_class=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -425,7 +373,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"front50\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"front50\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -449,15 +397,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\" AND metric.label.spin_service=\"front50\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"front50\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\" AND metric.label.spin_service=\"front50\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/gate-service-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/gate-service-dashboard.json index 35245d3..c97c991 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/gate-service-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/gate-service-dashboard.json @@ -12,7 +12,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rollingCount/fallback\" AND metric.label.spin_service=\"gate\" AND metric.label.success!=True", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rolling_count/fallback\" AND metric.label.spin_service=\"gate\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -39,7 +39,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rollingCount/fallback\" AND metric.label.spin_service\"gate\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rolling_count/fallback\" AND metric.label.spin_service\"gate\"", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -72,14 +72,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/eureka/okclient/completions__count\" AND metric.label.spin_service=\"gate\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/eureka/okclient/completion_latencies__count\" AND metric.label.spin_service=\"gate\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.spin_variant", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -98,31 +98,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/eureka/okclient/completions__totalTime\" AND metric.label.spin_service=\"gate\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/eureka/okclient/completions__count\" AND metric.label.spin_service=\"gate\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/eureka/okclient/completion_latencies\" AND metric.label.spin_service=\"gate\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_variant", + "metric.label.status_code" + ], + "unitOverride": "ns" } } ], @@ -145,14 +131,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__count\" AND metric.label.spin_service=\"gate\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completion_latencies__count\" AND metric.label.spin_service=\"gate\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.spin_variant", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -171,31 +157,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__totalTime\" AND metric.label.spin_service=\"gate\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__count\" AND metric.label.spin_service=\"gate\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completion_latencies\" AND metric.label.spin_service=\"gate\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_variant", + "metric.label.status_code" + ], + "unitOverride": "ns" } } ], @@ -218,7 +190,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"gate\" AND metric.label.status=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"gate\" AND metric.label.status_code_class=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -237,7 +209,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"gate\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"gate\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -260,15 +232,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\" AND metric.label.spin_service=\"gate\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"gate\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\" AND metric.label.spin_service=\"gate\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/google-platform-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/google-platform-dashboard.json index ea69c96..b276487 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/google-platform-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/google-platform-dashboard.json @@ -12,7 +12,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -43,14 +43,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.method", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -74,29 +74,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method" + ], + "unitOverride": "ns" } } ], @@ -119,7 +106,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.scope=\"global\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\" AND metric.label.scope=\"global\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -150,14 +137,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.status!=\"2xx\" AND metric.label.scope=\"global\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\" AND metric.label.scope=\"global\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.method", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -181,29 +168,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__totalTime\" AND metric.label.scope=\"global\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.scope=\"global\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies\" AND metric.label.scope=\"global\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method" + ], + "unitOverride": "ns" } } ], @@ -226,7 +200,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.scope=\"regional\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\" AND metric.label.scope=\"regional\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -258,7 +232,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.status!=\"2xx\" AND metric.label.scope=\"regional\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\" AND metric.label.scope=\"regional\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -266,7 +240,7 @@ "groupByFields": [ "metric.label.method", "metric.label.region", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -290,31 +264,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__totalTime\" AND metric.label.scope=\"regional\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.region" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.scope=\"regional\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.region" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies\" AND metric.label.scope=\"regional\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method", + "metric.label.region" + ], + "unitOverride": "ns" } } ], @@ -337,7 +297,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.scope=\"zonal\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\" AND metric.label.scope=\"zonal\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -369,7 +329,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.status!=\"2xx\" AND metric.label.scope=\"zonal\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\" AND metric.label.scope=\"zonal\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -377,7 +337,7 @@ "groupByFields": [ "metric.label.method", "metric.label.zone", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -401,31 +361,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__totalTime\" AND metric.label.scope=\"zonal\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.zone" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.scope=\"zonal\"", + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies\" AND metric.label.scope=\"zonal\"", "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", + "crossSeriesReducer": "REDUCE_MEAN", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.method", "metric.label.zone" ], - "unitOverride": "1" - } + "unitOverride": "ns" } } ], @@ -448,7 +394,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/batch/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/batch/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -509,29 +455,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/batch/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.context" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/batch/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.context" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/batch/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.context" + ], + "unitOverride": "ns" } } ], @@ -554,7 +487,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -585,14 +518,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__count\" AND metric.label.success!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.method", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -616,29 +549,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__count\"", + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completion_latencies\"", "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", + "crossSeriesReducer": "REDUCE_MEAN", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.method" ], - "unitOverride": "1" - } + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/igor-service-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/igor-service-dashboard.json index 29a16d5..8df3105 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/igor-service-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/igor-service-dashboard.json @@ -12,7 +12,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rollingCount/fallback\" AND metric.label.spin_service=\"igor\" AND metric.label.success!=True", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rolling_count/fallback\" AND metric.label.spin_service=\"igor\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -39,7 +39,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rollingCount/fallback\" AND metric.label.spin_service\"igor\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/hystrix/rolling_count/fallback\" AND metric.label.spin_service\"igor\"", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -161,7 +161,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"igor\" AND metric.label.status=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"igor\" AND metric.label.status_code_class=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -180,7 +180,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"igor\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.spin_service=\"igor\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -203,15 +203,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\" AND metric.label.spin_service=\"igor\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"igor\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\" AND metric.label.spin_service=\"igor\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/k8s-platform-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/k8s-platform-dashboard.json index e3c1d3a..97179f6 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/k8s-platform-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/k8s-platform-dashboard.json @@ -12,7 +12,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -43,7 +43,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completions__count\" AND metric.label.success!=True", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completion_latencies__count\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -73,29 +73,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method" + ], + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/kayenta-service-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/kayenta-service-dashboard.json index 54123ac..5f78653 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/kayenta-service-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/kayenta-service-dashboard.json @@ -31,29 +31,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/canary/repository/stackriver/fetch__totalTime\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_SUM", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.metricStore" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/canary/repository/stackriver/fetch__count\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_SUM", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.metricStore" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/canary/repository/stackriver/fetch_latencies\" AND metric.label.spin_service=\"kayenta\"", + "perSeriesAligner": "ALIGN_SUM", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.metric_store" + ], + "unitOverride": "ns" } } ] @@ -89,7 +76,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/canary/pipeline/startupFailures\" AND metric.label.spin_service=\"kayenta\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/canary/pipeline/startup_failures\" AND metric.label.spin_service=\"kayenta\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -113,7 +100,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/threadpool/activeThreads\" AND metric.label.spin_service=\"kayenta\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/threadpool/active_threads\" AND metric.label.spin_service=\"kayenta\"", "perSeriesAligner": "ALIGN_MEAN" } } @@ -126,7 +113,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/threadpool/blockedSize\" AND metric.label.spin_service=\"kayenta\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/threadpool/blocked_size\" AND metric.label.spin_service=\"kayenta\"", "perSeriesAligner": "ALIGN_MEAN" } } @@ -229,15 +216,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag__totalTime\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag__count\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag_latencies\" AND metric.label.spin_service=\"kayenta\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], @@ -326,7 +309,7 @@ "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.executionType" + "metric.label.execution_type" ], "unitOverride": "1" } @@ -352,7 +335,7 @@ "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.executionType" + "metric.label.execution_type" ], "unitOverride": "1" } @@ -376,29 +359,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/withType__totalTime\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.executionType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/withType__count\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.executionType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/with_type_latencies\" AND metric.label.spin_service=\"kayenta\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.execution_type" + ], + "unitOverride": "ns" } } ], @@ -415,29 +385,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/invocation/completions/withType__totalTime\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.executionType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/invocation/completions/withType__count\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.executionType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/invocation/completions/with_type_latencies\" AND metric.label.spin_service=\"kayenta\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.execution_type" + ], + "unitOverride": "ns" } } ], @@ -484,7 +441,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/stage/durationBucket\" AND metric.label.spin_service=\"kayenta\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/stage/duration_bucket\" AND metric.label.spin_service=\"kayenta\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -508,14 +465,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__count\" AND metric.label.spin_service=\"gate\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completion_latencies__count\" AND metric.label.spin_service=\"gate\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.spin_variant", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -539,31 +496,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__totalTime\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__count\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completion_latencies\" AND metric.label.spin_service=\"kayenta\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_variant", + "metric.label.status_code" + ], + "unitOverride": "ns" } } ], @@ -585,15 +528,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"kayenta\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\" AND metric.label.spin_service=\"kayenta\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/orca-service-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/orca-service-dashboard.json index 8c4f5e8..8095f9d 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/orca-service-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/orca-service-dashboard.json @@ -25,7 +25,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/threadpool/blockedSize\" AND metric.label.spin_service=\"orca\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/threadpool/blocked_size\" AND metric.label.spin_service=\"orca\"", "perSeriesAligner": "ALIGN_MEAN" } } @@ -147,15 +147,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag__totalTime\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag__count\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag_latencies\" AND metric.label.spin_service=\"orca\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], @@ -238,13 +234,13 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/execution/activeThreads\" AND metric.label.spin_service=\"orca\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/execution/active_threads\" AND metric.label.spin_service=\"orca\"", "perSeriesAligner": "ALIGN_SUM", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.executionType" + "metric.label.execution_type" ], "unitOverride": "1" } @@ -270,7 +266,7 @@ "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ - "metric.label.executionType" + "metric.label.execution_type" ], "unitOverride": "1" } @@ -294,29 +290,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/withType__totalTime\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.executionType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/withType__count\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.executionType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/with_type_latencies\" AND metric.label.spin_service=\"orca\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.execution_type" + ], + "unitOverride": "ns" } } ], @@ -333,29 +316,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/invocation/completions/withType__totalTime\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.executionType" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/invocation/completions/withType__count\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.executionType" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/invocation/completions/with_type_latencies\" AND metric.label.spin_service=\"orca\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.execution_type" + ], + "unitOverride": "ns" } } ], @@ -402,7 +372,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/stage/durationBucket\" AND metric.label.spin_service=\"orca\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/stage/duration_bucket\" AND metric.label.spin_service=\"orca\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -426,14 +396,14 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__count\" AND metric.label.spin_service=\"gate\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completion_latencies__count\" AND metric.label.spin_service=\"gate\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", "minAlignmentPeriod": "60s", "groupByFields": [ "metric.label.spin_variant", - "metric.label.statusCode" + "metric.label.status_code" ], "unitOverride": "1" } @@ -457,31 +427,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__totalTime\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completions__count\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_variant", - "metric.label.statusCode" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/okhttp/completion_latencies\" AND metric.label.spin_service=\"orca\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_variant", + "metric.label.status_code" + ], + "unitOverride": "ns" } } ], @@ -503,15 +459,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"orca\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\" AND metric.label.spin_service=\"orca\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/redis-system-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/redis-system-dashboard.json index 35b84a4..fb8fbd5 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/redis-system-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/redis-system-dashboard.json @@ -12,7 +12,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__count\" AND metric.label.success!=True", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completion_latencies__count\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -43,7 +43,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -69,7 +69,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -101,7 +101,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -131,29 +131,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method" + ], + "unitOverride": "ns" } } ], @@ -175,31 +162,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.poolName" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.poolName" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method", + "metric.label.pool_name" + ], + "unitOverride": "ns" } } ], @@ -221,31 +194,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.spin_service" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.spin_service" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method", + "metric.label.spin_service" + ], + "unitOverride": "ns" } } ], @@ -267,31 +226,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.pipelined" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.pipelined" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method", + "metric.label.pipelined" + ], + "unitOverride": "ns" } } ], @@ -313,33 +258,18 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/payloadSize__totalAmount\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/payloadSize__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.method", - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/external/redis/payload_size\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.method", + "metric.label.spin_service", + "metric.label.spin_variant" + ], + "unitOverride": "1" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/rosco-service-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/rosco-service-dashboard.json index 717288d..6465ea9 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/rosco-service-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/rosco-service-dashboard.json @@ -43,7 +43,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/bakery/bake/completions__count\" AND metric.label.spin_service=\"rosco\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/bakery/bake/completion_latencies__count\" AND metric.label.spin_service=\"rosco\"", "perSeriesAligner": "ALIGN_RATE" } } @@ -55,15 +55,11 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/bakery/bake/completions__totalTime\" AND metric.label.spin_service=\"rosco\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/bakery/bake/completions__count\" AND metric.label.spin_service=\"rosco\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/bakery/bake/completion_latencies\" AND metric.label.spin_service=\"rosco\"", + "perSeriesAligner": "ALIGN_DELTA" + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ] @@ -80,14 +76,10 @@ "dataSets": [ { "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\" AND metric.label.spin_service=\"rosco\"", - "perSeriesAligner": "ALIGN_DELTA" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.spin_service=\"rosco\"", - "perSeriesAligner": "ALIGN_DELTA" - } + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\" AND metric.label.spin_service=\"rosco\"", + "perSeriesAligner": "ALIGN_DELTA" + "crossSeriesReducer": "REDUCE_MEAN", + "unitOverride": "ns" } } ], diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/spinnaker-system-dashboard.json b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/spinnaker-system-dashboard.json index fb9de49..2810845 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/spinnaker-system-dashboard.json +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/experimental/spinnaker-system-dashboard.json @@ -12,7 +12,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\" AND metric.label.status=\"5xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\" AND metric.label.status_code_class=\"5xx\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -44,7 +44,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -75,31 +75,17 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completions__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/service/controller/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_service", + "metric.label.spin_variant" + ], + "unitOverride": "ns" } } ], @@ -122,7 +108,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operations__count\" AND metric.label.success=\"true\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operation_latencies__count\" AND metric.label.success=True", "perSeriesAligner": "ALIGN_DELTA", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -137,7 +123,7 @@ }, { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operations__count\" AND metric.label.success!=\"true\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/clouddriver/operation_latencies__count\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_DELTA", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -170,7 +156,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/withType__count\" AND metric.label.success!=\"true\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/with_type_latencies__count\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_DELTA", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -240,7 +226,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/withType__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/with_type_latencies__count\"", "perSeriesAligner": "ALIGN_DELTA", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -265,29 +251,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/withType__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/withType__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/workflow/task/execution/completions/with_type_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_service" + ], + "unitOverride": "ns" } } ], @@ -310,7 +283,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag_latencies__count\"", "perSeriesAligner": "ALIGN_DELTA", "crossSeriesReducer": "REDUCE_SUM", "secondaryCrossSeriesReducer": "REDUCE_NONE", @@ -335,29 +308,16 @@ "xyChart": { "dataSets": [ { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag__count\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/queue/message/lag_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_service" + ], + "unitOverride": "ns" } } ], @@ -380,7 +340,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completions__count\" AND metric.label.success!=\"true\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completion_latencies__count\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -388,7 +348,7 @@ }, { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -396,7 +356,7 @@ }, { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__count\" AND metric.label.status!=\"2xx\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completion_latencies__count\" AND metric.label.status_code_class!=\"2xx\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -404,7 +364,7 @@ }, { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completions__count\" AND metric.label.success!=\"true\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completion_latencies__count\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -412,7 +372,7 @@ }, { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\" AND metric.label.success!=\"true\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\" AND metric.label.success!=True", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -437,7 +397,7 @@ "dataSets": [ { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -445,7 +405,7 @@ }, { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -453,7 +413,7 @@ }, { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -461,7 +421,7 @@ }, { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -469,7 +429,7 @@ }, { "timeSeriesFilter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\"", + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies__count\"", "perSeriesAligner": "ALIGN_RATE", "crossSeriesReducer": "REDUCE_SUM" }, @@ -495,146 +455,73 @@ { "timeSeriesFilterRatio": { "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completions__count\"", - - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - } + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/appengine/deploy/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_service", + "metric.label.spin_variant" + ], + "unitOverride": "ns" } }, { "timeSeriesFilterRatio": { "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completions__count\"", - - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - } + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/aws/api/http/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_service", + "metric.label.spin_variant" + ], + "unitOverride": "ns" } }, { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completions__count\"", - - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/compute/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_service", + "metric.label.spin_variant" + ], + "unitOverride": "ns" } }, { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completions__count\"", - - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/google/api/storage/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_service", + "metric.label.spin_variant" + ], + "unitOverride": "ns" } }, { - "timeSeriesFilterRatio": { - "numerator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/completions__totalTime\"", - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - }, - "denominator_filter": { - "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/api/completions__count\"", - - "perSeriesAligner": "ALIGN_DELTA", - "crossSeriesReducer": "REDUCE_SUM", - "secondaryCrossSeriesReducer": "REDUCE_NONE", - "minAlignmentPeriod": "60s", - "groupByFields": [ - "metric.label.spin_service", - "metric.label.spin_variant" - ], - "unitOverride": "1" - } + "timeSeriesFilter": { + "filter": "metric.type=\"custom.googleapis.com/spinnaker/platform/kubernetes/completion_latencies\"", + "perSeriesAligner": "ALIGN_DELTA", + "crossSeriesReducer": "REDUCE_MEAN", + "secondaryCrossSeriesReducer": "REDUCE_NONE", + "minAlignmentPeriod": "60s", + "groupByFields": [ + "metric.label.spin_service", + "metric.label.spin_variant" + ], + "unitOverride": "ns" } } ],