diff --git a/api/cube-cos-openapi b/api/cube-cos-openapi index a34418d3..6217dc43 160000 --- a/api/cube-cos-openapi +++ b/api/cube-cos-openapi @@ -1 +1 @@ -Subproject commit a34418d338c775429c3405fdb80813fd5bbda2aa +Subproject commit 6217dc43032e8bb170200d646313b4b01e144eec diff --git a/internal/apis/v1/handlers/metrics/stmt.go b/internal/apis/v1/handlers/metrics/stmt.go index 789ef746..3c9e003a 100644 --- a/internal/apis/v1/handlers/metrics/stmt.go +++ b/internal/apis/v1/handlers/metrics/stmt.go @@ -214,7 +214,7 @@ func (h *helper) genHostNetworkEgressHistoryStmt() string { func (h *helper) genVmsCpuUsageRankStmt() string { query := influx.Query{} - return query.Bucket("monasca"). + return query.Bucket("telegraf"). Range("start: -5m"). Filter(`fn: (r) => r._measurement == "vm.cpu.utilization_norm_perc" and r._field == "value"`). Group(`columns: ["resource_id", "vm_name"]`). @@ -228,7 +228,7 @@ func (h *helper) genVmsCpuUsageRankStmt() string { func (h *helper) genVmsMemoryRankStmt() string { query := influx.Query{} - return query.Bucket("monasca"). + return query.Bucket("telegraf"). Range("start: -5m"). Measurement("vm.mem.free_perc"). Filter(`fn: (r) => r._field == "value"`). @@ -243,7 +243,7 @@ func (h *helper) genVmsMemoryRankStmt() string { func (h *helper) genVmsStorageIopsReadRankStmt() string { query := influx.Query{} - return query.Bucket("monasca"). + return query.Bucket("telegraf"). Range("start: -5m"). Measurement("vm.io.read_bytes_sec"). Filter(`fn: (r) => r._field == "value"`). @@ -258,7 +258,7 @@ func (h *helper) genVmsStorageIopsReadRankStmt() string { func (h *helper) genVmsStorageIopsWriteRankStmt() string { query := influx.Query{} - return query.Bucket("monasca"). + return query.Bucket("telegraf"). Range("start: -5m"). Measurement("vm.io.write_bytes_sec"). Filter(`fn: (r) => r._field == "value"`). @@ -273,7 +273,7 @@ func (h *helper) genVmsStorageIopsWriteRankStmt() string { func (h *helper) genVmsNetworkIngressRankStmt() string { query := influx.Query{} - return query.Bucket("monasca"). + return query.Bucket("telegraf"). Range("start: -5m"). Filter(`fn: (r) => r._measurement == "vm.net.in_bytes_sec" and r._field == "value"`). Group(`columns: ["resource_id", "vm_name", "device"]`). @@ -286,7 +286,7 @@ func (h *helper) genVmsNetworkIngressRankStmt() string { func (h *helper) genVmsNetworkEgressRankStmt() string { query := influx.Query{} - return query.Bucket("monasca"). + return query.Bucket("telegraf"). Range("start: -5m"). Filter(`fn: (r) => r._measurement == "vm.net.out_bytes_sec" and r._field == "value"`). Group(`columns: ["resource_id", "vm_name", "device"]`). diff --git a/internal/cubecos/metric.go b/internal/cubecos/metric.go index d58874f3..e11be274 100644 --- a/internal/cubecos/metric.go +++ b/internal/cubecos/metric.go @@ -135,7 +135,7 @@ var ( ` vmCpuUsageHistoryStmt = ` - from(bucket: "monasca") + from(bucket: "telegraf") |> range(start: -1h) |> filter(fn: (r) => r._measurement == "vm.cpu.utilization_norm_perc" and @@ -145,7 +145,7 @@ var ( ` vmMemoryUsageHistoryStmt = ` - from(bucket: "monasca") + from(bucket: "telegraf") |> range(start: -1h) |> filter(fn: (r) => r._measurement == "vm.mem.free_perc" and @@ -158,7 +158,7 @@ var ( ` vmStorageIopsReadHistoryStmt = ` - from(bucket: "monasca") + from(bucket: "telegraf") |> range(start: -1h) |> filter(fn: (r) => r._measurement == "vm.io.read_bytes_sec" and @@ -169,7 +169,7 @@ var ( ` vmStorageIopsWriteHistoryStmt = ` - from(bucket: "monasca") + from(bucket: "telegraf") |> range(start: -1h) |> filter(fn: (r) => r._measurement == "vm.io.write_bytes_sec" and @@ -180,7 +180,7 @@ var ( ` vmNetworkIngressHistoryStmt = ` - from(bucket: "monasca") + from(bucket: "telegraf") |> range(start: -1h) |> filter(fn: (r) => r._measurement == "vm.net.in_bytes_sec" and @@ -192,7 +192,7 @@ var ( ` vmNetworkEgressHistoryStmt = ` - from(bucket: "monasca") + from(bucket: "telegraf") |> range(start: -1h) |> filter(fn: (r) => r._measurement == "vm.net.out_bytes_sec" and diff --git a/internal/cubecos/module.go b/internal/cubecos/module.go index f0875f85..38025f7f 100644 --- a/internal/cubecos/module.go +++ b/internal/cubecos/module.go @@ -202,7 +202,6 @@ var ( Name: "metrics", Category: "infrascope", Modules: []services.Module{ - {Name: "monasca", IsRepairable: true}, {Name: "telegraf", IsRepairable: true}, {Name: "grafana", IsRepairable: true}, }, diff --git a/internal/cubecos/tuning.go b/internal/cubecos/tuning.go index 4022068a..045b2a6b 100644 --- a/internal/cubecos/tuning.go +++ b/internal/cubecos/tuning.go @@ -86,7 +86,6 @@ const ( ManilaVolumeType = "manila.volume.type" MasakariHostEvacuateAll = "masakari.host.evacuate_all" MasakariWaitPeriod = "masakari.wait.period" - MonascaDebugEnabled = "monasca.debug.enabled" MysqlBackupCuratorRp = "mysql.backup.curator.rp" NetIfMtuName = "net.if.mtu." NetIpv4TcpSyncookies = "net.ipv4.tcp_syncookies" @@ -189,7 +188,6 @@ func setTuningToRoles() { tuningToRoles[ManilaVolumeType] = nodes.AllRoles tuningToRoles[MasakariHostEvacuateAll] = nodes.AllRoles tuningToRoles[MasakariWaitPeriod] = nodes.ControlRoles - tuningToRoles[MonascaDebugEnabled] = nodes.AllRoles tuningToRoles[MysqlBackupCuratorRp] = nodes.AllRoles tuningToRoles[NetIfMtuName] = nodes.AllRoles tuningToRoles[NetIpv4TcpSyncookies] = nodes.AllRoles