Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit8f40ee3

Browse files
authored
Revert "feat: make agent stats' cardinality configurable (#12468)" (#12533)
This reverts commit21d1873.
1 parent773862a commit8f40ee3

File tree

18 files changed

+85
-747
lines changed

18 files changed

+85
-747
lines changed

‎cli/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,13 @@ func enablePrometheus(
229229
afterCtx(ctx,closeInsightsMetricsCollector)
230230

231231
ifvals.Prometheus.CollectAgentStats {
232-
closeAgentStatsFunc,err:=prometheusmetrics.AgentStats(ctx,logger,options.PrometheusRegistry,options.Database,time.Now(),0,options.DeploymentValues.Prometheus.AggregateAgentStatsBy.Value())
232+
closeAgentStatsFunc,err:=prometheusmetrics.AgentStats(ctx,logger,options.PrometheusRegistry,options.Database,time.Now(),0)
233233
iferr!=nil {
234234
returnnil,xerrors.Errorf("register agent stats prometheus metric: %w",err)
235235
}
236236
afterCtx(ctx,closeAgentStatsFunc)
237237

238-
metricsAggregator,err:=prometheusmetrics.NewMetricsAggregator(logger,options.PrometheusRegistry,0,options.DeploymentValues.Prometheus.AggregateAgentStatsBy.Value())
238+
metricsAggregator,err:=prometheusmetrics.NewMetricsAggregator(logger,options.PrometheusRegistry,0)
239239
iferr!=nil {
240240
returnnil,xerrors.Errorf("can't initialize metrics aggregator: %w",err)
241241
}

‎cli/testdata/coder_server_--help.golden

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ INTROSPECTION / PROMETHEUS OPTIONS:
123123
--prometheus-address host:port, $CODER_PROMETHEUS_ADDRESS (default: 127.0.0.1:2112)
124124
The bind address to serve prometheus metrics.
125125

126-
--prometheus-aggregate-agent-stats-by string-array, $CODER_PROMETHEUS_AGGREGATE_AGENT_STATS_BY (default: agent_name,template_name,username,workspace_name)
127-
When collecting agent stats, aggregate metrics by a given set of
128-
comma-separated labels to reduce cardinality. Accepted values are
129-
agent_name, template_name, username, workspace_name.
130-
131126
--prometheus-collect-agent-stats bool, $CODER_PROMETHEUS_COLLECT_AGENT_STATS
132127
Collect agent stats (may increase charges for metrics storage).
133128

‎cli/testdata/server-config.yaml.golden

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,6 @@ introspection:
188188
# Collect agent stats (may increase charges for metrics storage).
189189
# (default: <unset>, type: bool)
190190
collect_agent_stats: false
191-
# When collecting agent stats, aggregate metrics by a given set of comma-separated
192-
# labels to reduce cardinality. Accepted values are agent_name, template_name,
193-
# username, workspace_name.
194-
# (default: agent_name,template_name,username,workspace_name, type: string-array)
195-
aggregate_agent_stats_by:
196-
- agent_name
197-
- template_name
198-
- username
199-
- workspace_name
200191
# Collect database metrics (may increase charges for metrics storage).
201192
# (default: false, type: bool)
202193
collect_db_metrics: false

‎coderd/agentmetrics/labels.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎coderd/agentmetrics/labels_test.go

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp