Skip to content

Commit eebd750

Browse files
[ONPREM-2157] Set instanceSelector on tempo grafana datasource to match labels (#66)
* Set instanceSelector on tempo grafana datasource to match labels * Prepare 0.1.0-alpha.8 release
2 parents 16fbbc6 + 95aac71 commit eebd750

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: server-monitoring-stack
33
description: A reference Helm chart for setting up a monitoring stack for CircleCI server
4-
version: 0.1.0-alpha.7
4+
version: 0.1.0-alpha.8
55
dependencies:
66
- name: prometheus-operator-crds
77
version: 19.0.0

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This repository is currently under active development and is not yet a supported
1616

1717
A reference Helm chart for setting up a monitoring stack for CircleCI server
1818

19-
![Version: 0.1.0-alpha.7](https://img.shields.io/badge/Version-0.1.0--alpha.7-informational?style=flat-square)
19+
![Version: 0.1.0-alpha.8](https://img.shields.io/badge/Version-0.1.0--alpha.8-informational?style=flat-square)
2020

2121
## Installing the Monitoring Stack
2222

@@ -58,7 +58,7 @@ Before installing the full chart, you must first install the dependency subchart
5858
Install the Prometheus Custom Resource Definitions (CRDs) and the Grafana operator chart. This assumes you are installing it in the same namespace as your CircleCI server installation:
5959

6060
```bash
61-
$ helm install server-monitoring-stack server-monitoring-stack/server-monitoring-stack --set global.enabled=false --set prometheusOperator.installCRDs=true --version 0.1.0-alpha.7 -n <your-server-namespace>
61+
$ helm install server-monitoring-stack server-monitoring-stack/server-monitoring-stack --set global.enabled=false --set prometheusOperator.installCRDs=true --version 0.1.0-alpha.8 -n <your-server-namespace>
6262
```
6363

6464
> **_NOTE:_** It's possible to install the monitoring stack in a different namespace than the CircleCI server installation. If you do so, set the `prometheus.serviceMonitor.selectorNamespaces` value with the target namespace.
@@ -95,7 +95,7 @@ $ kubectl wait --for=condition=available --timeout=120s deployment/tempo-operato
9595
Next, install the Helm chart using the following command:
9696

9797
```bash
98-
$ helm upgrade --install server-monitoring-stack server-monitoring-stack/server-monitoring-stack --reset-values --version 0.1.0-alpha.7 -n <your-server-namespace>
98+
$ helm upgrade --install server-monitoring-stack server-monitoring-stack/server-monitoring-stack --reset-values --version 0.1.0-alpha.8 -n <your-server-namespace>
9999
```
100100

101101
### 5. Verify Prometheus Is Up and Targeting Telegraf

templates/tempo/tempomonolithic.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ spec:
4545
grafana:
4646
dataSource:
4747
enabled: true
48+
instanceSelector:
49+
matchLabels:
50+
dashboards: grafana
4851

4952
{{- with .Values.tempo.customConfig }}
5053
extraConfig:

0 commit comments

Comments
 (0)