public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dashboard: Backend always set metricEditorMode: 0 regardless metricQueryType and expression (#111613)

Browse Source 
- Fix metricEditorMode logic to match frontend hasOwnProperty behavior
- Fix metricQueryType to only set when property doesn't exist
- Fix statistics processing to handle all types like frontend does
- Fix null statistic handling to match frontend behavior
- Fix object string representation to match JavaScript behavior
- Add comprehensive test coverage for all CloudWatch migration scenarios
- Achieve 100% backend-frontend consistency for v34 migration

* Fix v34 CloudWatch migration backend-frontend inconsistencies

- Fix metricEditorMode logic to match frontend hasOwnProperty behavior
- Fix metricQueryType to only set when property doesn't exist
- Fix statistics processing to handle all types like frontend does
- Fix null statistic handling to match frontend behavior
- Fix object string representation to match JavaScript behavior
- Add comprehensive test coverage for all CloudWatch migration scenarios
- Achieve 100% backend-frontend consistency for v34 migration

* Improve v34 CloudWatch migration test coverage

- Add targeted tests for hasOwnProperty logic coverage
- Add comprehensive getSuffixForStat coverage (all data types)
- Add generateNextRefId double letter generation tests
- Simplify test cases while maintaining full coverage
- Achieve 93%+ coverage on all critical v34 functions
- Remove redundant test cases for better maintainability

* Clean up v34 CloudWatch migration code

- Remove unnecessary comments and documentation
- Simplify function signatures and logic
- Maintain functionality while improving readability
- Keep essential logic intact with cleaner code

* Only remove unnecessary comments
This commit is contained in:
Ivan Ortega Alba
2025-09-29 11:35:58 +02:00
committed by GitHub
parent 512c292e04
commit 6d2fa6c583
5 changed files with 1297 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/pkg/migration/testdata/output/latest_version/v34.multiple_stats_cloudwatch.v42.json
Vendored
+367 -1
View File
@@ -80,6 +80,39 @@
"region": "us-east-1",
"statistic": "InvalidStat"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-annotation"
},
"enable": true,
"iconColor": "orange",
"name": "CloudWatch Annotation with Null in Statistics - null",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-annotation"
},
"enable": true,
"iconColor": "pink",
"name": "CloudWatch Annotation Only Invalid Statistics - 123",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": 123
},
{
"datasource": {
"uid": "prometheus"
@@ -171,6 +204,74 @@
"prefixMatching": false,
"region": "us-east-1",
"statistic": "Average"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-annotation"
},
"enable": true,
"iconColor": "orange",
"name": "CloudWatch Annotation with Null in Statistics - Average",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": "Average"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-annotation"
},
"enable": true,
"iconColor": "orange",
"name": "CloudWatch Annotation with Null in Statistics - ",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": ""
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-annotation"
},
"enable": true,
"iconColor": "pink",
"name": "CloudWatch Annotation Only Invalid Statistics - true",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": true
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-annotation"
},
"enable": true,
"iconColor": "pink",
"name": "CloudWatch Annotation Only Invalid Statistics - [object Object]",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": {}
}
]
},
@@ -631,9 +732,274 @@
},
{
"datasource": {
"uid": "prometheus"
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 10,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-missing-fields"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1",
"statistic": "Average"
}
],
"title": "CloudWatch Query Missing Editor Fields",
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 11,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-with-expression"
},
"expression": "SEARCH('{AWS/EC2,InstanceId} MetricName=\"CPUUtilization\"', 'Average', 300)",
"metricEditorMode": 1,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1",
"statistic": "Average"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-with-expression"
},
"expression": "SEARCH('{AWS/EC2,InstanceId} MetricName=\"CPUUtilization\"', 'Average', 300)",
"metricEditorMode": 1,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "B",
"region": "us-east-1",
"statistic": "Maximum"
}
],
"title": "CloudWatch Query with Expression (Code Mode)",
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 12,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-insights"
},
"metricEditorMode": 1,
"metricName": "CPUUtilization",
"metricQueryType": 1,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1",
"statistic": "Average"
}
],
"title": "CloudWatch Insights Query Missing Editor Mode",
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 13,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-stats"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-stats"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "B",
"region": "us-east-1",
"statistic": "Average"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-stats"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "C",
"region": "us-east-1",
"statistic": ""
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-stats"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "D",
"region": "us-east-1",
"statistic": "Maximum"
}
],
"title": "CloudWatch Query with Null Statistics",
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 14,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-only"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1",
"statistic": 123
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-only"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "B",
"region": "us-east-1",
"statistic": true
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-only"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "C",
"region": "us-east-1",
"statistic": {}
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-only"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "D",
"region": "us-east-1",
"statistic": []
}
],
"title": "CloudWatch Query with Only Invalid Statistics",
"type": "timeseries"
},
{
"datasource": {
"uid": "prometheus"
},
"id": 15,
"targets": [
{
"datasource": {
apps/dashboard/pkg/migration/testdata/output/single_version/v34.multiple_stats_cloudwatch.v34.json
Vendored
+367 -1
View File
@@ -80,6 +80,39 @@
"region": "us-east-1",
"statistic": "InvalidStat"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-annotation"
},
"enable": true,
"iconColor": "orange",
"name": "CloudWatch Annotation with Null in Statistics - null",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-annotation"
},
"enable": true,
"iconColor": "pink",
"name": "CloudWatch Annotation Only Invalid Statistics - 123",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": 123
},
{
"datasource": {
"uid": "prometheus"
@@ -171,6 +204,74 @@
"prefixMatching": false,
"region": "us-east-1",
"statistic": "Average"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-annotation"
},
"enable": true,
"iconColor": "orange",
"name": "CloudWatch Annotation with Null in Statistics - Average",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": "Average"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-annotation"
},
"enable": true,
"iconColor": "orange",
"name": "CloudWatch Annotation with Null in Statistics - ",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": ""
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-annotation"
},
"enable": true,
"iconColor": "pink",
"name": "CloudWatch Annotation Only Invalid Statistics - true",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": true
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-annotation"
},
"enable": true,
"iconColor": "pink",
"name": "CloudWatch Annotation Only Invalid Statistics - [object Object]",
"namespace": "AWS/EC2",
"prefixMatching": false,
"region": "us-east-1",
"statistic": {}
}
]
},
@@ -631,9 +732,274 @@
},
{
"datasource": {
"uid": "prometheus"
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 10,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-missing-fields"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1",
"statistic": "Average"
}
],
"title": "CloudWatch Query Missing Editor Fields",
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 11,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-with-expression"
},
"expression": "SEARCH('{AWS/EC2,InstanceId} MetricName=\"CPUUtilization\"', 'Average', 300)",
"metricEditorMode": 1,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1",
"statistic": "Average"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-with-expression"
},
"expression": "SEARCH('{AWS/EC2,InstanceId} MetricName=\"CPUUtilization\"', 'Average', 300)",
"metricEditorMode": 1,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "B",
"region": "us-east-1",
"statistic": "Maximum"
}
],
"title": "CloudWatch Query with Expression (Code Mode)",
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 12,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-insights"
},
"metricEditorMode": 1,
"metricName": "CPUUtilization",
"metricQueryType": 1,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1",
"statistic": "Average"
}
],
"title": "CloudWatch Insights Query Missing Editor Mode",
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 13,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-stats"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-stats"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "B",
"region": "us-east-1",
"statistic": "Average"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-stats"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "C",
"region": "us-east-1",
"statistic": ""
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-null-stats"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "D",
"region": "us-east-1",
"statistic": "Maximum"
}
],
"title": "CloudWatch Query with Null Statistics",
"type": "timeseries"
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"id": 14,
"targets": [
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-only"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "A",
"region": "us-east-1",
"statistic": 123
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-only"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "B",
"region": "us-east-1",
"statistic": true
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-only"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "C",
"region": "us-east-1",
"statistic": {}
},
{
"datasource": {
"apiVersion": "v1",
"type": "prometheus",
"uid": "default-ds-uid"
},
"dimensions": {
"InstanceId": "i-invalid-only"
},
"metricEditorMode": 0,
"metricName": "CPUUtilization",
"metricQueryType": 0,
"namespace": "AWS/EC2",
"refId": "D",
"region": "us-east-1",
"statistic": []
}
],
"title": "CloudWatch Query with Only Invalid Statistics",
"type": "timeseries"
},
{
"datasource": {
"uid": "prometheus"
},
"id": 15,
"targets": [
{
"datasource": {