Skip to content

chore: add prometheus monitoring of workspace traffic generation #7583

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
merged 21 commits into from
May 26, 2023
Merged

chore: add prometheus monitoring of workspace traffic generation #7583

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f62cf16
add prometheus metrics endpoint to workspacetraffic command
johnstcn May 15, 2023
00b9eca
use self-managed prometheus
johnstcn May 16, 2023
9a9778c
plumb in prom properly
johnstcn May 16, 2023
f00b8d7
fix label on second pod monitor
johnstcn May 16, 2023
69bc5ad
do not clobber existing prometheus
johnstcn May 16, 2023
57d338d
remote_write all metrics
johnstcn May 17, 2023
a1d14df
add convenience script to create traffic inside cluster
johnstcn May 17, 2023
fb96c4d
fixup! add convenience script to create traffic inside cluster
johnstcn May 17, 2023
59ef445
make fmt, make gen
johnstcn May 17, 2023
6734521
Update scaletest/terraform/prometheus.tf
johnstcn May 17, 2023
4ab2314
Merge remote-tracking branch 'origin/main' into cj/workspacetraffic-p…
johnstcn May 24, 2023
d54af33
address PR comments
johnstcn May 24, 2023
8c48d2b
move test to workspacetraffic package
johnstcn May 25, 2023
cf00b5a
Merge remote-tracking branch 'origin/main' into cj/workspacetraffic-p…
johnstcn May 25, 2023
e6917e6
update golden files
johnstcn May 25, 2023
ea71c4f
separate prom address var
johnstcn May 25, 2023
399e506
break out errors in to read/write
johnstcn May 26, 2023
ec96a00
ignore certain errors such as websocket closing or context cancellation
johnstcn May 26, 2023
a4ecd0c
test metrics more closely
johnstcn May 26, 2023
fe0ecfc
fixup! test metrics more closely
johnstcn May 26, 2023
239ba96
add wait for prometheus metrics
johnstcn May 26, 2023
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
Prev Previous commit
Next Next commit
do not clobber existing prometheus
  • Loading branch information
@johnstcn
johnstcn committed May 17, 2023
commit 69bc5adb3e927fa433cd32db490da03d5f69533b
27 changes: 14 additions & 13 deletions cli/scaletest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

"github.com/google/uuid"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"go.opentelemetry.io/otel/trace"
"golang.org/x/xerrors"

Expand Down Expand Up @@ -900,14 +901,14 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd {

func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd {
var (
tickInterval time.Duration
bytesPerTick int64
prometheusAddress string
client = &codersdk.Client{}
tracingFlags = &scaletestTracingFlags{}
strategy = &scaletestStrategyFlags{}
cleanupStrategy = &scaletestStrategyFlags{cleanup: true}
output = &scaletestOutputFlags{}
tickInterval time.Duration
bytesPerTick int64
scaletestPrometheusAddress string
client = &codersdk.Client{}
tracingFlags = &scaletestTracingFlags{}
strategy = &scaletestStrategyFlags{}
cleanupStrategy = &scaletestStrategyFlags{cleanup: true}
output = &scaletestOutputFlags{}
)

cmd := &clibase.Cmd{
Expand All @@ -922,7 +923,7 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd {
metrics := workspacetraffic.NewMetrics(reg, "username", "workspace_name", "agent_name")

logger := slog.Make(sloghuman.Sink(io.Discard))
prometheusSrvClose := ServeHandler(ctx, logger, prometheusMetricsHandler(), prometheusAddress, "prometheus")
prometheusSrvClose := ServeHandler(ctx, logger, promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), scaletestPrometheusAddress, "prometheus")
defer prometheusSrvClose()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if we need to add some graceful period before closing to make sure that all relevant metrics are scraped before the tool goes down.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this would be heavily dependent on the prometheus scrape interval. Simplest is probably to expose it as a parameter to be set by the test operatorl.


// Bypass rate limiting
Expand Down Expand Up @@ -1052,11 +1053,11 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd {
Value: clibase.DurationOf(&tickInterval),
},
{
Flag: "prometheus-address",
Flag: "scaletest-prometheus-address",
Env: "CODER_SCALETEST_PROMETHEUS_ADDRESS",
Default: "0.0.0.0:2112",
Description: "Address on which to expose prometheus metrics.",
Value: clibase.StringOf(&prometheusAddress),
Default: "0.0.0.0:21112",
Description: "Address on which to expose scaletest prometheus metrics.",
Value: clibase.StringOf(&scaletestPrometheusAddress),
},
}

Expand Down