added group by * and "mean_" prefix to generateFilterForAVGData

monitoring/monitoring_server/src/asapo_monitoring_server/main/main.go

@@ -102,16 +102,16 @@ func main() {
 	// It creates two databases.
 	normalDB := settings.InfluxDbDatabase
 	avgDB := normalDB + "_avg"
-	//rpName := "one_day"
+	rpName := "one_day"
 	cqName := "avg_values"
 	postStrings := []string{
 		"CREATE DATABASE " + normalDB,
 		"CREATE DATABASE " + avgDB,
-		//"CREATE RETENTION POLICY " + rpName + " ON " + normalDB +
-		//	" DURATION 24h REPLICATION 1 DEFAULT",
+		"CREATE RETENTION POLICY " + rpName + " ON " + normalDB +
+			" DURATION 24h REPLICATION 1 DEFAULT",
 		"CREATE CONTINUOUS QUERY " + cqName + " ON " + normalDB + " BEGIN" +
 			" SELECT mean(*) INTO " + avgDB +
-			"..:MEASUREMENT FROM /.*/ GROUP BY time(12h) END",
+			"..:MEASUREMENT FROM /.*/ GROUP BY time(12h),* END",
 	}
 	for i := 0; i < len(postStrings); i++ {
 		postTODB(postStrings[i], settings)

monitoring/monitoring_server/src/asapo_monitoring_server/server/QueryServer.go

@@ -174,6 +174,11 @@ func generateFilterForAVGData(s *QueryServer, filter string) string {
 	// Currently, there is only one modification needed so this is a bit redundant.
 	filterModifications := make(map[string]string)
 	filterModifications[s.settings.InfluxDbDatabase] = s.settings.InfluxDbDatabase + averageSuffix
+	filterModifications[dbMeasurementBrokerFileRequests] = "mean_" + dbMeasurementBrokerFileRequests
+	filterModifications[dbMeasurementFtsTransfers] = "mean_" + dbMeasurementFtsTransfers
+	filterModifications[dbMeasurementFileInput] = "mean_" + dbMeasurementFileInput
+	filterModifications[dbMeasurementRdsCacheMemoryUsage] = "mean_" + dbMeasurementRdsCacheMemoryUsage
+	filterModifications[dbMeasurementRdsFileRequests] = "mean_" + dbMeasurementRdsFileRequests
 	alteredFilter := filter
 	// Do all the filterModifications