* 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>
142 lines
4.1 KiB
Go
142 lines
4.1 KiB
Go
package services
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
|
|
"github.com/aws/aws-sdk-go/aws"
|
|
"github.com/aws/aws-sdk-go/service/cloudwatch"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models"
|
|
"github.com/grafana/grafana/pkg/tsdb/cloudwatch/models/resources"
|
|
)
|
|
|
|
type ListMetricsService struct {
|
|
models.MetricsClientProvider
|
|
}
|
|
|
|
func NewListMetricsService(metricsClient models.MetricsClientProvider) models.ListMetricsProvider {
|
|
return &ListMetricsService{metricsClient}
|
|
}
|
|
|
|
func (l *ListMetricsService) GetDimensionKeysByDimensionFilter(r resources.DimensionKeysRequest) ([]resources.ResourceResponse[string], error) {
|
|
input := &cloudwatch.ListMetricsInput{}
|
|
if r.Namespace != "" {
|
|
input.Namespace = aws.String(r.Namespace)
|
|
}
|
|
if r.MetricName != "" {
|
|
input.MetricName = aws.String(r.MetricName)
|
|
}
|
|
setDimensionFilter(input, r.DimensionFilter)
|
|
setAccount(input, r.ResourceRequest)
|
|
|
|
metrics, err := l.ListMetricsWithPageLimit(input)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%v: %w", "unable to call AWS API", err)
|
|
}
|
|
|
|
response := []resources.ResourceResponse[string]{}
|
|
// remove duplicates
|
|
dupCheck := make(map[string]struct{})
|
|
for _, metric := range metrics {
|
|
for _, dim := range metric.Dimensions {
|
|
if _, exists := dupCheck[*dim.Name]; exists {
|
|
continue
|
|
}
|
|
|
|
// keys in the dimension filter should not be included
|
|
dimensionFilterExist := false
|
|
for _, d := range r.DimensionFilter {
|
|
if d.Name == *dim.Name {
|
|
dimensionFilterExist = true
|
|
break
|
|
}
|
|
}
|
|
|
|
if dimensionFilterExist {
|
|
continue
|
|
}
|
|
|
|
dupCheck[*dim.Name] = struct{}{}
|
|
response = append(response, resources.ResourceResponse[string]{AccountId: metric.AccountId, Value: *dim.Name})
|
|
}
|
|
}
|
|
|
|
return response, nil
|
|
}
|
|
|
|
func (l *ListMetricsService) GetDimensionValuesByDimensionFilter(r resources.DimensionValuesRequest) ([]resources.ResourceResponse[string], error) {
|
|
input := &cloudwatch.ListMetricsInput{
|
|
Namespace: aws.String(r.Namespace),
|
|
MetricName: aws.String(r.MetricName),
|
|
}
|
|
setDimensionFilter(input, r.DimensionFilter)
|
|
setAccount(input, r.ResourceRequest)
|
|
|
|
metrics, err := l.ListMetricsWithPageLimit(input)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%v: %w", "unable to call AWS API", err)
|
|
}
|
|
|
|
response := []resources.ResourceResponse[string]{}
|
|
dupCheck := make(map[string]bool)
|
|
for _, metric := range metrics {
|
|
for _, dim := range metric.Dimensions {
|
|
if *dim.Name == r.DimensionKey {
|
|
if _, exists := dupCheck[*dim.Value]; exists {
|
|
continue
|
|
}
|
|
|
|
dupCheck[*dim.Value] = true
|
|
response = append(response, resources.ResourceResponse[string]{AccountId: metric.AccountId, Value: *dim.Value})
|
|
}
|
|
}
|
|
}
|
|
|
|
sort.Slice(response, func(i, j int) bool {
|
|
return response[i].Value < response[j].Value
|
|
})
|
|
return response, nil
|
|
}
|
|
|
|
func (l *ListMetricsService) GetMetricsByNamespace(r resources.MetricsRequest) ([]resources.ResourceResponse[resources.Metric], error) {
|
|
input := &cloudwatch.ListMetricsInput{Namespace: aws.String(r.Namespace)}
|
|
setAccount(input, r.ResourceRequest)
|
|
metrics, err := l.ListMetricsWithPageLimit(input)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
response := []resources.ResourceResponse[resources.Metric]{}
|
|
dupCheck := make(map[string]struct{})
|
|
for _, metric := range metrics {
|
|
if _, exists := dupCheck[*metric.MetricName]; exists {
|
|
continue
|
|
}
|
|
dupCheck[*metric.MetricName] = struct{}{}
|
|
response = append(response, resources.ResourceResponse[resources.Metric]{AccountId: metric.AccountId, Value: resources.Metric{Name: *metric.MetricName, Namespace: *metric.Namespace}})
|
|
}
|
|
|
|
return response, nil
|
|
}
|
|
|
|
func setDimensionFilter(input *cloudwatch.ListMetricsInput, dimensionFilter []*resources.Dimension) {
|
|
for _, dimension := range dimensionFilter {
|
|
df := &cloudwatch.DimensionFilter{
|
|
Name: aws.String(dimension.Name),
|
|
}
|
|
if dimension.Value != "" {
|
|
df.Value = aws.String(dimension.Value)
|
|
}
|
|
input.Dimensions = append(input.Dimensions, df)
|
|
}
|
|
}
|
|
|
|
func setAccount(input *cloudwatch.ListMetricsInput, r *resources.ResourceRequest) {
|
|
if r != nil && r.AccountId != nil {
|
|
input.IncludeLinkedAccounts = aws.Bool(true)
|
|
if !r.ShouldTargetAllAccounts() {
|
|
input.OwningAccount = r.AccountId
|
|
}
|
|
}
|
|
}
|