254577ba56
* 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>
201 lines
8.0 KiB
Go
201 lines
8.0 KiB
Go
package services
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
|
|
"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"
|
|
)
|
|
|
|
func Test_GetLogGroups(t *testing.T) {
|
|
t.Run("Should map log groups response", func(t *testing.T) {
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(
|
|
&cloudwatchlogs.DescribeLogGroupsOutput{
|
|
LogGroups: []*cloudwatchlogs.LogGroup{
|
|
{Arn: utils.Pointer("arn:aws:logs:us-east-1:111:log-group:group_a"), LogGroupName: utils.Pointer("group_a")},
|
|
{Arn: utils.Pointer("arn:aws:logs:us-east-1:222:log-group:group_b"), LogGroupName: utils.Pointer("group_b")},
|
|
{Arn: utils.Pointer("arn:aws:logs:us-east-1:333:log-group:group_c"), LogGroupName: utils.Pointer("group_c")},
|
|
},
|
|
}, nil)
|
|
service := NewLogGroupsService(mockLogsAPI, false)
|
|
|
|
resp, err := service.GetLogGroups(resources.LogGroupsRequest{})
|
|
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, []resources.ResourceResponse[resources.LogGroup]{
|
|
{
|
|
AccountId: utils.Pointer("111"),
|
|
Value: resources.LogGroup{Arn: "arn:aws:logs:us-east-1:111:log-group:group_a", Name: "group_a"},
|
|
},
|
|
{
|
|
AccountId: utils.Pointer("222"),
|
|
Value: resources.LogGroup{Arn: "arn:aws:logs:us-east-1:222:log-group:group_b", Name: "group_b"},
|
|
},
|
|
{
|
|
AccountId: utils.Pointer("333"),
|
|
Value: resources.LogGroup{Arn: "arn:aws:logs:us-east-1:333:log-group:group_c", Name: "group_c"},
|
|
},
|
|
}, resp)
|
|
})
|
|
|
|
t.Run("Should only use LogGroupNamePrefix even if LogGroupNamePattern passed in resource call", func(t *testing.T) {
|
|
// TODO: use LogGroupNamePattern when we have accounted for its behavior, still a little unexpected at the moment
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
|
|
service := NewLogGroupsService(mockLogsAPI, false)
|
|
|
|
_, err := service.GetLogGroups(resources.LogGroupsRequest{
|
|
Limit: 0,
|
|
LogGroupNamePrefix: utils.Pointer("test"),
|
|
})
|
|
|
|
assert.NoError(t, err)
|
|
mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
|
|
Limit: utils.Pointer(int64(0)),
|
|
LogGroupNamePrefix: utils.Pointer("test"),
|
|
})
|
|
})
|
|
|
|
t.Run("Should call api without LogGroupNamePrefix nor LogGroupNamePattern if not passed in resource call", func(t *testing.T) {
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
|
|
service := NewLogGroupsService(mockLogsAPI, false)
|
|
|
|
_, err := service.GetLogGroups(resources.LogGroupsRequest{})
|
|
|
|
assert.NoError(t, err)
|
|
mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
|
|
Limit: utils.Pointer(int64(0)),
|
|
})
|
|
})
|
|
|
|
t.Run("Should return an error when API returns error", func(t *testing.T) {
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{},
|
|
fmt.Errorf("some error"))
|
|
service := NewLogGroupsService(mockLogsAPI, false)
|
|
|
|
_, err := service.GetLogGroups(resources.LogGroupsRequest{})
|
|
|
|
assert.Error(t, err)
|
|
assert.Equal(t, "some error", err.Error())
|
|
})
|
|
}
|
|
|
|
func Test_GetLogGroups_crossAccountQuerying(t *testing.T) {
|
|
t.Run("Should not includeLinkedAccounts or accountId if isCrossAccountEnabled is set to false", func(t *testing.T) {
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
|
|
service := NewLogGroupsService(mockLogsAPI, false)
|
|
|
|
_, err := service.GetLogGroups(resources.LogGroupsRequest{
|
|
ResourceRequest: resources.ResourceRequest{AccountId: utils.Pointer("accountId")},
|
|
LogGroupNamePrefix: utils.Pointer("prefix"),
|
|
})
|
|
|
|
assert.NoError(t, err)
|
|
mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
|
|
Limit: utils.Pointer(int64(0)),
|
|
LogGroupNamePrefix: utils.Pointer("prefix"),
|
|
})
|
|
})
|
|
|
|
t.Run("Should replace LogGroupNamePrefix if LogGroupNamePattern passed in resource call", func(t *testing.T) {
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
|
|
service := NewLogGroupsService(mockLogsAPI, true)
|
|
|
|
_, err := service.GetLogGroups(resources.LogGroupsRequest{
|
|
ResourceRequest: resources.ResourceRequest{AccountId: utils.Pointer("accountId")},
|
|
LogGroupNamePrefix: utils.Pointer("prefix"),
|
|
LogGroupNamePattern: utils.Pointer("pattern"),
|
|
})
|
|
|
|
assert.NoError(t, err)
|
|
mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
|
|
AccountIdentifiers: []*string{utils.Pointer("accountId")},
|
|
Limit: utils.Pointer(int64(0)),
|
|
LogGroupNamePrefix: utils.Pointer("pattern"),
|
|
IncludeLinkedAccounts: utils.Pointer(true),
|
|
})
|
|
})
|
|
|
|
t.Run("Should includeLinkedAccounts,and accountId if isCrossAccountEnabled is set to true", func(t *testing.T) {
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
|
|
service := NewLogGroupsService(mockLogsAPI, true)
|
|
|
|
_, err := service.GetLogGroups(resources.LogGroupsRequest{
|
|
ResourceRequest: resources.ResourceRequest{AccountId: utils.Pointer("accountId")},
|
|
})
|
|
|
|
assert.NoError(t, err)
|
|
mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
|
|
Limit: utils.Pointer(int64(0)),
|
|
IncludeLinkedAccounts: utils.Pointer(true),
|
|
AccountIdentifiers: []*string{utils.Pointer("accountId")},
|
|
})
|
|
})
|
|
|
|
t.Run("Should should not override prefix is there is no logGroupNamePattern", func(t *testing.T) {
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
|
|
service := NewLogGroupsService(mockLogsAPI, true)
|
|
|
|
_, err := service.GetLogGroups(resources.LogGroupsRequest{
|
|
ResourceRequest: resources.ResourceRequest{AccountId: utils.Pointer("accountId")},
|
|
LogGroupNamePrefix: utils.Pointer("prefix"),
|
|
})
|
|
assert.NoError(t, err)
|
|
mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
|
|
AccountIdentifiers: []*string{utils.Pointer("accountId")},
|
|
Limit: utils.Pointer(int64(0)),
|
|
LogGroupNamePrefix: utils.Pointer("prefix"),
|
|
IncludeLinkedAccounts: utils.Pointer(true),
|
|
})
|
|
})
|
|
|
|
t.Run("Should not includeLinkedAccounts, or accountId if accountId is nil", func(t *testing.T) {
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
|
|
service := NewLogGroupsService(mockLogsAPI, true)
|
|
|
|
_, err := service.GetLogGroups(resources.LogGroupsRequest{
|
|
LogGroupNamePrefix: utils.Pointer("prefix"),
|
|
})
|
|
|
|
assert.NoError(t, err)
|
|
mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
|
|
Limit: utils.Pointer(int64(0)),
|
|
LogGroupNamePrefix: utils.Pointer("prefix"),
|
|
})
|
|
})
|
|
|
|
t.Run("Should should not override prefix is there is no logGroupNamePattern", func(t *testing.T) {
|
|
mockLogsAPI := &mocks.LogsAPI{}
|
|
mockLogsAPI.On("DescribeLogGroups", mock.Anything).Return(&cloudwatchlogs.DescribeLogGroupsOutput{}, nil)
|
|
service := NewLogGroupsService(mockLogsAPI, true)
|
|
|
|
_, err := service.GetLogGroups(resources.LogGroupsRequest{
|
|
ResourceRequest: resources.ResourceRequest{
|
|
AccountId: utils.Pointer("accountId"),
|
|
},
|
|
LogGroupNamePrefix: utils.Pointer("prefix"),
|
|
})
|
|
|
|
assert.NoError(t, err)
|
|
mockLogsAPI.AssertCalled(t, "DescribeLogGroups", &cloudwatchlogs.DescribeLogGroupsInput{
|
|
AccountIdentifiers: []*string{utils.Pointer("accountId")},
|
|
IncludeLinkedAccounts: utils.Pointer(true),
|
|
Limit: utils.Pointer(int64(0)),
|
|
LogGroupNamePrefix: utils.Pointer("prefix"),
|
|
})
|
|
})
|
|
}
|