Merge pull request #54 from kaytu-io/fix-increase-default-observabili…

…ty-period fix: Fixes csv
kaytu-io · Jun 23, 2024 · 2cba7de · 2cba7de
2 parents e99616d + 008aa86
commit 2cba7de
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 0 deletions.
diff --git a/plugin/processor/rds_cluster/rds_cluster.go b/plugin/processor/rds_cluster/rds_cluster.go
@@ -141,6 +141,10 @@ func (m *Processor) ExportCsv() []*golang.CSVRow {
 				storageAdditionalDetails = append(storageAdditionalDetails,
 					fmt.Sprintf("Throughput:: Current: %s - Avg: %s - Recommended: %s", utils.PStorageThroughputMbps(rightSizing.Current.StorageThroughput),
 						utils.PStorageThroughputMbps(rightSizing.StorageThroughput.Avg), utils.PStorageThroughputMbps(rightSizing.Recommended.StorageThroughput)))
+				storageAdditionalDetails = append(storageAdditionalDetails,
+					fmt.Sprintf("VolumeTypeChange:: %v", utils.PString(rightSizing.Current.StorageType) != utils.PString(rightSizing.Recommended.StorageType)))
+				storageAdditionalDetails = append(storageAdditionalDetails,
+					fmt.Sprintf("VolumeSizeChange:: %v", *rightSizing.Current.StorageSize != *rightSizing.Recommended.StorageSize))
 			}
 			storageRow := []string{m.identification["account"], cluster.Region, "RDS Instance Storage", fmt.Sprintf("%s-storage", *i.DBInstanceIdentifier),
 				*i.DBInstanceIdentifier, "N/A", "730 hours", utils.FormatPriceFloat(rightSizing.Current.StorageCost),

diff --git a/plugin/processor/rds_cluster/rds_cluster_item.go b/plugin/processor/rds_cluster/rds_cluster_item.go
@@ -219,6 +219,23 @@ func (c RDSClusterItem) RDSInstanceDevice() ([]*golang.ChartRow, map[string]*gol
 		storageProps.Properties = append(storageProps.Properties, storageIOPSProperty)
 		storageProps.Properties = append(storageProps.Properties, storageThroughputProperty)
 
+		volumeTypeModification := &golang.Property{
+			Key:         "Volume Type Modification",
+			Recommended: "No",
+		}
+		if storageTypeProperty.Current != storageTypeProperty.Recommended {
+			volumeTypeModification.Recommended = "Yes"
+		}
+		volumeSizeModification := &golang.Property{
+			Key:         "Volume Size Modification",
+			Recommended: "No",
+		}
+		if storageSizeProperty.Current != storageSizeProperty.Recommended {
+			volumeSizeModification.Recommended = "Yes"
+		}
+		storageProps.Properties = append(storageProps.Properties, volumeTypeModification)
+		storageProps.Properties = append(storageProps.Properties, volumeSizeModification)
+
 		deviceProps[fmt.Sprintf("%s-compute", *i.DBInstanceIdentifier)] = computeProps
 		deviceProps[fmt.Sprintf("%s-storage", *i.DBInstanceIdentifier)] = storageProps
 		deviceRows = append(deviceRows, &computeRow, &storageRow)

diff --git a/plugin/processor/rds_instance/rds_instance.go b/plugin/processor/rds_instance/rds_instance.go
@@ -137,6 +137,10 @@ func (m *Processor) ExportCsv() []*golang.CSVRow {
 			storageAdditionalDetails = append(storageAdditionalDetails,
 				fmt.Sprintf("Throughput:: Current: %s - Avg: %s - Recommended: %s", utils.PStorageThroughputMbps(i.Wastage.RightSizing.Current.StorageThroughput),
 					utils.PStorageThroughputMbps(i.Wastage.RightSizing.StorageThroughput.Avg), utils.PStorageThroughputMbps(i.Wastage.RightSizing.Recommended.StorageThroughput)))
+			storageAdditionalDetails = append(storageAdditionalDetails,
+				fmt.Sprintf("VolumeTypeChange:: %v", utils.PString(i.Wastage.RightSizing.Current.StorageType) != utils.PString(i.Wastage.RightSizing.Recommended.StorageType)))
+			storageAdditionalDetails = append(storageAdditionalDetails,
+				fmt.Sprintf("VolumeSizeChange:: %v", *i.Wastage.RightSizing.Current.StorageSize != *i.Wastage.RightSizing.Current.StorageSize))
 		}
 		storageRow := []string{m.identification["account"], i.Region, "RDS Instance Storage", fmt.Sprintf("%s-storage", *i.Instance.DBInstanceIdentifier),
 			*i.Instance.DBInstanceIdentifier, "N/A", "730 hours", utils.FormatPriceFloat(i.Wastage.RightSizing.Current.StorageCost),

diff --git a/plugin/processor/rds_instance/rds_instance_item.go b/plugin/processor/rds_instance/rds_instance_item.go
@@ -218,6 +218,23 @@ func (i RDSInstanceItem) RDSInstanceDevice() ([]*golang.ChartRow, map[string]*go
 	storageProps.Properties = append(storageProps.Properties, storageThroughputProperty)
 	storageProps.Properties = append(storageProps.Properties, runtimeProperty)
 
+	volumeTypeModification := &golang.Property{
+		Key:         "Volume Type Modification",
+		Recommended: "No",
+	}
+	if storageTypeProperty.Current != storageTypeProperty.Recommended {
+		volumeTypeModification.Recommended = "Yes"
+	}
+	volumeSizeModification := &golang.Property{
+		Key:         "Volume Size Modification",
+		Recommended: "No",
+	}
+	if storageSizeProperty.Current != storageSizeProperty.Recommended {
+		volumeSizeModification.Recommended = "Yes"
+	}
+	storageProps.Properties = append(storageProps.Properties, volumeTypeModification)
+	storageProps.Properties = append(storageProps.Properties, volumeSizeModification)
+
 	props[computeRow.RowId] = computeProps
 	props[storageRow.RowId] = storageProps