Skip to content

Commit d949d5d

Browse files
author
Debakel Orakel
committed
Enable monitoring by default
1 parent 9463951 commit d949d5d

7 files changed

Lines changed: 279 additions & 2 deletions

File tree

‎class/defaults.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,13 @@ parameters:
9797
#increase if auth credentials change
9898
secretVersion: 0
9999

100-
secrets: {}
101-
100+
monitoring: true
102101
alerts:
103102
additionalRules: {}
104103
patchRules:
105104
ignoreNames: []
106105
patches: {}
107106

107+
secrets: {}
108+
108109
helm_values: {}

‎component/helm_values.jsonnet‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,14 @@ local global = com.makeMergeable({
132132
bucketSecretVersion: '%s' % params.s3.auth.secretVersion,
133133
},
134134
},
135+
[if params.monitoring then 'monitoring']: {
136+
serviceMonitor: {
137+
enabled: params.monitoring,
138+
},
139+
rules: {
140+
enabled: params.monitoring,
141+
},
142+
},
135143
lokiCanary: {
136144
enabled: false,
137145
},

‎tests/extra-config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ parameters:
3535
s3:
3636
endpoint: 's3.example.com'
3737
region: 'us-east-1'
38+
39+
monitoring: false

‎tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
apiVersion: monitoring.coreos.com/v1
2+
kind: PrometheusRule
3+
metadata:
4+
labels:
5+
app.kubernetes.io/instance: loki
6+
app.kubernetes.io/name: loki
7+
app.kubernetes.io/version: 3.7.2
8+
helm.sh/chart: loki-13.7.2
9+
name: loki-loki-rules
10+
namespace: syn-loki
11+
spec:
12+
groups:
13+
- name: loki_rules
14+
rules:
15+
- expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m]))
16+
by (le, job))
17+
labels:
18+
cluster: loki
19+
record: job:loki_request_duration_seconds:99quantile
20+
- expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m]))
21+
by (le, job))
22+
labels:
23+
cluster: loki
24+
record: job:loki_request_duration_seconds:50quantile
25+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) / sum(rate(loki_request_duration_seconds_count[1m]))
26+
by (job)
27+
labels:
28+
cluster: loki
29+
record: job:loki_request_duration_seconds:avg
30+
- expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)
31+
labels:
32+
cluster: loki
33+
record: job:loki_request_duration_seconds_bucket:sum_rate
34+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job)
35+
labels:
36+
cluster: loki
37+
record: job:loki_request_duration_seconds_sum:sum_rate
38+
- expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job)
39+
labels:
40+
cluster: loki
41+
record: job:loki_request_duration_seconds_count:sum_rate
42+
- expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m]))
43+
by (le, job, route))
44+
labels:
45+
cluster: loki
46+
record: job_route:loki_request_duration_seconds:99quantile
47+
- expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m]))
48+
by (le, job, route))
49+
labels:
50+
cluster: loki
51+
record: job_route:loki_request_duration_seconds:50quantile
52+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) /
53+
sum(rate(loki_request_duration_seconds_count[1m])) by (job, route)
54+
labels:
55+
cluster: loki
56+
record: job_route:loki_request_duration_seconds:avg
57+
- expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)
58+
labels:
59+
cluster: loki
60+
record: job_route:loki_request_duration_seconds_bucket:sum_rate
61+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route)
62+
labels:
63+
cluster: loki
64+
record: job_route:loki_request_duration_seconds_sum:sum_rate
65+
- expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job, route)
66+
labels:
67+
cluster: loki
68+
record: job_route:loki_request_duration_seconds_count:sum_rate
69+
- expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m]))
70+
by (le, namespace, job, route))
71+
labels:
72+
cluster: loki
73+
record: namespace_job_route:loki_request_duration_seconds:99quantile
74+
- expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m]))
75+
by (le, namespace, job, route))
76+
labels:
77+
cluster: loki
78+
record: namespace_job_route:loki_request_duration_seconds:50quantile
79+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job,
80+
route) / sum(rate(loki_request_duration_seconds_count[1m])) by (namespace,
81+
job, route)
82+
labels:
83+
cluster: loki
84+
record: namespace_job_route:loki_request_duration_seconds:avg
85+
- expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace,
86+
job, route)
87+
labels:
88+
cluster: loki
89+
record: namespace_job_route:loki_request_duration_seconds_bucket:sum_rate
90+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job,
91+
route)
92+
labels:
93+
cluster: loki
94+
record: namespace_job_route:loki_request_duration_seconds_sum:sum_rate
95+
- expr: sum(rate(loki_request_duration_seconds_count[1m])) by (namespace,
96+
job, route)
97+
labels:
98+
cluster: loki
99+
record: namespace_job_route:loki_request_duration_seconds_count:sum_rate

‎tests/golden/defaults/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
apiVersion: monitoring.coreos.com/v1
2+
kind: ServiceMonitor
3+
metadata:
4+
labels:
5+
app.kubernetes.io/instance: loki
6+
app.kubernetes.io/name: loki
7+
app.kubernetes.io/version: 3.7.2
8+
helm.sh/chart: loki-13.7.2
9+
name: loki
10+
namespace: syn-loki
11+
spec:
12+
endpoints:
13+
- interval: 15s
14+
path: /metrics
15+
port: http-metrics
16+
relabelings:
17+
- action: replace
18+
replacement: syn-loki/$1
19+
sourceLabels:
20+
- job
21+
targetLabel: job
22+
- action: replace
23+
replacement: loki
24+
targetLabel: cluster
25+
scheme: http
26+
selector:
27+
matchExpressions:
28+
- key: prometheus.io/service-monitor
29+
operator: NotIn
30+
values:
31+
- 'false'
32+
matchLabels:
33+
app.kubernetes.io/instance: loki
34+
app.kubernetes.io/name: loki

