diff --git a/main.go b/main.go index 9d58317..fc36109 100644 --- a/main.go +++ b/main.go @@ -61,9 +61,7 @@ func findData(data []KeyValue, key string) (interface{}, bool) { func GenerateAvgVcpusCharts(f *excelize.File, data any, name string) { var err error - //rydeAvgCpu := make(map[string]interface{}) rydeAvgCpu := []KeyValue{} - //wsdcAvgCpu := make(map[string]interface{}) wsdcAvgCpu := []KeyValue{} var avgCpuColumns []string @@ -109,12 +107,12 @@ func GenerateAvgVcpusCharts(f *excelize.File, data any, name string) { } // Generate RCC worksheet and graph - AvgChart(f, name+" RCC", "A1", avgCpuColumns, rydeAvgCpu) + AvgChart(f, name+" RCC", "A1", avgCpuColumns, rydeAvgCpu, 0) // Generate WSDC worksheet and graph - AvgChart(f, name+" WSDC", "N1", avgCpuColumns, wsdcAvgCpu) + AvgChart(f, name+" WSDC", "N1", avgCpuColumns, wsdcAvgCpu, 0) } -func GenerateCharts(f *excelize.File, data any, name string, location string) { +func GenerateCharts(f *excelize.File, data any, name string, location string, yMaxValue float64) { var err error //parsedData := make(map[string]interface{}) parsedData := []KeyValue{} @@ -146,8 +144,8 @@ func GenerateCharts(f *excelize.File, data any, name string, location string) { } // store the data together - parsedData = addData(parsedData, "RCC", rcc) - parsedData = addData(parsedData, "WSDC", wsdc) + parsedData = addData(parsedData, "RCC", rcc, yMaxValue) + parsedData = addData(parsedData, "WSDC", wsdc, yMaxValue) //parsedData["RCC"] = rcc //parsedData["WSDC"] = wsdc //prettyPrint(parsedData) @@ -156,7 +154,7 @@ func GenerateCharts(f *excelize.File, data any, name string, location string) { AvgChart(f, name, location, dataColumns, parsedData) } -func AvgChart(f *excelize.File, worksheetName string, location string, avgCpuColumns []string, data []KeyValue) { +func AvgChart(f *excelize.File, worksheetName string, location string, avgCpuColumns []string, data []KeyValue, yMaxValue float64) { var err error var chartSeries []excelize.ChartSeries var dataDates []string @@ -279,6 +277,7 @@ func AvgChart(f *excelize.File, worksheetName string, location string, avgCpuCol Font: excelize.Font{ Color: "000000", }, + Maximum: yMaxValue, }, Dimension: excelize.ChartDimension{ Height: 500, @@ -329,10 +328,10 @@ func main() { } // Generate charts into workbook - GenerateAvgVcpusCharts(f, data.Tracking.AvgCpu, "Average vCPUs") - GenerateCharts(f, data.Tracking.AvgRam, "Average RAM(GB)", "A30") - GenerateCharts(f, data.Tracking.ProVmCount, "ProRated VM Count", "A60") - GenerateCharts(f, data.Tracking.VmCount, "VM Count", "N60") + GenerateAvgVcpusCharts(f, data.Tracking.AvgCpu, "Average vCPUs", 0) + GenerateCharts(f, data.Tracking.AvgRam, "Average RAM(GB)", "A30", 0) + GenerateCharts(f, data.Tracking.ProVmCount, "ProRated VM Count", "A60", 10000) + GenerateCharts(f, data.Tracking.VmCount, "VM Count", "N60", 10000) // Save workbook if err := f.SaveAs(*outputFile); err != nil {