Skip to content

Commit a32d8af

Browse files
abeatrixabeatrix
authored
Create prometheus configmap for each instance size (#4)
* Fix promethus queries * fix grafana dashboard * Fix k3s examples
1 parent 8723f67 commit a32d8af

26 files changed

+335
-113
lines changed

‎base/monitoring/cadvisor/cadvisor.Service.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: cadvisor
5+
annotations:
6+
prometheus.io/port: "48080"
7+
sourcegraph.prometheus/scrape: "true"
8+
labels:
9+
app: cadvisor
10+
deploy: sourcegraph
11+
sourcegraph-resource-requires: no-cluster-admin
12+
app.kubernetes.io/component: cadvisor
13+
spec:
14+
ports:
15+
- name: http # For querying metrics.
16+
port: 48080
17+
selector:
18+
app: cadvisor
19+
type: ClusterIP

‎base/monitoring/cadvisor/kustomization.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ kind: Kustomization
33
resources:
44
- cadvisor.DaemonSet.yaml
55
- cadvisor.ServiceAccount.yaml
6+
- cadvisor.Service.yaml

‎base/monitoring/grafana/grafana.ConfigMap.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
labels:
5+
deploy: sourcegraph
6+
sourcegraph-resource-requires: no-cluster-admin
7+
app.kubernetes.io/component: grafana
8+
name: grafana
29
data:
310
datasources.yml: |
411
apiVersion: 1
@@ -10,10 +17,3 @@ data:
1017
url: http://prometheus:30090
1118
isDefault: true
1219
editable: false
13-
kind: ConfigMap
14-
metadata:
15-
labels:
16-
deploy: sourcegraph
17-
sourcegraph-resource-requires: no-cluster-admin
18-
app.kubernetes.io/component: grafana
19-
name: grafana

‎base/monitoring/prometheus/prometheus.ConfigMap.yaml‎

Lines changed: 67 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,62 @@ data:
3030
3131
# Configure targets to scrape
3232
scrape_configs:
33+
3334
# Scrape prometheus itself for metrics.
3435
- job_name: 'builtin-prometheus'
3536
static_configs:
3637
- targets: ['127.0.0.1:9092']
38+
3739
- job_name: 'builtin-alertmanager'
3840
metrics_path: /alertmanager/metrics
3941
static_configs:
4042
- targets: ['127.0.0.1:9093']
4143
42-
- job_name: 'sg'
44+
- job_name: 'sourcegraph-services'
4345
relabel_configs:
4446
- source_labels: [__address__]
4547
target_label: instance
4648
regex: (.*)\.(.*)
4749
replacement: ${1}_${2}
50+
metric_relabel_configs:
51+
- source_labels: [container_label_io_kubernetes_pod_namespace]
52+
regex: kube-system
53+
action: drop
4854
file_sd_configs:
4955
- files:
5056
- '/sg_prometheus_add_ons/*_targets.yml'
57+
58+
- job_name: 'cadvisor'
59+
static_configs:
60+
- targets: ['cadvisor:48080']
61+
relabel_configs:
62+
- source_labels: [__address__]
63+
target_label: instance
64+
regex: (.*)\.(.*)
65+
replacement: ${1}_${2}
66+
- source_labels: [container_label_io_kubernetes_pod_name]
67+
target_label: name
68+
metric_relabel_configs:
69+
- source_labels: [container_label_io_kubernetes_pod_namespace]
70+
regex: kube-system
71+
action: drop
72+
- source_labels: [container_label_io_kubernetes_container_name, container_label_io_kubernetes_pod_name]
73+
regex: (.+)
74+
action: replace
75+
target_label: name
76+
separator: '-'
77+
5178
prometheus_targets.yml: |
5279
- labels:
5380
nodename: "sourcegraph-services"
54-
job: node
81+
job: sourcegraph-frontend
5582
targets:
56-
- cadvisor:8080
57-
- sourcegraph-frontend-internal:6060
83+
- sourcegraph-frontend:6060
5884
- labels:
5985
nodename: "sourcegraph-services"
6086
job: github-proxy
6187
targets:
62-
- github-proxy:80
88+
- github-proxy:6060
6389
- labels:
6490
nodename: "sourcegraph-services"
6591
job: repo-updater
@@ -74,7 +100,7 @@ data:
74100
nodename: "sourcegraph-services"
75101
job: worker-executors
76102
targets:
77-
- worker:6996
103+
- worker-executors:6996
78104
- labels:
79105
nodename: "sourcegraph-services"
80106
job: node
@@ -85,97 +111,6 @@ data:
85111
job: precise-code-intel-worker
86112
targets:
87113
- precise-code-intel-worker:6060
88-
# Add new entries here for every searcher/symbol/gitserver replica.
89-
- labels:
90-
nodename: "sourcegraph-services"
91-
job: zoekt-indexserver
92-
targets:
93-
- indexed-search-0.indexed-search:6072
94-
- indexed-search-1.indexed-search:6072
95-
- indexed-search-2.indexed-search:6072
96-
- indexed-search-3.indexed-search:6072
97-
- indexed-search-4.indexed-search:6072
98-
- indexed-search-5.indexed-search:6072
99-
- indexed-search-6.indexed-search:6072
100-
- indexed-search-7.indexed-search:6072
101-
- indexed-search-8.indexed-search:6072
102-
- indexed-search-9.indexed-search:6072
103-
- indexed-search-10.indexed-search:6072
104-
- labels:
105-
nodename: "sourcegraph-services"
106-
job: zoekt-webserver
107-
targets:
108-
- indexed-search-0.indexed-search:6070
109-
- indexed-search-1.indexed-search:6070
110-
- indexed-search-2.indexed-search:6070
111-
- indexed-search-3.indexed-search:6070
112-
- indexed-search-4.indexed-search:6070
113-
- indexed-search-5.indexed-search:6070
114-
- indexed-search-6.indexed-search:6070
115-
- indexed-search-7.indexed-search:6070
116-
- indexed-search-8.indexed-search:6070
117-
- indexed-search-9.indexed-search:6070
118-
- indexed-search-10.indexed-search:6070
119-
- labels:
120-
nodename: "sourcegraph-services"
121-
job: sourcegraph-frontend
122-
targets:
123-
- sourcegraph-frontend-0.sourcegraph-frontend:6060
124-
- sourcegraph-frontend-1.sourcegraph-frontend:6060
125-
- sourcegraph-frontend-2.sourcegraph-frontend:6060
126-
- sourcegraph-frontend-3.sourcegraph-frontend:6060
127-
- sourcegraph-frontend-4.sourcegraph-frontend:6060
128-
- sourcegraph-frontend-5.sourcegraph-frontend:6060
129-
- sourcegraph-frontend-6.sourcegraph-frontend:6060
130-
- sourcegraph-frontend-7.sourcegraph-frontend:6060
131-
- sourcegraph-frontend-8.sourcegraph-frontend:6060
132-
- sourcegraph-frontend-9.sourcegraph-frontend:6060
133-
- sourcegraph-frontend-10.sourcegraph-frontend:6060
134-
- labels:
135-
nodename: "sourcegraph-services"
136-
job: gitserver
137-
targets:
138-
- gitserver-0.gitserver:6060
139-
- gitserver-1.gitserver:6060
140-
- gitserver-2.gitserver:6060
141-
- gitserver-3.gitserver:6060
142-
- gitserver-4.gitserver:6060
143-
- gitserver-5.gitserver:6060
144-
- gitserver-6.gitserver:6060
145-
- gitserver-7.gitserver:6060
146-
- gitserver-8.gitserver:6060
147-
- gitserver-9.gitserver:6060
148-
- gitserver-10.gitserver:6060
149-
- labels:
150-
nodename: "sourcegraph-services"
151-
job: searcher
152-
targets:
153-
- searcher-0.searcher:6060
154-
- searcher-1.searcher:6060
155-
- searcher-2.searcher:6060
156-
- searcher-3.searcher:6060
157-
- searcher-4.searcher:6060
158-
- searcher-5.searcher:6060
159-
- searcher-6.searcher:6060
160-
- searcher-7.searcher:6060
161-
- searcher-8.searcher:6060
162-
- searcher-9.searcher:6060
163-
- searcher-10.searcher:6060
164-
- labels:
165-
nodename: "sourcegraph-services"
166-
job: symbols
167-
targets:
168-
- symbols-0.symbols:6060
169-
- symbols-1.symbols:6060
170-
- symbols-2.symbols:6060
171-
- symbols-3.symbols:6060
172-
- symbols-4.symbols:6060
173-
- symbols-5.symbols:6060
174-
- symbols-6.symbols:6060
175-
- symbols-7.symbols:6060
176-
- symbols-8.symbols:6060
177-
- symbols-9.symbols:6060
178-
- symbols-10.symbols:6060
179114
- labels:
180115
nodename: "sourcegraph-services"
181116
job: pgsql
@@ -211,9 +146,10 @@ data:
211146
job: otel-collector
212147
targets:
213148
- otel-collector:8888
149+
214150
extra_rules.yml: |
215151
groups:
216-
- name: docker.rules
152+
- name: container.rules
217153
rules:
218154
- record: container:process_cpu_seconds_total:ratio_rate5m
219155
expr: sum by (instance) (rate(process_cpu_seconds_total[5m])) / engine_daemon_engine_cpus_cpus
@@ -223,3 +159,36 @@ data:
223159
expr: max by (instance) (process_resident_memory_bytes)
224160
- record: container:process_virtual_memory_bytes:max
225161
expr: max by (instance) (process_virtual_memory_bytes)
162+
163+
symbols_targets.yml: |
164+
- labels:
165+
nodename: "sourcegraph-services"
166+
job: symbols
167+
targets:
168+
- symbols-0.symbols:6060
169+
170+
searcher_targets.yml: |
171+
- labels:
172+
nodename: "sourcegraph-services"
173+
job: searcher
174+
targets:
175+
- searcher-0.searcher:6060
176+
177+
gitserver_targets.yml: |
178+
- labels:
179+
nodename: "sourcegraph-services"
180+
job: gitserver
181+
targets:
182+
- gitserver-0.gitserver:6060
183+
184+
indexed-search_targets.yml: |
185+
- labels:
186+
nodename: "sourcegraph-services"
187+
job: zoekt-indexserver
188+
targets:
189+
- indexed-search-0.indexed-search:6072
190+
- labels:
191+
nodename: "sourcegraph-services"
192+
job: zoekt-webserver
193+
targets:
194+
- indexed-search-0.indexed-search:6070

‎base/sourcegraph/frontend/sourcegraph-frontend.Service.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ spec:
1515
- name: http
1616
port: 30080
1717
targetPort: http
18+
- name: debug
19+
port: 6060
20+
targetPort: debug
1821
selector:
1922
app: sourcegraph-frontend
2023
type: ClusterIP

‎base/sourcegraph/redis/redis-cache.Service.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ spec:
1515
- name: redis
1616
port: 6379
1717
targetPort: redis
18+
- name: redisexp
19+
port: 9121
20+
targetPort: redisexp
1821
selector:
1922
app: redis-cache
2023
type: ClusterIP

‎base/sourcegraph/redis/redis-store.Service.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ spec:
1515
- name: redis
1616
port: 6379
1717
targetPort: redis
18+
- name: redisexp
19+
port: 9121
20+
targetPort: redisexp
1821
selector:
1922
app: redis-store
2023
type: ClusterIP

‎base/sourcegraph/searcher/searcher.Service.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111
sourcegraph-resource-requires: no-cluster-admin
1212
name: searcher
1313
spec:
14+
clusterIP: None
1415
ports:
1516
- name: http
1617
port: 3181

‎base/sourcegraph/symbols/symbols.Service.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111
sourcegraph-resource-requires: no-cluster-admin
1212
name: symbols
1313
spec:
14+
clusterIP: None
1415
ports:
1516
- name: http
1617
port: 3184

‎base/sourcegraph/syntect-server/syntect-server.Deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ spec:
4444
ports:
4545
- containerPort: 9238
4646
name: http
47+
- containerPort: 6060
48+
name: debug
4749
readinessProbe:
4850
tcpSocket:
4951
port: http

0 commit comments

Comments
 (0)