mirror of
https://github.com/grafana/grafana.git
synced 2025-02-20 11:48:34 -06:00
* Lattice: Point to private prerelease of aws-sdk-go (#515) * point to private prerelease of aws-sdk-go * fix build issue * Lattice: Adding a feature toggle (#549) * Adding a feature toggle for lattice * Change name of feature toggle * Lattice: List accounts (#543) * Separate layers * Introduce testify/mock library Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> * point to version that includes metric api changes (#574) * add accounts component (#575) * Test refactor: remove unneeded clientFactoryMock (#581) * Lattice: Add monitoring badge (#576) * add monitoring badge * fix tests * solve conflict * Lattice: Add dynamic label for account display name (#579) * Build: Automatically sync lattice-main with OSS * Lattice: Point to private prerelease of aws-sdk-go (#515) * point to private prerelease of aws-sdk-go * fix build issue * Lattice: Adding a feature toggle (#549) * Adding a feature toggle for lattice * Change name of feature toggle * Lattice: List accounts (#543) * Separate layers * Introduce testify/mock library Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> * point to version that includes metric api changes (#574) * add accounts component (#575) * Test refactor: remove unneeded clientFactoryMock (#581) * Lattice: Add monitoring badge (#576) * add monitoring badge * fix tests * solve conflict * add account label Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * fix import * solve merge related problem * add account info (#608) * add back namespaces handler * Lattice: Parse account id and return it to frontend (#609) * parse account id and return to frontend * fix route test * only show badge when feature toggle is enabled (#615) * Lattice: Refactor resource response type and return account (#613) * refactor resource response type * remove not used file. * go lint * fix tests * remove commented code * Lattice: Use account as input when listing metric names and dimensions (#611) * use account in resource requests * add account to response * revert accountInfo to accountId * PR feedback * unit test account in list metrics response * remove not used asserts * don't assert on response that is not relevant to the test * removed dupe test * pr feedback * rename request package (#626) * Lattice: Move account component and add tooltip (#630) * move accounts component to the top of metric stat editor * add tooltip * CloudWatch: add account to GetMetricData queries (#627) * Add AccountId to metric stat query * Lattice: Account variable support (#625) * add variable support in accounts component * add account variable query type * update variables * interpolate variable before its sent to backend * handle variable change in hooks * remove not used import * Update public/app/plugins/datasource/cloudwatch/components/Account.tsx Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * Update public/app/plugins/datasource/cloudwatch/hooks.ts Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * add one more unit test Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * cleanup (#629) * Set account Id according to crossAccountQuerying feature flag in backend (#632) * CloudWatch: Change spelling of feature-toggle (#634) * Lattice Logs (#631) * Lattice Logs * Fixes after CR * Lattice: Bug: fix dimension keys request (#644) * fix dimension keys * fix lint * more lint * CloudWatch: Add tests for QueryData with AccountId (#637) * Update from breaking change (#645) * Update from breaking change * Remove extra interface and methods Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> * CloudWatch: Add business logic layer for getting log groups (#642) Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * Lattice: Fix - unset account id in region change handler (#646) * move reset of account to region change handler * fix broken test * Lattice: Add account id to metric stat query deep link (#656) add account id to metric stat link * CloudWatch: Add new log groups handler for cross-account querying (#643) * Lattice: Add feature tracking (#660) * add tracking for account id prescense in metrics query * also check feature toggle * fix broken test * CloudWatch: Add route for DescribeLogGroups for cross-account querying (#647) Co-authored-by: Erik Sundell <erik.sundell87@gmail.com> * Lattice: Handle account id default value (#662) * make sure right type is returned * set right default values * Suggestions to lattice changes (#663) * Change ListMetricsWithPageLimit response to slice of non-pointers * Change GetAccountsForCurrentUserOrRole response to be not pointer * Clean test Cleanup calls in test * Remove CloudWatchAPI as part of mock * Resolve conflicts * Add Latest SDK (#672) * add tooltip (#674) * Docs: Add documentation for CloudWatch cross account querying (#676) * wip docs * change wordings * add sections about metrics and logs * change from monitoring to observability * Update docs/sources/datasources/aws-cloudwatch/_index.md Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com> * Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com> * Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> * Update docs/sources/datasources/aws-cloudwatch/query-editor/index.md Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com> * apply pr feedback * fix file name * more pr feedback * pr feedback Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com> * use latest version of the aws-sdk-go * Fix tests' mock response type * Remove change in Azure Monitor Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com> Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com> Co-authored-by: Fiona Artiaga <89225282+GrafanaWriter@users.noreply.github.com>
199 lines
8.3 KiB
Go
199 lines
8.3 KiB
Go
package services
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/aws/aws-sdk-go/aws"
|
|
"github.com/aws/aws-sdk-go/service/cloudwatch"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/mocks"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/utils"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
const useLinkedAccountsId = "all"
|
|
|
|
var metricResponse = []resources.MetricResponse{
|
|
{
|
|
Metric: &cloudwatch.Metric{
|
|
MetricName: aws.String("CPUUtilization"),
|
|
Namespace: aws.String("AWS/EC2"),
|
|
Dimensions: []*cloudwatch.Dimension{
|
|
{Name: aws.String("InstanceId"), Value: aws.String("i-1234567890abcdef0")},
|
|
{Name: aws.String("InstanceType"), Value: aws.String("t2.micro")},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Metric: &cloudwatch.Metric{
|
|
MetricName: aws.String("CPUUtilization"),
|
|
Namespace: aws.String("AWS/EC2"),
|
|
Dimensions: []*cloudwatch.Dimension{
|
|
{Name: aws.String("InstanceId"), Value: aws.String("i-5234567890abcdef0")},
|
|
{Name: aws.String("InstanceType"), Value: aws.String("t2.micro")},
|
|
{Name: aws.String("AutoScalingGroupName"), Value: aws.String("my-asg")},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Metric: &cloudwatch.Metric{
|
|
MetricName: aws.String("CPUUtilization"),
|
|
Namespace: aws.String("AWS/EC2"),
|
|
Dimensions: []*cloudwatch.Dimension{
|
|
{Name: aws.String("InstanceId"), Value: aws.String("i-64234567890abcdef0")},
|
|
{Name: aws.String("InstanceType"), Value: aws.String("t3.micro")},
|
|
{Name: aws.String("AutoScalingGroupName"), Value: aws.String("my-asg2")},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
type validateInputTestCase[T resources.DimensionKeysRequest | resources.DimensionValuesRequest] struct {
|
|
name string
|
|
input T
|
|
listMetricsWithPageLimitInput *cloudwatch.ListMetricsInput
|
|
}
|
|
|
|
func TestListMetricsService_GetDimensionKeysByDimensionFilter(t *testing.T) {
|
|
t.Run("Should filter out duplicates and keys matching dimension filter keys", func(t *testing.T) {
|
|
fakeMetricsClient := &mocks.FakeMetricsClient{}
|
|
fakeMetricsClient.On("ListMetricsWithPageLimit", mock.Anything).Return(metricResponse, nil)
|
|
listMetricsService := NewListMetricsService(fakeMetricsClient)
|
|
|
|
resp, err := listMetricsService.GetDimensionKeysByDimensionFilter(resources.DimensionKeysRequest{
|
|
ResourceRequest: &resources.ResourceRequest{Region: "us-east-1"},
|
|
Namespace: "AWS/EC2",
|
|
MetricName: "CPUUtilization",
|
|
DimensionFilter: []*resources.Dimension{{Name: "InstanceId", Value: ""}},
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []resources.ResourceResponse[string]{{Value: "InstanceType"}, {Value: "AutoScalingGroupName"}}, resp)
|
|
})
|
|
|
|
testCases := []validateInputTestCase[resources.DimensionKeysRequest]{
|
|
{
|
|
name: "Should set account correctly on list metric input if it cross account is defined on the request",
|
|
input: resources.DimensionKeysRequest{
|
|
ResourceRequest: &resources.ResourceRequest{Region: "us-east-1", AccountId: utils.Pointer(useLinkedAccountsId)},
|
|
Namespace: "AWS/EC2",
|
|
MetricName: "CPUUtilization",
|
|
DimensionFilter: []*resources.Dimension{{Name: "InstanceId", Value: ""}},
|
|
},
|
|
listMetricsWithPageLimitInput: &cloudwatch.ListMetricsInput{
|
|
MetricName: aws.String("CPUUtilization"),
|
|
Namespace: aws.String("AWS/EC2"),
|
|
Dimensions: []*cloudwatch.DimensionFilter{{Name: aws.String("InstanceId")}},
|
|
IncludeLinkedAccounts: aws.Bool(true),
|
|
},
|
|
},
|
|
{
|
|
name: "Should set account correctly on list metric input if single account is defined on the request",
|
|
input: resources.DimensionKeysRequest{
|
|
ResourceRequest: &resources.ResourceRequest{Region: "us-east-1", AccountId: utils.Pointer("1234567890")},
|
|
Namespace: "AWS/EC2",
|
|
MetricName: "CPUUtilization",
|
|
DimensionFilter: []*resources.Dimension{{Name: "InstanceId", Value: ""}},
|
|
},
|
|
listMetricsWithPageLimitInput: &cloudwatch.ListMetricsInput{
|
|
MetricName: aws.String("CPUUtilization"),
|
|
Namespace: aws.String("AWS/EC2"),
|
|
Dimensions: []*cloudwatch.DimensionFilter{{Name: aws.String("InstanceId")}},
|
|
IncludeLinkedAccounts: aws.Bool(true),
|
|
OwningAccount: aws.String("1234567890"),
|
|
},
|
|
},
|
|
{
|
|
name: "Should not set namespace and metricName on list metric input if empty strings are set for these in the request",
|
|
input: resources.DimensionKeysRequest{
|
|
ResourceRequest: &resources.ResourceRequest{Region: "us-east-1"},
|
|
Namespace: "",
|
|
MetricName: "",
|
|
DimensionFilter: []*resources.Dimension{{Name: "InstanceId", Value: ""}},
|
|
},
|
|
listMetricsWithPageLimitInput: &cloudwatch.ListMetricsInput{Dimensions: []*cloudwatch.DimensionFilter{{Name: aws.String("InstanceId")}}},
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
fakeMetricsClient := &mocks.FakeMetricsClient{}
|
|
fakeMetricsClient.On("ListMetricsWithPageLimit", mock.Anything).Return(metricResponse, nil)
|
|
listMetricsService := NewListMetricsService(fakeMetricsClient)
|
|
res, err := listMetricsService.GetDimensionKeysByDimensionFilter(tc.input)
|
|
require.NoError(t, err)
|
|
require.NotEmpty(t, res)
|
|
fakeMetricsClient.AssertCalled(t, "ListMetricsWithPageLimit", tc.listMetricsWithPageLimitInput)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestListMetricsService_GetDimensionValuesByDimensionFilter(t *testing.T) {
|
|
t.Run("Should filter out duplicates and keys matching dimension filter keys", func(t *testing.T) {
|
|
fakeMetricsClient := &mocks.FakeMetricsClient{}
|
|
fakeMetricsClient.On("ListMetricsWithPageLimit", mock.Anything).Return(metricResponse, nil)
|
|
listMetricsService := NewListMetricsService(fakeMetricsClient)
|
|
|
|
resp, err := listMetricsService.GetDimensionValuesByDimensionFilter(resources.DimensionValuesRequest{
|
|
ResourceRequest: &resources.ResourceRequest{Region: "us-east-1"},
|
|
Namespace: "AWS/EC2",
|
|
MetricName: "CPUUtilization",
|
|
DimensionKey: "InstanceId",
|
|
DimensionFilter: []*resources.Dimension{
|
|
{Name: "InstanceId", Value: ""},
|
|
},
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
assert.Equal(t, []resources.ResourceResponse[string]{{Value: "i-1234567890abcdef0"}, {Value: "i-5234567890abcdef0"}, {Value: "i-64234567890abcdef0"}}, resp)
|
|
})
|
|
|
|
testCases := []validateInputTestCase[resources.DimensionValuesRequest]{
|
|
{
|
|
name: "Should set account correctly on list metric input if it cross account is defined on the request",
|
|
input: resources.DimensionValuesRequest{
|
|
ResourceRequest: &resources.ResourceRequest{Region: "us-east-1", AccountId: utils.Pointer(useLinkedAccountsId)},
|
|
Namespace: "AWS/EC2",
|
|
MetricName: "CPUUtilization",
|
|
DimensionFilter: []*resources.Dimension{{Name: "InstanceId", Value: ""}},
|
|
},
|
|
listMetricsWithPageLimitInput: &cloudwatch.ListMetricsInput{
|
|
MetricName: aws.String("CPUUtilization"),
|
|
Namespace: aws.String("AWS/EC2"),
|
|
Dimensions: []*cloudwatch.DimensionFilter{{Name: aws.String("InstanceId")}},
|
|
IncludeLinkedAccounts: aws.Bool(true),
|
|
},
|
|
},
|
|
{
|
|
name: "Should set account correctly on list metric input if single account is defined on the request",
|
|
input: resources.DimensionValuesRequest{
|
|
ResourceRequest: &resources.ResourceRequest{Region: "us-east-1", AccountId: utils.Pointer("1234567890")},
|
|
Namespace: "AWS/EC2",
|
|
MetricName: "CPUUtilization",
|
|
DimensionFilter: []*resources.Dimension{{Name: "InstanceId", Value: ""}},
|
|
},
|
|
listMetricsWithPageLimitInput: &cloudwatch.ListMetricsInput{
|
|
MetricName: aws.String("CPUUtilization"),
|
|
Namespace: aws.String("AWS/EC2"),
|
|
Dimensions: []*cloudwatch.DimensionFilter{{Name: aws.String("InstanceId")}},
|
|
IncludeLinkedAccounts: aws.Bool(true),
|
|
OwningAccount: aws.String("1234567890"),
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
fakeMetricsClient := &mocks.FakeMetricsClient{}
|
|
fakeMetricsClient.On("ListMetricsWithPageLimit", mock.Anything).Return(metricResponse, nil)
|
|
listMetricsService := NewListMetricsService(fakeMetricsClient)
|
|
res, err := listMetricsService.GetDimensionValuesByDimensionFilter(tc.input)
|
|
require.NoError(t, err)
|
|
require.Empty(t, res)
|
|
fakeMetricsClient.AssertCalled(t, "ListMetricsWithPageLimit", tc.listMetricsWithPageLimitInput)
|
|
})
|
|
}
|
|
}
|