Skip to content

Read the per-VM series from telegraf, not monasca #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 2 commits into from
Sep 14, 2026
Merged

Read the per-VM series from telegraf, not monasca #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04b29a1
fix(metrics): read the per-VM series from telegraf, not monasca
Eandalf-Bigstack Sep 11, 2026
ee34714
build(deps): bump cube-cos-openapi to drop monasca and senlin from th…
Eandalf-Bigstack Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/cube-cos-openapi
Open in desktop
Submodule cube-cos-openapi updated 1 files
+11 −24 docs.yaml
12 changes: 6 additions & 6 deletions internal/apis/v1/handlers/metrics/stmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]`).
Expand All @@ -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"`).
Expand All @@ -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"`).
Expand All @@ -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"`).
Expand All @@ -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"]`).
Expand All @@ -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"]`).
Expand Down
12 changes: 6 additions & 6 deletions internal/cubecos/metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion internal/cubecos/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ var (
Name: "metrics",
Category: "infrascope",
Modules: []services.Module{
{Name: "monasca", IsRepairable: true},
{Name: "telegraf", IsRepairable: true},
{Name: "grafana", IsRepairable: true},
},
Expand Down
2 changes: 0 additions & 2 deletions internal/cubecos/tuning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.<name>"
NetIpv4TcpSyncookies = "net.ipv4.tcp_syncookies"
Expand Down Expand Up @@ -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
Expand Down
Loading