‎tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/loki-rules.yaml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
apiVersion: monitoring.coreos.com/v1
2+
kind: PrometheusRule
3+
metadata:
4+
labels:
5+
app.kubernetes.io/instance: loki
6+
app.kubernetes.io/name: loki
7+
app.kubernetes.io/version: 3.7.2
8+
helm.sh/chart: loki-13.7.2
9+
name: loki-loki-rules
10+
namespace: syn-loki
11+
spec:
12+
groups:
13+
- name: loki_rules
14+
rules:
15+
- expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m]))
16+
by (le, job))
17+
labels:
18+
cluster: loki
19+
record: job:loki_request_duration_seconds:99quantile
20+
- expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m]))
21+
by (le, job))
22+
labels:
23+
cluster: loki
24+
record: job:loki_request_duration_seconds:50quantile
25+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job) / sum(rate(loki_request_duration_seconds_count[1m]))
26+
by (job)
27+
labels:
28+
cluster: loki
29+
record: job:loki_request_duration_seconds:avg
30+
- expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job)
31+
labels:
32+
cluster: loki
33+
record: job:loki_request_duration_seconds_bucket:sum_rate
34+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job)
35+
labels:
36+
cluster: loki
37+
record: job:loki_request_duration_seconds_sum:sum_rate
38+
- expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job)
39+
labels:
40+
cluster: loki
41+
record: job:loki_request_duration_seconds_count:sum_rate
42+
- expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m]))
43+
by (le, job, route))
44+
labels:
45+
cluster: loki
46+
record: job_route:loki_request_duration_seconds:99quantile
47+
- expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m]))
48+
by (le, job, route))
49+
labels:
50+
cluster: loki
51+
record: job_route:loki_request_duration_seconds:50quantile
52+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route) /
53+
sum(rate(loki_request_duration_seconds_count[1m])) by (job, route)
54+
labels:
55+
cluster: loki
56+
record: job_route:loki_request_duration_seconds:avg
57+
- expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)
58+
labels:
59+
cluster: loki
60+
record: job_route:loki_request_duration_seconds_bucket:sum_rate
61+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (job, route)
62+
labels:
63+
cluster: loki
64+
record: job_route:loki_request_duration_seconds_sum:sum_rate
65+
- expr: sum(rate(loki_request_duration_seconds_count[1m])) by (job, route)
66+
labels:
67+
cluster: loki
68+
record: job_route:loki_request_duration_seconds_count:sum_rate
69+
- expr: histogram_quantile(0.99, sum(rate(loki_request_duration_seconds_bucket[1m]))
70+
by (le, namespace, job, route))
71+
labels:
72+
cluster: loki
73+
record: namespace_job_route:loki_request_duration_seconds:99quantile
74+
- expr: histogram_quantile(0.50, sum(rate(loki_request_duration_seconds_bucket[1m]))
75+
by (le, namespace, job, route))
76+
labels:
77+
cluster: loki
78+
record: namespace_job_route:loki_request_duration_seconds:50quantile
79+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job,
80+
route) / sum(rate(loki_request_duration_seconds_count[1m])) by (namespace,
81+
job, route)
82+
labels:
83+
cluster: loki
84+
record: namespace_job_route:loki_request_duration_seconds:avg
85+
- expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, namespace,
86+
job, route)
87+
labels:
88+
cluster: loki
89+
record: namespace_job_route:loki_request_duration_seconds_bucket:sum_rate
90+
- expr: sum(rate(loki_request_duration_seconds_sum[1m])) by (namespace, job,
91+
route)
92+
labels:
93+
cluster: loki
94+
record: namespace_job_route:loki_request_duration_seconds_sum:sum_rate
95+
- expr: sum(rate(loki_request_duration_seconds_count[1m])) by (namespace,
96+
job, route)
97+
labels:
98+
cluster: loki
99+
record: namespace_job_route:loki_request_duration_seconds_count:sum_rate

‎tests/golden/legacy/loki/loki/10_helm_loki/loki/templates/monitoring/servicemonitor.yaml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
apiVersion: monitoring.coreos.com/v1
2+
kind: ServiceMonitor
3+
metadata:
4+
labels:
5+
app.kubernetes.io/instance: loki
6+
app.kubernetes.io/name: loki
7+
app.kubernetes.io/version: 3.7.2
8+
helm.sh/chart: loki-13.7.2
9+
name: loki
10+
namespace: syn-loki
11+
spec:
12+
endpoints:
13+
- interval: 15s
14+
path: /metrics
15+
port: http-metrics
16+
relabelings:
17+
- action: replace
18+
replacement: syn-loki/$1
19+
sourceLabels:
20+
- job
21+
targetLabel: job
22+
- action: replace
23+
replacement: loki
24+
targetLabel: cluster
25+
scheme: http
26+
selector:
27+
matchExpressions:
28+
- key: prometheus.io/service-monitor
29+
operator: NotIn
30+
values:
31+
- 'false'
32+
matchLabels:
33+
app.kubernetes.io/instance: loki
34+
app.kubernetes.io/name: loki

0 commit comments

Comments
 (0)