Skip to content

Commit 01fa52a

Browse files
authored
Fixes helm chart default scrape_configs (grafana/phlare#590)
* Fixes helm chart default scrape_configs * lint * lint * Fixes tests * Various fixes * Fixes tests * Fixes tests
1 parent 33d359d commit 01fa52a

File tree

14 files changed

+335
-135
lines changed

14 files changed

+335
-135
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ define deploy
146146
kubectl get pods
147147
$(BIN)/helm upgrade --install $(1) ./operations/phlare/helm/phlare $(2) \
148148
--set phlare.image.tag=$(IMAGE_TAG) --set phlare.image.repository=$(IMAGE_PREFIX)phlare --set phlare.service.port_name=http-metrics \
149+
--set phlare.podAnnotations."profiles\.grafana\.com\/memory\.port_name"=http-metrics \
150+
--set phlare.podAnnotations."profiles\.grafana\.com\/cpu\.port_name"=http-metrics \
151+
--set phlare.podAnnotations."profiles\.grafana\.com\/goroutine\.port_name"=http-metrics \
149152
--set phlare.components.querier.resources=null --set phlare.components.distributor.resources=null --set phlare.components.ingester.resources=null
150153
endef
151154

docs/sources/operators-guide/deploy-kubernetes/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ Modify the Helm deployment by running:
171171
## Optional: Scrape your own workload's profiles
172172

173173
The Phlare chart uses a default configuration that causes its agent to scrape Pods, provided they have the correct annotations.
174-
This functionality uses [relabel_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) and [kubernetes_sd_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config) that might be familar from the Prometheus or Grafna Agent config.
174+
This functionality uses [relabel_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) and [kubernetes_sd_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config) you might be familiar with the Prometheus or Grafana Agent config.
175175

176-
In order to get Phlare to scrape pods, you must add the following annotations to the the pods:
176+
To get Phlare to scrape pods, you must add the following annotations to the pods:
177177

178178
```yaml
179179
metadata:

operations/phlare/helm/phlare/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: phlare
33
description: 🔥 horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation system
44
type: application
5-
version: 0.5.2
5+
version: 0.5.3
66
appVersion: 0.5.1
77
dependencies:
88
- name: minio

operations/phlare/helm/phlare/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# phlare
22

3-
![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.1](https://img.shields.io/badge/AppVersion-0.5.1-informational?style=flat-square)
3+
![Version: 0.5.3](https://img.shields.io/badge/Version-0.5.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.1](https://img.shields.io/badge/AppVersion-0.5.1-informational?style=flat-square)
44

55
🔥 horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation system
66

@@ -38,8 +38,11 @@
3838
| phlare.persistence.annotations | object | `{}` | |
3939
| phlare.persistence.enabled | bool | `false` | |
4040
| phlare.persistence.size | string | `"10Gi"` | |
41+
| phlare.podAnnotations."profiles.grafana.com/cpu.port_name" | string | `"http2"` | |
4142
| phlare.podAnnotations."profiles.grafana.com/cpu.scrape" | string | `"true"` | |
43+
| phlare.podAnnotations."profiles.grafana.com/goroutine.port_name" | string | `"http2"` | |
4244
| phlare.podAnnotations."profiles.grafana.com/goroutine.scrape" | string | `"true"` | |
45+
| phlare.podAnnotations."profiles.grafana.com/memory.port_name" | string | `"http2"` | |
4346
| phlare.podAnnotations."profiles.grafana.com/memory.scrape" | string | `"true"` | |
4447
| phlare.podSecurityContext.fsGroup | int | `10001` | |
4548
| phlare.podSecurityContext.runAsNonRoot | bool | `true` | |

0 commit comments

Comments
 (0)