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

Commit b6909e3

Browse files
Merge pull request #53 from coder/revert-49
2 parents 11671b7 + c41a771 commit b6909e3

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,13 @@ values which are defined [here](https://github.com/grafana/helm-charts/tree/main
328328
| global.externalZone | string | `"svc.cluster.local"` | |
329329
| global.postgres | object | `{"alerts":{"groups":{"Basic":{"delay":"1m","enabled":true},"Connections":{"delay":"5m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}},"Notifications":{"delay":"15m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}}}},"database":"coder","exporter":{"image":"quay.io/prometheuscommunity/postgres-exporter"},"hostname":"localhost","mountSecret":"secret-postgres","password":null,"port":5432,"sslmode":"disable","sslrootcert":null,"username":"coder","volumeMounts":[],"volumes":[]}` | postgres connection information NOTE: these settings are global so we can parameterise some values which get rendered by subcharts |
330330
| global.postgres.alerts | object | `{"groups":{"Basic":{"delay":"1m","enabled":true},"Connections":{"delay":"5m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}},"Notifications":{"delay":"15m","enabled":true,"thresholds":{"critical":0.9,"notify":0.5,"warning":0.8}}}}` | alerts for postgres |
331-
| global.telemetry | object | `{"metrics":{"native_histograms":false,"scrape_interval":"15s","scrape_timeout":"12s"},"profiling":{"delta_profiling_duration":"30s","scrape_interval":"60s","scrape_timeout":"70s"}}` | control telemetry collection |
331+
| global.telemetry | object | `{"metrics":{"native_histograms":false,"scrape_interval":"15s","scrape_timeout":"12s"},"profiling":{"scrape_interval":"60s","scrape_timeout":"70s"}}` | control telemetry collection |
332332
| global.telemetry.metrics | object | `{"native_histograms":false,"scrape_interval":"15s","scrape_timeout":"12s"}` | control metric collection |
333333
| global.telemetry.metrics.native_histograms | bool | `false` | enable Prometheus native histograms or default to classic histograms |
334334
| global.telemetry.metrics.scrape_interval | string | `"15s"` | how often the collector will scrape discovered pods |
335335
| global.telemetry.metrics.scrape_timeout | string | `"12s"` | how long a request will be allowed to wait before being canceled |
336-
| global.telemetry.profiling.delta_profiling_duration | string | `"30s"` | duration of each pprof profiling capture, must be less than scrape_interval |
337336
| global.telemetry.profiling.scrape_interval | string | `"60s"` | how often the collector will scrape pprof endpoints |
338-
| global.telemetry.profiling.scrape_timeout | string | `"70s"` | how long a request will be allowed to wait before being canceled |
337+
| global.telemetry.profiling.scrape_timeout | string | `"70s"` | how long a request will be allowed to wait before being canceled, must be larger than scrape_interval |
339338
| global.zone | string | `"svc"` | |
340339
| grafana-agent.agent.clustering.enabled | bool | `true` | |
341340
| grafana-agent.agent.configMap.create | bool | `false` | |

‎coder-observability/templates/_collector-config.tpl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ pyroscope.scrape "pods" {
210210
211211
scrape_interval = "{{ .Values.global.telemetry.profiling.scrape_interval }}"
212212
scrape_timeout = "{{ .Values.global.telemetry.profiling.scrape_timeout }}"
213-
delta_profiling_duration = "{{ .Values.global.telemetry.profiling.delta_profiling_duration }}"
214213
215214
clustering {
216215
enabled = true

‎coder-observability/values.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,8 @@ global:
118118
profiling:
119119
# global.telemetry.profiling.scrape_interval -- how often the collector will scrape pprof endpoints
120120
scrape_interval: 60s
121-
# global.telemetry.profiling.scrape_timeout -- how long a request will be allowed to wait before being canceled
121+
# global.telemetry.profiling.scrape_timeout -- how long a request will be allowed to wait before being canceled, must be larger than scrape_interval
122122
scrape_timeout: 70s
123-
# global.telemetry.profiling.delta_profiling_duration -- duration of each pprof profiling capture, must be less than scrape_interval
124-
delta_profiling_duration: 30s
125123

126124
# global.postgres -- postgres connection information
127125
# NOTE: these settings are global so we can parameterise some values which get rendered by subcharts

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /