diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json
index c128115ff..45d6a659f 100644
--- a/dashboard/package-lock.json
+++ b/dashboard/package-lock.json
@@ -17378,9 +17378,10 @@
}
},
"node_modules/tough-cookie": {
- "version": "4.1.2",
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+ "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
"dev": true,
- "license": "BSD-3-Clause",
"dependencies": {
"psl": "^1.1.33",
"punycode": "^2.1.1",
@@ -18177,9 +18178,10 @@
}
},
"node_modules/word-wrap": {
- "version": "1.2.3",
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+ "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
"dev": true,
- "license": "MIT",
"engines": {
"node": ">=0.10.0"
}
diff --git a/dashboard/package.json b/dashboard/package.json
index 6897ce92d..e484b8173 100644
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -1,6 +1,6 @@
{
"name": "komiser-dashboard",
- "version": "3.0.20",
+ "version": "3.1.0",
"private": true,
"scripts": {
"dev": "next dev -p 3002",
diff --git a/dashboard/pages/inventory.tsx b/dashboard/pages/inventory.tsx
index 03a9c30ec..5203c7c6e 100644
--- a/dashboard/pages/inventory.tsx
+++ b/dashboard/pages/inventory.tsx
@@ -8,7 +8,6 @@ import InventoryLayout from '../components/inventory/components/InventoryLayout'
import InventorySidePanel from '../components/inventory/components/InventorySidePanel';
import InventoryStatsCards from '../components/inventory/components/InventoryStatsCards';
import InventoryTable from '../components/inventory/components/InventoryTable';
-import InventoryFilter from '../components/inventory/components/filter/InventoryFilter';
import InventoryView from '../components/inventory/components/view/InventoryView';
import useInventory from '../components/inventory/hooks/useInventory/useInventory';
import SkeletonFilters from '../components/skeleton/SkeletonFilters';
@@ -87,45 +86,35 @@ export default function Inventory() {
inventory={inventory}
searchedInventory={searchedInventory}
>
-
- {/* Custom view header and view management sidepanel */}
- {hasFilterOrCustomView && (
-
- )}
-
- {/* Filter component */}
- {displayFilterIfIsNotCustomView && (
-
- )}
-
-
-
+
{/* Active filters skeleton */}
{loadingFilters &&
}
- {/* Active filters */}
-
-
+ {/* Filters bar containing active filters and view button */}
+
+
+ {hasFilterOrCustomView && (
+
+ )}
+
+
{/* Inventory stats skeleton */}
{!error && statsLoading && (
diff --git a/providers/aws/aws.go b/providers/aws/aws.go
index fd3698927..bab2af836 100644
--- a/providers/aws/aws.go
+++ b/providers/aws/aws.go
@@ -54,6 +54,7 @@ func listOfSupportedServices() []providers.FetchDataFunction {
cloudfront.Distributions,
dynamodb.Tables,
ecs.Clusters,
+ ecs.TaskDefinitions,
ecs.ContainerInstances,
ecr.Repositories,
sns.Topics,
@@ -66,6 +67,7 @@ func listOfSupportedServices() []providers.FetchDataFunction {
rds.Snapshots,
rds.ClusterSnapshots,
rds.ProxyEndpoints,
+ rds.AutoBackups,
elb.LoadBalancers,
efs.ElasticFileStorage,
apigateway.Apis,
diff --git a/providers/aws/ec2/instances.go b/providers/aws/ec2/instances.go
index 88e0fbc19..17a95fab8 100644
--- a/providers/aws/ec2/instances.go
+++ b/providers/aws/ec2/instances.go
@@ -126,7 +126,7 @@ func Instances(ctx context.Context, client providers.ProviderClient) ([]models.R
//log.Printf("Hourly cost EC2: %f", hourlyCost)
- }
+ }
monthlyCost = float64(hourlyUsage) * hourlyCost
diff --git a/providers/aws/ecs/taskDefinitions.go b/providers/aws/ecs/taskDefinitions.go
new file mode 100644
index 000000000..c04d58f75
--- /dev/null
+++ b/providers/aws/ecs/taskDefinitions.go
@@ -0,0 +1,66 @@
+package ecs
+
+import (
+ "context"
+ "fmt"
+ "strings"
+ "time"
+
+ "github.com/aws/aws-sdk-go-v2/aws"
+ "github.com/aws/aws-sdk-go-v2/service/ecs"
+ log "github.com/sirupsen/logrus"
+ . "github.com/tailwarden/komiser/models"
+ . "github.com/tailwarden/komiser/providers"
+)
+
+func extractNameAndRevisionFromArn(input string) []string {
+ var nameAndRevision [2]string
+
+ parts := strings.Split(input, ":")
+ if len(parts) >= 6 {
+ nameAndRevision[0] = strings.Split(parts[5], "/")[1]
+ nameAndRevision[1] = parts[6]
+ }
+ return nameAndRevision[:]
+}
+
+func TaskDefinitions(ctx context.Context, client ProviderClient) ([]Resource, error) {
+ resources := make([]Resource, 0)
+ var config ecs.ListTaskDefinitionsInput
+ ecsClient := ecs.NewFromConfig(*client.AWSClient)
+
+ for {
+ output, err := ecsClient.ListTaskDefinitions(context.Background(), &config)
+ if err != nil {
+ return resources, err
+ }
+ for _, taskdefinition := range output.TaskDefinitionArns {
+ ecsNameAndRevision := extractNameAndRevisionFromArn(taskdefinition)
+ resources = append(resources, Resource{
+ Provider: "AWS",
+ Account: client.Name,
+ Service: "ECS Task Definition",
+ ResourceId: taskdefinition,
+ Region: client.AWSClient.Region,
+ Name: ecsNameAndRevision[0],
+ Cost: 0,
+ FetchedAt: time.Now(),
+
+ Link: fmt.Sprintf("https://%s.console.aws.amazon.com/ecs/v2/task-definitions/%s/%s/containers?region=%s", client.AWSClient.Region, ecsNameAndRevision[0], ecsNameAndRevision[1], client.AWSClient.Region),
+ })
+ }
+
+ if aws.ToString(output.NextToken) == "" {
+ break
+ }
+ config.NextToken = output.NextToken
+ }
+ log.WithFields(log.Fields{
+ "provider": "AWS",
+ "account": client.Name,
+ "region": client.AWSClient.Region,
+ "service": "ECS Task Definition",
+ "resources": len(resources),
+ }).Info("Fetched resources")
+ return resources, nil
+}
diff --git a/providers/aws/rds/auto_backups.go b/providers/aws/rds/auto_backups.go
new file mode 100644
index 000000000..73c256622
--- /dev/null
+++ b/providers/aws/rds/auto_backups.go
@@ -0,0 +1,56 @@
+package rds
+
+import (
+ "context"
+ "fmt"
+ "github.com/aws/aws-sdk-go-v2/aws"
+ "time"
+
+ "github.com/aws/aws-sdk-go-v2/service/rds"
+ log "github.com/sirupsen/logrus"
+ "github.com/tailwarden/komiser/models"
+ "github.com/tailwarden/komiser/providers"
+)
+
+func AutoBackups(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
+ var config rds.DescribeDBInstanceAutomatedBackupsInput
+ resources := make([]models.Resource, 0)
+ rdsClient := rds.NewFromConfig(*client.AWSClient)
+
+ for {
+ output, err := rdsClient.DescribeDBInstanceAutomatedBackups(ctx, &config)
+ if err != nil {
+ return resources, err
+ }
+
+ for _, backup := range output.DBInstanceAutomatedBackups {
+
+ _backupName := *backup.DBInstanceIdentifier
+
+ resources = append(resources, models.Resource{
+ Provider: "AWS",
+ Account: client.Name,
+ Service: "RDS Backup",
+ Region: client.AWSClient.Region,
+ ResourceId: *backup.DBInstanceArn,
+ Name: _backupName,
+ FetchedAt: time.Now(),
+ Link: fmt.Sprintf("https:/%s.console.aws.amazon.com/rds/home?region=%s#dbinstance:id=%s", client.AWSClient.Region, client.AWSClient.Region, *backup.DBInstanceIdentifier),
+ })
+ }
+
+ if aws.ToString(output.Marker) == "" {
+ break
+ }
+
+ config.Marker = output.Marker
+ }
+ log.WithFields(log.Fields{
+ "provider": "AWS",
+ "account": client.Name,
+ "region": client.AWSClient.Region,
+ "service": "RDS Backup",
+ "resources": len(resources),
+ }).Info("Fetched resources")
+ return resources, nil
+}
diff --git a/providers/linode/linode.go b/providers/linode/linode.go
index 0ccda90f2..2677d88c7 100644
--- a/providers/linode/linode.go
+++ b/providers/linode/linode.go
@@ -11,6 +11,7 @@ import (
"github.com/tailwarden/komiser/providers"
"github.com/tailwarden/komiser/providers/linode/compute"
"github.com/tailwarden/komiser/providers/linode/sql"
+ "github.com/tailwarden/komiser/providers/linode/postgres"
"github.com/tailwarden/komiser/providers/linode/storage"
"github.com/uptrace/bun"
)
@@ -25,6 +26,7 @@ func listOfSupportedServices() []providers.FetchDataFunction {
networking.NodeBalancers,
networking.Firewalls,
sql.Instances,
+ postgres.Instances,
}
}
diff --git a/providers/linode/postgres/instances.go b/providers/linode/postgres/instances.go
new file mode 100644
index 000000000..79dcc9b27
--- /dev/null
+++ b/providers/linode/postgres/instances.go
@@ -0,0 +1,133 @@
+package postgres
+
+import (
+ "context"
+ "fmt"
+ "strings"
+ "time"
+
+ // "github.com/linode/linodego"
+ log "github.com/sirupsen/logrus"
+
+ "github.com/tailwarden/komiser/models"
+ "github.com/tailwarden/komiser/providers"
+)
+
+// Cost data for Dedicated CPU instances
+var dedicatedCPUCosts = map[string]float64{
+ "Dedicated 4GB": 65.00,
+ "Dedicated 8GB": 130.00,
+ "Dedicated 16GB": 260.00,
+ "Dedicated 32GB": 520.00,
+ "Dedicated 64GB": 1040.00,
+ "Dedicated 96GB": 1560.00,
+ "Dedicated 128GB": 2080.00,
+ "Dedicated 256GB": 4160.00,
+ "Dedicated 512GB": 8320.00,
+}
+
+// Cost data for Shared CPU instances
+var sharedCPUCosts = map[string]float64{
+ "Shared 1GB": 15.00,
+ "Shared 2GB": 30.00,
+ "Shared 4GB": 60.00,
+ "Shared 8GB": 120.00,
+ "Shared 16GB": 240.00,
+ "Shared 32GB": 480.00,
+ "Shared 64GB": 960.00,
+ "Shared 96GB": 1440.00,
+ "Shared 128GB": 1920.00,
+ "Shared 192GB": 2880.00,
+}
+
+// PostgresInstances fetches PostgreSQL instances from the provider and returns them as resources.
+func Instances(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
+ resources := make([]models.Resource, 0)
+
+ // Fetch PostgreSQL databases from the Linode provider
+ databases, err := client.LinodeClient.ListPostgresDatabases(ctx, nil)
+ if err != nil {
+ return resources, err
+ }
+
+ for _, database := range databases {
+ // Get the cluster size for the database
+ clusterSize, err := GetClusterSize(ctx, client, database.ID)
+ if err != nil {
+ log.Warnf("Failed to get cluster size for PostgreSQL database: %d, Error: %s", database.ID, err.Error())
+ // Skip this database and continue with the next one
+ continue
+ }
+
+ // Calculate the cost based on the database type and cluster size
+ cost, ok := InstancesCost(database.Type, clusterSize)
+ if !ok {
+ log.Warnf("Failed to calculate cost for PostgreSQL database: %d, Type: %s", database.ID, database.Type)
+ // Skip this database and continue with the next one
+ continue
+ }
+
+ resources = append(resources, models.Resource{
+ Provider: "Linode",
+ Account: client.Name,
+ Service: "PostgreSQL",
+ Region: database.Region,
+ ResourceId: fmt.Sprintf("%d", database.ID),
+ Cost: cost,
+ Name: database.Label,
+ FetchedAt: time.Now(),
+ CreatedAt: *database.Created,
+ Link: fmt.Sprintf("https://cloud.linode.com/databases/%d", database.ID),
+ })
+ }
+
+ log.WithFields(log.Fields{
+ "provider": "Linode",
+ "account": client.Name,
+ "service": "PostgreSQL",
+ "resources": len(resources),
+ }).Info("Fetched resources")
+ return resources, nil
+}
+
+// GetClusterSize retrieves the cluster size for a specific PostgreSQL instance.
+func GetClusterSize(ctx context.Context, client providers.ProviderClient, instanceID int) (int, error) {
+ instance, err := client.LinodeClient.GetPostgresDatabase(ctx, instanceID)
+ if err != nil {
+ return 0, err
+ }
+
+ return instance.ClusterSize, nil
+}
+
+// InstancesCost calculates the cost for the given PostgreSQL instance type and cluster size.
+func InstancesCost(instanceType string, clusterSize int) (float64, bool) {
+ // Calculate cost based on instance type
+ if strings.Contains(instanceType, "Dedicated") {
+ cost, ok := dedicatedCPUCosts[instanceType]
+ if !ok {
+ return 0, false
+ }
+
+ // Adjust cost based on the cluster size
+ if clusterSize == 3 {
+ cost *= 3
+ }
+
+ return cost, true
+ } else if strings.Contains(instanceType, "Shared") {
+ cost, ok := sharedCPUCosts[instanceType]
+ if !ok {
+ return 0, false
+ }
+
+ // Adjust cost for the cluster size
+ if clusterSize == 3 {
+ cost *= 2.333
+ }
+
+ return cost, true
+ }
+
+ return 0, false
+}
+
+
