Commit e906c9e

authored

fix: avoid referencing loki when disabled (#61)

1 parent 294ac3b commit e906c9eCopy full SHA for e906c9e

File tree

3 files changed

+11

-2

lines changed

README.md
coder-observability
- Chart.yaml
- templates
  - _collector-config.tpl

3 files changed

+11

-2

lines changed

`‎README.md‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ Logs will be scraped from all pods in the Kubernetes cluster.`
`22`	`22`
`23`	`23`	```bash
`24`	`24`	`helm repo add coder-observability https://helm.coder.com/observability`
`25`		`-helm upgrade --install coder-observability coder-observability/coder-observability --version 0.4.1 --namespace coder-observability --create-namespace`
	`25`	`+helm upgrade --install coder-observability coder-observability/coder-observability --version 0.4.2 --namespace coder-observability --create-namespace`
`26`	`26`	```
`27`	`27`
`28`	`28`	`## Requirements`

`‎coder-observability/Chart.yaml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ apiVersion: v2`
`2`	`2`	`name: coder-observability`
`3`	`3`	`description: Gain insights into your Coder deployment`
`4`	`4`	`type: application`
`5`		`-version: 0.4.1`
	`5`	`+version: 0.4.2`
`6`	`6`	`dependencies:`
`7`	`7`	`- name: pyroscope`
`8`	`8`	`condition: pyroscope.enabled`

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

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`{{ $agent.logging }}`
`5`	`5`	`{{ $agent.discovery }}`
`6`	`6`
	`7`	`+{{- if .Values.loki.enabled }}`
	`8`	`+`
`7`	`9`	`discovery.relabel "pod_logs" {`
`8`	`10`	`targets = discovery.kubernetes.pods.targets`
`9`	`11`	`{{ $agent.commonRelabellings \| nindent 2 }}`
`@@ -25,6 +27,7 @@ discovery.relabel "pod_logs" {`
`25`	`27`	`{{ $agent.podLogsRelabelRules \| trim \| nindent 2 }}`
`26`	`28`	`{{- end }}`
`27`	`29`	`}`
	`30`	`+{{- end }}`
`28`	`31`
`29`	`32`	`discovery.relabel "pod_metrics" {`
`30`	`33`	`targets = discovery.kubernetes.pods.targets`
`@@ -122,6 +125,7 @@ discovery.relabel "pod_pprof" {`
`122`	`125`	`{{ $agent.podMetricsRelabelRules \| trim \| nindent 2 }}`
`123`	`126`	`{{- end }}`
`124`	`127`	`}`
	`128`	`+{{- if .Values.loki.enabled }}`
`125`	`129`
`126`	`130`	`local.file_match "pod_logs" {`
`127`	`131`	`path_targets = discovery.relabel.pod_logs.output`
`@@ -194,6 +198,7 @@ loki.process "pod_logs" {`
`194`	`198`
`195`	`199`	`forward_to = [loki.write.loki.receiver]`
`196`	`200`	`}`
	`201`	`+{{- end }}`
`197`	`202`	`{{ if $agent.extraBlocks -}}`
`198`	`203`	`{{ $agent.extraBlocks }}`
`199`	`204`	`{{- end }}`
`@@ -379,15 +384,19 @@ otelcol.exporter.prometheus "to_prometheus" {`
`379`	`384`	`prometheus.remote_write.default.receiver,`
`380`	`385`	`]`
`381`	`386`	`}`
	`387`	`+{{- if .Values.loki.enabled }}`
`382`	`388`	`otelcol.exporter.loki "to_loki" {`
`383`	`389`	`forward_to = [`
`384`	`390`	`loki.write.loki.receiver,`
`385`	`391`	`]`
`386`	`392`	`}`
	`393`	`+{{- end }}`
`387`	`394`	`otelcol.processor.batch "default" {`
`388`	`395`	`output {`
`389`	`396`	`metrics = [otelcol.exporter.prometheus.to_prometheus.input]`
	`397`	`+{{- if .Values.loki.enabled }}`
`390`	`398`	`logs = [otelcol.exporter.loki.to_loki.input]`
	`399`	`+{{- end }}`
`391`	`400`	`}`
`392`	`401`	`}`
`393`	`402`	`{{- end -}}`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e906c9e

File tree

3 files changed

3 files changed

`‎README.md‎`

`‎coder-observability/Chart.yaml‎`

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

0 commit comments