Mar 11, 2024 · Mar 11, 2024
diff --git a/cli/server.go b/cli/server.go
 afterCtx(ctx, closeInsightsMetricsCollector)

 if vals.Prometheus.CollectAgentStats {
 closeAgentStatsFunc, err := prometheusmetrics.AgentStats(ctx, logger, options.PrometheusRegistry, options.Database, time.Now(), 0, options.DeploymentValues.Prometheus.AggregateAgentStatsBy.Value())
 closeAgentStatsFunc, err := prometheusmetrics.AgentStats(ctx, logger, options.PrometheusRegistry, options.Database, time.Now(), 0)
 if err != nil {
 return nil, xerrors.Errorf("register agent stats prometheus metric: %w", err)
 }
 afterCtx(ctx, closeAgentStatsFunc)

 metricsAggregator, err := prometheusmetrics.NewMetricsAggregator(logger, options.PrometheusRegistry, 0, options.DeploymentValues.Prometheus.AggregateAgentStatsBy.Value())
 metricsAggregator, err := prometheusmetrics.NewMetricsAggregator(logger, options.PrometheusRegistry, 0)
 if err != nil {
 return nil, xerrors.Errorf("can't initialize metrics aggregator: %w", err)
 }
diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
      --prometheus-address host:port, $CODER_PROMETHEUS_ADDRESS (default: 127.0.0.1:2112)
          The bind address to serve prometheus metrics.

      --prometheus-aggregate-agent-stats-by string-array, $CODER_PROMETHEUS_AGGREGATE_AGENT_STATS_BY (default: agent_name,template_name,username,workspace_name)
          When collecting agent stats, aggregate metrics by a given set of
          comma-separated labels to reduce cardinality. Accepted values are
          agent_name, template_name, username, workspace_name.

      --prometheus-collect-agent-stats bool, $CODER_PROMETHEUS_COLLECT_AGENT_STATS
          Collect agent stats (may increase charges for metrics storage).

diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
    # Collect agent stats (may increase charges for metrics storage).
    # (default: <unset>, type: bool)
    collect_agent_stats: false
    # When collecting agent stats, aggregate metrics by a given set of comma-separated
    # labels to reduce cardinality. Accepted values are agent_name, template_name,
    # username, workspace_name.
    # (default: agent_name,template_name,username,workspace_name, type: string-array)
    aggregate_agent_stats_by:
      - agent_name
      - template_name
      - username
      - workspace_name
    # Collect database metrics (may increase charges for metrics storage).
    # (default: false, type: bool)
    collect_db_metrics: false
diff --git a/coderd/agentmetrics/labels.go b/coderd/agentmetrics/labels.go
diff --git a/coderd/agentmetrics/labels_test.go b/coderd/agentmetrics/labels_test.go
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -229,13 +229,13 @@ func enablePrometheus(
		afterCtx(ctx, closeInsightsMetricsCollector)

		if vals.Prometheus.CollectAgentStats {
		closeAgentStatsFunc, err := prometheusmetrics.AgentStats(ctx, logger, options.PrometheusRegistry, options.Database, time.Now(), 0, options.DeploymentValues.Prometheus.AggregateAgentStatsBy.Value())
		closeAgentStatsFunc, err := prometheusmetrics.AgentStats(ctx, logger, options.PrometheusRegistry, options.Database, time.Now(), 0)
		if err != nil {
		return nil, xerrors.Errorf("register agent stats prometheus metric: %w", err)
		}
		afterCtx(ctx, closeAgentStatsFunc)

		metricsAggregator, err := prometheusmetrics.NewMetricsAggregator(logger, options.PrometheusRegistry, 0, options.DeploymentValues.Prometheus.AggregateAgentStatsBy.Value())
		metricsAggregator, err := prometheusmetrics.NewMetricsAggregator(logger, options.PrometheusRegistry, 0)
		if err != nil {
		return nil, xerrors.Errorf("can't initialize metrics aggregator: %w", err)
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -123,11 +123,6 @@ INTROSPECTION / PROMETHEUS OPTIONS:
		--prometheus-address host:port, $CODER_PROMETHEUS_ADDRESS (default: 127.0.0.1:2112)
		The bind address to serve prometheus metrics.

		--prometheus-aggregate-agent-stats-by string-array, $CODER_PROMETHEUS_AGGREGATE_AGENT_STATS_BY (default: agent_name,template_name,username,workspace_name)
		When collecting agent stats, aggregate metrics by a given set of
		comma-separated labels to reduce cardinality. Accepted values are
		agent_name, template_name, username, workspace_name.

		--prometheus-collect-agent-stats bool, $CODER_PROMETHEUS_COLLECT_AGENT_STATS
		Collect agent stats (may increase charges for metrics storage).

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -188,15 +188,6 @@ introspection:
		# Collect agent stats (may increase charges for metrics storage).
		# (default: <unset>, type: bool)
		collect_agent_stats: false
		# When collecting agent stats, aggregate metrics by a given set of comma-separated
		# labels to reduce cardinality. Accepted values are agent_name, template_name,
		# username, workspace_name.
		# (default: agent_name,template_name,username,workspace_name, type: string-array)
		aggregate_agent_stats_by:
		- agent_name
		- template_name
		- username
		- workspace_name
		# Collect database metrics (may increase charges for metrics storage).
		# (default: false, type: bool)
		collect_db_metrics: false
Expand Down