Merge branch 'develop' into dependabot/npm_and_yarn/dashboard/sentry/…

…tracing-7.86.0

dashboard/components/modal/Modal.tsx

@@ -29,7 +29,7 @@ function Modal({ isOpen, closeModal, id, children }: ModalProps) {
           <div
             id={`${id}-wrapper`}
             onClick={closeModal}
-            className="fixed inset-0 z-30 hidden animate-fade-in bg-gray-950 opacity-0 sm:block"
+            className="fixed inset-0 z-30 hidden animate-fade-in bg-gray-900/60 sm:block"
           ></div>
           <div
             id={`${id}-modal`}

dashboard/components/sidepanel/Sidepanel.tsx

@@ -29,7 +29,7 @@ function Sidepanel({ isOpen, closeModal, children, noScroll }: SidepanelProps) {
         <>
           <div
             onClick={closeModal}
-            className="fixed inset-0 z-30 hidden animate-fade-in bg-gray-950 opacity-0 sm:block"
+            className="fixed inset-0 z-30 hidden animate-fade-in bg-gray-900/30  sm:block"
           ></div>
           <div
             className={`fixed inset-0 z-30 flex w-full animate-fade-in-up flex-col gap-4 overflow-auto bg-white px-8 pt-4 opacity-0 shadow-left sm:bottom-4 sm:left-auto sm:right-4 sm:top-4 sm:w-[38rem] sm:animate-fade-in-left sm:rounded-lg ${

dashboard/pages/cloud-accounts.tsx

@@ -91,7 +91,6 @@ function CloudAccounts() {
       {/* Wraps the cloud account page and handles the custom views sidebar */}
       <CloudAccountsLayout router={router} cloudAccounts={cloudAccounts}>
         <CloudAccountsHeader isNotCustomView={isNotCustomView} />
-        <div className="z-10 text-sm text-black-800 first-letter:top-0 z-10 flex w-full animate-fade-in-down-short items-center justify-center gap-6 bg-gradient-to-br from-primary to-secondary py-3 opacity-1 fixed"></div>
         {filteredCloudAccounts.map(account => (
           <CloudAccountItem
             key={account.id}

docs/configuration/cloud-providers/aws.mdx

@@ -271,7 +271,7 @@ We will be using the official Komiser [Helm Chart](https://github.com/tailwarden
    echo "${TRUST_RELATIONSHIP}" > trust.json
    ```
 
-<Info> Make sure to substitute ${NAMESPACE} for the namespace you will deploy the helm chart in. If deployed in any other namespace, you will see sts:AssumeRoleWithWebIdentity failure messages in the pod logs. </Info>
+<Info> Make sure to substitute `${NAMESPACE}` for the namespace you will deploy the helm chart in. If deployed in any other namespace, you will see sts:AssumeRoleWithWebIdentity failure messages in the pod logs. </Info>
 
 1. Run the modified code block from the previous step to create a file named *`trust.json`*\.
 

providers/aws/apigateway/apis.go

@@ -13,6 +13,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
 	. "github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 	"github.com/tailwarden/komiser/utils"
 )
 
@@ -27,6 +28,11 @@ func Apis(ctx context.Context, client ProviderClient) ([]Resource, error) {
 		return resources, err
 	}
 
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "Amazon API Gateway")
+	if err != nil {
+		log.Warnln("Couldn't fetch Amazon API Gateway cost and usage:", err)
+	}
+
 	for _, api := range output.Items {
 		tags := make([]Tag, 0)
 		for key, value := range api.Tags {
@@ -72,6 +78,9 @@ func Apis(ctx context.Context, client ProviderClient) ([]Resource, error) {
 			Region:     client.AWSClient.Region,
 			Name:       *api.Name,
 			Cost:       monthlyCost,
+			Metadata: map[string]string{
+				"serviceCost": fmt.Sprint(serviceCost),
+			},
 			Tags:       tags,
 			CreatedAt:  *api.CreatedDate,
 			FetchedAt:  time.Now(),

providers/aws/cloudfront/distributions.go

@@ -13,6 +13,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
 	. "github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 	"github.com/tailwarden/komiser/utils"
 )
 
@@ -26,6 +27,10 @@ func Distributions(ctx context.Context, client ProviderClient) ([]Resource, erro
 	cloudwatchClient := cloudwatch.NewFromConfig(*client.AWSClient)
 	client.AWSClient.Region = tempRegion
 
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "Amazon CloudFront")
+	if err != nil {
+		log.Warnln("Couldn't fetch Amazon CloudFront cost and usage:", err)
+	}
 	for {
 		output, err := cloudfrontClient.ListDistributions(ctx, &config)
 		if err != nil {
@@ -145,6 +150,9 @@ func Distributions(ctx context.Context, client ProviderClient) ([]Resource, erro
 				Region:     client.AWSClient.Region,
 				Name:       *distribution.DomainName,
 				Cost:       monthlyCost,
+				Metadata: map[string]string{
+					"serviceCost": fmt.Sprint(serviceCost),
+				},
 				Tags:       tags,
 				FetchedAt:  time.Now(),
 				Link:       fmt.Sprintf("https://%s.console.aws.amazon.com/cloudfront/v3/home?region=%s#/distributions/%s", client.AWSClient.Region, client.AWSClient.Region, *distribution.Id),

providers/aws/cloudwatch/dashboards.go

@@ -10,13 +10,18 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatch"
 	. "github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 )
 
 func Dashboards(ctx context.Context, client ProviderClient) ([]Resource, error) {
 	resources := make([]Resource, 0)
 	cloudWatchClient := cloudwatch.NewFromConfig(*client.AWSClient)
 
 	var nextToken *string
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "AmazonCloudWatch")
+	if err != nil {
+		log.Warnln("Couldn't fetch AmazonCloudWatch cost and usage:", err)
+	}
 
 	for {
 		input := &cloudwatch.ListDashboardsInput{
@@ -53,6 +58,9 @@ func Dashboards(ctx context.Context, client ProviderClient) ([]Resource, error)
 				Region:     client.AWSClient.Region,
 				Name:       *dashboard.DashboardName,
 				Cost:       cost,
+				Metadata: map[string]string{
+					"serviceCost": fmt.Sprint(serviceCost),
+				},
 				Tags:       tags,
 				FetchedAt:  time.Now(),
 				Link:       fmt.Sprintf("https://%s.console.aws.amazon.com/cloudwatch/home?region=%s#dashboards:name=%s", client.AWSClient.Region, client.AWSClient.Region, *dashboard.DashboardName),

providers/aws/codebuild/projects.go

@@ -13,6 +13,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sts"
 	"github.com/tailwarden/komiser/models"
 	"github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 )
 
 func BuildProjects(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
@@ -25,6 +26,10 @@ func BuildProjects(ctx context.Context, client providers.ProviderClient) ([]mode
 		return resources, err
 	}
 
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "CodeBuild")
+	if err != nil {
+		log.Warnln("Couldn't fetch CodeBuild cost and usage:", err)
+	}
 	accountId := stsOutput.Account
 
 	for {
@@ -44,6 +49,9 @@ func BuildProjects(ctx context.Context, client providers.ProviderClient) ([]mode
 				ResourceId: resourceArn,
 				Region:     client.AWSClient.Region,
 				Name:       project,
+				Metadata: map[string]string{
+					"serviceCost": fmt.Sprint(serviceCost),
+				},
 				Tags:       tags,
 				FetchedAt:  time.Now(),
 				Link:       fmt.Sprintf("https://%s.console.aws.amazon.com/codesuite/codebuild/%s/projects/%s/details?region=%s", client.AWSClient.Region, *accountId, project, client.AWSClient.Region),

providers/aws/codedeploy/deployment_groups.go

@@ -3,13 +3,15 @@ package codedeploy
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/codedeploy"
 	"github.com/aws/aws-sdk-go-v2/service/sts"
 	log "github.com/sirupsen/logrus"
 	"github.com/tailwarden/komiser/models"
 	"github.com/tailwarden/komiser/providers"
-	"time"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 )
 
 func DeploymentGroups(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
@@ -23,6 +25,11 @@ func DeploymentGroups(ctx context.Context, client providers.ProviderClient) ([]m
 	}
 	accountId := stsOutput.Account
 
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "CodeDeploy")
+	if err != nil {
+		log.Warnln("Couldn't fetch CodeDeploy cost and usage:", err)
+	}
+
 	for {
 		output, err := codedeployClient.ListApplications(ctx, &listApplicationParams)
 		if err != nil {
@@ -47,6 +54,9 @@ func DeploymentGroups(ctx context.Context, client providers.ProviderClient) ([]m
 						ResourceId: resourceArn,
 						Region:     client.AWSClient.Region,
 						Name:       deploymentGroup,
+						Metadata: map[string]string{
+							"serviceCost": fmt.Sprint(serviceCost),
+						},
 						Tags:       tags,
 						FetchedAt:  time.Now(),
 					})

providers/aws/dynamodb/tables.go

@@ -12,9 +12,9 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/pricing"
 	"github.com/aws/aws-sdk-go-v2/service/pricing/types"
 	"github.com/aws/aws-sdk-go-v2/service/sts"
-	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 	. "github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 )
 
 
@@ -30,6 +30,10 @@ func Tables(ctx context.Context, client ProviderClient) ([]Resource, error) {
 	client.AWSClient.Region = "us-east-1"
 	pricingClient := pricing.NewFromConfig(*client.AWSClient)
 	client.AWSClient.Region = oldRegion
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "Amazon DynamoDB")
+	if err != nil {
+		log.Warnln("Couldn't fetch Amazon DynamoDB cost and usage:", err)
+	}
 
 	pricingOutput, err := pricingClient.GetProducts(ctx, &pricing.GetProductsInput{
 	    ServiceCode: aws.String("AmazonDynamoDB"),
@@ -110,6 +114,9 @@ func Tables(ctx context.Context, client ProviderClient) ([]Resource, error) {
 			Region:     client.AWSClient.Region,
 			Name:       table,
 			Cost:       monthlyCost,
+			Metadata: map[string]string{
+				"serviceCost": fmt.Sprint(serviceCost),
+			},
 			Tags:       tags,
 			FetchedAt:  time.Now(),
 			Link:       fmt.Sprintf("https://%s.console.aws.amazon.com/dynamodbv2/home?region=%s#table?initialTagKey=&name=%s", client.AWSClient.Region, client.AWSClient.Region, table),

providers/aws/ec2/instances.go

@@ -17,6 +17,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sts"
 	"github.com/tailwarden/komiser/models"
 	"github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 	"github.com/tailwarden/komiser/utils"
 )
 
@@ -33,6 +34,11 @@ func Instances(ctx context.Context, client providers.ProviderClient) ([]models.R
 
 	accountId := stsOutput.Account
 
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "EC2")
+	if err != nil {
+		log.Warnln("Couldn't fetch EC2 cost and usage:", err)
+	}
+
 	oldRegion := client.AWSClient.Region
 	client.AWSClient.Region = "us-east-1"
 	pricingClient := pricing.NewFromConfig(*client.AWSClient)
@@ -151,6 +157,7 @@ func Instances(ctx context.Context, client providers.ProviderClient) ([]models.R
 					Metadata: map[string]string{
 						"instanceType": string(instance.InstanceType),
 						"state":        string(instance.State.Name),
+						"serviceCost": fmt.Sprint(serviceCost),
 					},
 					Link: fmt.Sprintf("https://%s.console.aws.amazon.com/ec2/home?region=%s#InstanceDetails:instanceId=%s", client.AWSClient.Region, client.AWSClient.Region, *instance.InstanceId),
 				})

providers/aws/ecr/repositories.go

@@ -11,12 +11,17 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ecr"
 	. "github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 )
 
 func Repositories(ctx context.Context, client ProviderClient) ([]Resource, error) {
 	resources := make([]Resource, 0)
 	var config ecr.DescribeRepositoriesInput
 	ecrClient := ecr.NewFromConfig(*client.AWSClient)
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "ECR")
+	if err != nil {
+		log.Warnln("Couldn't fetch ECR cost and usage:", err)
+	}
 	for {
 		output, err := ecrClient.DescribeRepositories(context.Background(), &config)
 		if err != nil {
@@ -47,6 +52,9 @@ func Repositories(ctx context.Context, client ProviderClient) ([]Resource, error
 				Region:     client.AWSClient.Region,
 				Name:       *repository.RepositoryName,
 				Cost:       0.10,
+				Metadata: map[string]string{
+					"serviceCost": fmt.Sprint(serviceCost),
+				},
 				Tags:       tags,
 				FetchedAt:  time.Now(),
 				Link:       fmt.Sprintf("https://%s.console.aws.amazon.com/ecr/repositories/%s", client.AWSClient.Region, *repository.RepositoryName),

providers/aws/ecs/containers.go

@@ -12,6 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sts"
 	. "github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 )
 
 func ContainerInstances(ctx context.Context, client ProviderClient) ([]Resource, error) {
@@ -26,6 +27,10 @@ func ContainerInstances(ctx context.Context, client ProviderClient) ([]Resource,
 		return resources, err
 	}
 
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "ECS")
+	if err != nil {
+		log.Warnln("Couldn't fetch ECS cost and usage:", err)
+	}
 	accountId := stsOutput.Account
 	for {
 		output, err := ecsContainer.ListContainerInstances(context.Background(), &config)
@@ -44,6 +49,9 @@ func ContainerInstances(ctx context.Context, client ProviderClient) ([]Resource,
 				Region:     client.AWSClient.Region,
 				Name:       containerInstance,
 				Cost:       0,
+				Metadata: map[string]string{
+					"serviceCost": fmt.Sprint(serviceCost),
+				},
 				FetchedAt:  time.Now(),
 				Link:       fmt.Sprintf("https://%s.console.aws.amazon.com/ecs/home?#/containers/%s", client.AWSClient.Region, containerInstance),
 			})

providers/aws/efs/efs.go

@@ -12,6 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sts"
 	. "github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 )
 
 func ElasticFileStorage(ctx context.Context, client ProviderClient) ([]Resource, error) {
@@ -27,6 +28,11 @@ func ElasticFileStorage(ctx context.Context, client ProviderClient) ([]Resource,
 
 	accountId := stsOutput.Account
 
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "EFS")
+	if err != nil {
+		log.Warnln("Couldn't fetch EFS cost and usage:", err)
+	}
+
 	for {
 		output, err := efsClient.DescribeFileSystems(ctx, &config)
 		if err != nil {
@@ -62,6 +68,9 @@ func ElasticFileStorage(ctx context.Context, client ProviderClient) ([]Resource,
 					Region:     client.AWSClient.Region,
 					Name:       *filesystem.Name,
 					Cost:       monthlyCost,
+					Metadata: map[string]string{
+						"serviceCost": fmt.Sprint(serviceCost),
+					},
 					Tags:       tags,
 					FetchedAt:  time.Now(),
 					Link:       fmt.Sprintf("https://%s.console.aws.amazon.com/efs/home?region=%s#/file-systems/%s", client.AWSClient.Region, client.AWSClient.Region, *filesystem.Name),

providers/aws/eks/clusters.go

@@ -12,6 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sts"
 	. "github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 	"github.com/tailwarden/komiser/utils"
 )
 
@@ -28,6 +29,11 @@ func KubernetesClusters(ctx context.Context, client ProviderClient) ([]Resource,
 
 	accountId := stsOutput.Account
 
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "EKS")
+	if err != nil {
+		log.Warnln("Couldn't fetch EKS cost and usage:", err)
+	}
+
 	for {
 		output, err := eksClient.ListClusters(ctx, &config)
 		if err != nil {
@@ -96,6 +102,7 @@ func KubernetesClusters(ctx context.Context, client ProviderClient) ([]Resource,
 		"region":    client.AWSClient.Region,
 		"service":   "EKS",
 		"resources": len(resources),
+		"serviceCost":fmt.Sprint(serviceCost),
 	}).Info("Fetched resources")
 	return resources, nil
 }

providers/aws/elasticache/clusters.go

@@ -16,6 +16,7 @@ import (
 	"github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/models"
 	. "github.com/tailwarden/komiser/providers"
+	awsUtils "github.com/tailwarden/komiser/providers/aws/utils"
 	"github.com/tailwarden/komiser/utils"
 )
 
@@ -26,6 +27,11 @@ func Clusters(ctx context.Context, client ProviderClient) ([]Resource, error) {
 
 	pricingClient := pricing.NewFromConfig(*client.AWSClient)
 
+	serviceCost, err := awsUtils.GetCostAndUsage(ctx, client.AWSClient.Region, "Amazon ElastiCache")
+	if err != nil {
+		log.Warnln("Couldn't fetch Amazon ElastiCache cost and usage:", err)
+	}
+
 	for {
 		output, err := elasticacheClient.DescribeCacheClusters(ctx, &config)
 		if err != nil {
@@ -122,6 +128,7 @@ func Clusters(ctx context.Context, client ProviderClient) ([]Resource, error) {
 					"nodeType":  *cluster.CacheNodeType,
 					"status":    *cluster.CacheClusterStatus,
 					"clusterId": *cluster.CacheClusterId,
+					"serviceCost": fmt.Sprint(serviceCost),
 				},
 				FetchedAt: time.Now(),
 				Link:      fmt.Sprintf("https:/%s.console.aws.amazon.com/elasticache/home?region=%s#/%s/%s", client.AWSClient.Region, client.AWSClient.Region, *cluster.Engine, *cluster.CacheClusterId),